Merge branch 'pudong' into minhang

# Conflicts: # src/main/resources/application-prod.properties

Merge branch 'pudong' into minhang
# Conflicts: # src/main/resources/application-prod.properties
王通
2 parents cd8e74b0 ac81c71a
Showing 89 changed files with 2611 additions and 585 deletions
src/main/java/com/bsth/controller/StationController.java
src/main/java/com/bsth/controller/StationRouteController.java
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/controller/schedule/core/CarConfigInfoController.java
src/main/java/com/bsth/controller/schedule/core/SchedulePlanController.java
src/main/java/com/bsth/data/gpsdata_v2/handlers/InStationProcess.java
src/main/java/com/bsth/data/gpsdata_v2/handlers/OutStationProcess.java
src/main/java/com/bsth/entity/mcy_forms/Shifday.java
src/main/java/com/bsth/entity/schedule/SchedulePlanInfo.java
src/main/java/com/bsth/filter/AccessLogFilter.java
src/main/java/com/bsth/repository/schedule/CarConfigInfoRepository.java
src/main/java/com/bsth/repository/schedule/GuideboardInfoRepository.java
src/main/java/com/bsth/repository/schedule/TTInfoRepository.java
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
src/main/java/com/bsth/service/realcontrol/ScheduleRealInfoService.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/service/schedule/CarConfigInfoService.java
src/main/java/com/bsth/service/schedule/SchedulePlanService.java
src/main/java/com/bsth/service/schedule/impl/CarConfigInfoServiceImpl.java
 package com.bsth.controller;
  
-import java.util.Map;
-
+import com.bsth.entity.Station;
+import com.bsth.service.StationService;
+import com.bsth.util.GetUIDAndCode;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -10,9 +11,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
  
-import com.bsth.entity.Station;
-import com.bsth.service.StationService;
-import com.bsth.util.GetUIDAndCode;
+import java.util.Map;
  
 /**
  * 
@@ -160,11 +159,11 @@ public class StationController extends BaseController&lt;Station, Integer&gt; {
 	public int updateStationAndSectionCode(@RequestParam Integer stationCount, Integer sectionCount) {
 		System.out.println(stationCount+" _ "+ sectionCount );
 		for(int i = 0; i <  stationCount; i++) {
-			System.out.println(stationCount);
+			System.out.println(i);
 			GetUIDAndCode.getStationId();
 		}
-		for(int i = 0; i <  sectionCount; i++) {
-			System.out.println(sectionCount);
+		for(int j = 0; j <  sectionCount; j++) {
+			System.out.println(j);
 			GetUIDAndCode.getSectionId();
 		}
 		return 1;
 package com.bsth.controller;
  
-import com.bsth.entity.Station;
 import com.bsth.entity.StationRoute;
 import com.bsth.entity.StationRouteCache;
 import com.bsth.repository.StationRouteCacheRepository;
@@ -12,11 +11,10 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
  
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
  
-import javax.servlet.http.HttpServletResponse;
-
 /**
  * 
  * @ClassName: StationRouteController(站点路由控制器)
 package com.bsth.controller.realcontrol;
  
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringEscapeUtils;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.alibaba.fastjson.JSONArray;
 import com.bsth.common.ResponseCode;
 import com.bsth.controller.BaseController;
@@ -10,14 +33,11 @@ import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.data.schedule.edit_logs.service.dto.SchEditInfoDto;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.entity.schedule.SchedulePlanInfo;
+import com.bsth.entity.sys.SysUser;
+import com.bsth.security.util.SecurityUtils;
 import com.bsth.service.realcontrol.ScheduleRealInfoService;
-import org.apache.commons.lang3.StringEscapeUtils;
-import org.joda.time.format.DateTimeFormat;
-import org.joda.time.format.DateTimeFormatter;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
+import com.bsth.util.ConfigUtil;
+import com.fasterxml.jackson.databind.ObjectMapper;
  
 @RestController
 @RequestMapping("/realSchedule")
@@ -515,6 +535,11 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 		return scheduleRealInfoService.realScheduleList(line,date);
 	}
  
+	@RequestMapping(value="/realScheduleList_zrw")
+	public List<ScheduleRealInfo> realScheduleList_zrw(@RequestParam String line,@RequestParam String date){
+		return scheduleRealInfoService.realScheduleList_zrw(line,date);
+	}
+	
 	@RequestMapping(value="/realScheduleList_mh_2")
 	public List<ScheduleRealInfo> realScheduleList_mh_2(@RequestParam String line,@RequestParam String date){
 		return scheduleRealInfoService.realScheduleList_mh_2(line,date);
@@ -686,4 +711,74 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	public Map<String, Object> deleteToHistory(@PathVariable("id") Long id){
 		return scheduleRealInfoService.deleteToHistory(id);
 	}
+	
+	/**
+	 * 从历史库里删除临加班次
+	 * @param sch
+	 * @return
+	 */
+	@RequestMapping(value = "wxsb", method = RequestMethod.POST)
+	public Map<String, Object> deleteToHistory(@RequestParam Map<String, Object> param){
+		SysUser user = SecurityUtils.getCurrentUser();
+		String uname = user.getUserName();
+		StringBuilder url = new StringBuilder(ConfigUtil.get("http.report.url"));
+		url.append("?nbbm=").append(param.get("nbbm")).append("&bxy=").append(uname).append("&bxbm=").append(param.get("bxType"));
+		// 分公司保存格式 分公司编码_公司编码
+		String val = BasicData.nbbm2FgsCompanyCodeMap.get(param.get("nbbm"));
+		String[] arr = val.split("_");
+		if (!"22".equals(arr[1])) {
+			Map<String, Object> res = new HashMap<String, Object>();
+			res.put("status", ResponseCode.ERROR);
+			res.put("msg", "除金高公司外暂未开通此功能");
+			
+			return res;
+		}
+		url.append("&fgs=").append(arr[0]);
+		
+		return request(url.toString());
+	}
+	
+	@SuppressWarnings("unchecked")
+	private static Map<String, Object> request(String url) {
+		Map<String, Object> res = new HashMap<String, Object>();
+		res.put("status", ResponseCode.SUCCESS);
+		InputStream in = null;
+		HttpURLConnection con = null;
+		try {
+			con = (HttpURLConnection)new URL(url).openConnection();
+			con.setRequestMethod("POST");
+			con.setRequestProperty("keep-alive", "true");
+			con.setRequestProperty("accept", "application/json");
+			con.setRequestProperty("content-type", "application/json");
+			con.setDoInput(true);
+			con.setReadTimeout(2500);
+			con.setConnectTimeout(2500);
+			
+			con.connect();
+			if (con.getResponseCode() == 200) {
+				in = con.getInputStream();
+				ByteArrayOutputStream bout = new ByteArrayOutputStream();
+				IOUtils.copy(in, bout); bout.close();
+				Map<String, Object> response = new ObjectMapper().readValue(bout.toByteArray(), Map.class);
+				if (!"报修成功".equals(response.get("msg"))) {
+					res.put("status", ResponseCode.ERROR);
+					res.putAll(response);
+				}
+			}
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			res.put("status", ResponseCode.ERROR);
+			res.put("msg", "调用上报接口异常");
+		} finally {
+			try {
+				if (in != null) in.close();
+				if (con != null) con.disconnect();
+			} catch (IOException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+		
+		return res;
+	}
 }
@@ -63,6 +63,20 @@ public class CarConfigInfoController extends BController&lt;CarConfigInfo, Long&gt; {
         return rtn;
     }
  
+    @RequestMapping(value = "/validate_cars_2", method = RequestMethod.GET)
+    public Map<String, Object> validate_cars(@RequestParam Integer xlId, @RequestParam Integer clId) {
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            carConfigInfoService.validate_cars(xlId, clId);
+            rtn.put("status", ResponseCode.SUCCESS);
+        } catch (ScheduleException exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+
+        return rtn;
+    }
+
     @RequestMapping(value = "/validate_cars_gs", method = RequestMethod.GET)
     public Map<String, Object> validate_cars_gs(HttpServletRequest request, @RequestParam Map<String, Object> param) {
         HttpSession session = request.getSession();
@@ -57,4 +57,21 @@ public class SchedulePlanController extends BController&lt;SchedulePlan, Long&gt; {
         return rtn;
     }
  
+    /**
+     * 验证排班计划时间范围内规则的正确性。
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value = "/valttrule/{xlid}/{from}/{to}", method = RequestMethod.GET)
+    public Map<String, Object> validateRule(
+            @PathVariable(value = "xlid") Integer xlid,
+            @PathVariable(value = "from") Date from,
+            @PathVariable(value = "to") Date to
+    ) throws Exception {
+        Map<String, Object> rtn = new HashMap<>();
+        rtn.put("status", ResponseCode.SUCCESS);
+        rtn.put("data", schedulePlanService.validateRule(xlid, from, to));
+        return rtn;
+    }
+
 }
@@ -121,7 +121,7 @@ public class InStationProcess {
     private void inEndStation(ScheduleRealInfo sch, GpsEntity gps) {
         String nbbm = sch.getClZbh();
         //校验进站前置约束
-        if (!validInPremise(gps))
+        if (!validInPremise(gps) && isNormalSch(sch))
             return;
  
         //实达时间不覆盖
@@ -74,7 +74,7 @@ public class OutStationProcess {
      * @param gps
      */
     private void outStation(GpsEntity gps, GpsEntity prev) {
-    	logger.info("进站记录(到达时间:" + gps.getArrTime() + " 进出站状态:" + gps.getInstation() + " 站点编号:" + gps.getStopNo() + " deviceId:" + gps.getDeviceId() + " nbbm:" + gps.getNbbm() + ")");
+    	logger.info("出站记录(到达时间:" + gps.getArrTime() + " 进出站状态:" + gps.getInstation() + " 站点编号:" + gps.getStopNo() + " deviceId:" + gps.getDeviceId() + " nbbm:" + gps.getNbbm() + ")");
         ScheduleRealInfo sch = dayOfSchedule.executeCurr(gps.getNbbm());
  
         //起点发车
@@ -35,6 +35,8 @@ public class Shifday {
 	private String sjbc;//实际班次
  
 	private String jgh;
+
+	private String sgh;
  
 	private String zbh;
  
@@ -56,6 +58,14 @@ public class Shifday {
 		this.jgh = jgh;
 	}
  
+	public String getSgh() {
+		return sgh;
+	}
+
+	public void setSgh(String sgh) {
+		this.sgh = sgh;
+	}
+
 	public String getZbh() {
 		return zbh;
 	}
 package com.bsth.entity.schedule;
  
 import com.bsth.entity.Line;
-import com.bsth.service.schedule.rules.rerun.RerunRule_input;
-import com.bsth.service.schedule.rules.shiftloop.ScheduleResult_output;
-import com.bsth.service.schedule.rules.shiftloop.ScheduleRule_Type;
+import com.bsth.service.schedule.impl.plan.kBase1.core.rerun.RerunRule_input;
+import com.bsth.service.schedule.impl.plan.kBase1.core.shiftloop.ScheduleResult_output;
+import com.bsth.service.schedule.impl.plan.kBase1.core.shiftloop.ScheduleRule_Type;
  
 import javax.persistence.*;
 import java.sql.PreparedStatement;
@@ -58,9 +58,11 @@ public class AccessLogFilter extends BaseFilter {
 		s.append(getBlock(params));
 		s.append(getBlock(headers));
 		s.append(getBlock(request.getHeader("Referer")));
-
-		logger.info(s.toString());
+		
+		long now = System.currentTimeMillis();
 		chain.doFilter(request, response);
+		s.append("<cost time:").append(System.currentTimeMillis() - now).append(">");
+		logger.info(s.toString());
 	}
  
 	private static String getParams(HttpServletRequest request) {
@@ -50,4 +50,7 @@ public interface CarConfigInfoRepository extends BaseRepository&lt;CarConfigInfo, L
  
     @EntityGraph(value = "carConfigInfo_xl_cl", type = EntityGraph.EntityGraphType.FETCH)
     List<CarConfigInfo> findByXlId(Integer xlid);
+
+    @EntityGraph(value = "carConfigInfo_xl_cl", type = EntityGraph.EntityGraphType.FETCH)
+    List<CarConfigInfo> findByClId(Integer clid);
 }
 \ No newline at end of file
@@ -43,5 +43,7 @@ public interface GuideboardInfoRepository extends BaseRepository&lt;GuideboardInfo,
  
     @Query(value = "SELECT g FROM GuideboardInfo g  where g.xl =?1 and g.lpName = ?2 and g.lpNo = ?3 and lpType =?4 and isCancel = 0")
     List<GuideboardInfo> validateLp(Line xl,String lpName , int lpNo,String lpType);
+
+    List<GuideboardInfo> findByXlId(Integer id);
  
 }
@@ -48,4 +48,6 @@ public interface TTInfoRepository extends BaseRepository&lt;TTInfo, Long&gt; {
             "from LineVersions lv where lv.line.id = ?1 and lv.status = ?2 ")
     List<Map<String, Object>> findLineVersionDescs3(Integer lineId, Integer status);
  
+    List<TTInfo> findByXlId(Integer xlId);
+
 }
@@ -596,7 +596,7 @@ public class FormsServiceImpl implements FormsService {
 	@Override
 	public List<Shifday> shifday(Map<String, Object> map) {
  
-		String line=""; 
+		String line="";
 		String date="";
 		String gsdmShif="";
 		String fgsdmShif="";
@@ -624,18 +624,17 @@ public class FormsServiceImpl implements FormsService {
 		if(!type.equals("") && !statue.equals("")){
 			sql_ +=" order by "+statue+" "+type;
 		}
-		String sql ="select t.* from (select r.schedule_date,r.j_name,"
-				+ "IFNULL(r.s_name,'')as s_name,"
-				+ " r.cl_zbh,r.xl_bm, r.j_gh,r.gs_bm,r.fgs_bm,r.lp_name "
-				+ "FROM bsth_c_s_sp_info_real r  where 1=1  "
-				+ " and r.schedule_date_str='"+date + "'  "
+		String sql ="select t.* from (select r.schedule_date,"
+				+ " IFNULL(r.s_gh,'')as s_gh,r.cl_zbh,"
+				+ " r.xl_bm,r.j_gh,r.gs_bm,r.fgs_bm,r.lp_name"
+				+ " FROM bsth_c_s_sp_info_real r where 1=1 "
+				+ " and r.schedule_date_str='"+date + "' "
 				+ " and r.xl_bm = '"+line+"' "
 				+ " and r.gs_bm  like '%"+gsdmShif+"%' "
-				+ " and r.fgs_bm  like '%"+fgsdmShif+"%' ) t"
-				+ " GROUP BY t.schedule_date,t.j_name,t.s_name, "
-				+ "t.cl_zbh,t.xl_bm,t.j_gh,t.gs_bm,t.fgs_bm,t.lp_name  "
-				+ sql_;
-		 
+				+ " and r.fgs_bm  like '%"+fgsdmShif+"%' "+sql_+") t"
+				+ " GROUP BY t.schedule_date,t.xl_bm,t.cl_zbh,t.lp_name,"
+				+ " t.j_gh,t.s_gh,t.gs_bm,t.fgs_bm ";
+		
  
 		List<Shifday> list = jdbcTemplate.query(sql, new RowMapper<Shifday>() {
  
@@ -643,15 +642,16 @@ public class FormsServiceImpl implements FormsService {
 			public Shifday mapRow(ResultSet arg0, int arg1) throws SQLException {
 				Shifday shifday = new Shifday();
 				shifday.setRq(arg0.getString("schedule_date"));
-				shifday.setjName(arg0.getString("j_name").toString());
-				shifday.setsName(arg0.getString("s_name") == null ? "" : arg0.getString("s_name").toString());
+//				shifday.setjName(arg0.getString("j_name").toString());
+//				shifday.setsName(arg0.getString("s_name") == null ? "" : arg0.getString("s_name").toString());
 				shifday.setCarPlate(arg0.getString("cl_zbh").toString());
 				shifday.setJgh(arg0.getString("j_gh"));
+				shifday.setSgh(arg0.getString("s_gh") == null ? "" : arg0.getString("s_gh").toString());
 				shifday.setLpName(arg0.getString("lp_name")== null ? "" : arg0.getString("lp_name").toString());
 				return shifday;
 			}
-			
 		});
+		
 		List<ScheduleRealInfo> sList;
 		List<ScheduleRealInfo> list_s;
 		List<ScheduleRealInfo> lists=scheduleRealInfoRepository.scheduleByDateAndLineTjrb(map.get("line").toString(), map.get("date").toString());
@@ -661,8 +661,9 @@ public class FormsServiceImpl implements FormsService {
 			Shifday d=list.get(i);
 			for (int j = 0; j < lists.size(); j++) {
 				ScheduleRealInfo s=lists.get(j);
-				if(d.getJgh().equals(s.getjGh()) && d.getCarPlate().equals(s.getClZbh())
-						&&d.getLpName().equals(s.getLpName())){
+				if(d.getJgh().equals(s.getjGh()) && d.getSgh().equals(s.getsGh())
+						&& d.getCarPlate().equals(s.getClZbh())
+						&& d.getLpName().equals(s.getLpName())){
 					sList.add(s);
 					 Set<ChildTaskPlan> cts = s.getcTasks();
 			            if(cts != null && cts.size() > 0){
@@ -674,7 +675,10 @@ public class FormsServiceImpl implements FormsService {
 			            }
 				}
 			}
-			
+			if(sList.size()>0){
+				d.setjName(sList.get(0).getjName());
+				d.setsName(sList.get(0).getsName() == null ? "":sList.get(0).getsName());
+			}
 			double ksgl=culateMileageService.culateKsgl(list_s);
 			double jccgl=culateMileageService.culateJccgl(list_s);
 			double zksgl=Arith.add(ksgl, jccgl);
@@ -893,7 +897,8 @@ public class FormsServiceImpl implements FormsService {
 				if(fgsdm.length() != 0){
 					sql += " and r.fgs_bm ='"+fgsdm+"'";
 				}
-			    sql += " group  by  r.j_gh,r.xl_bm,r.cl_zbh,r.j_name order by r.xl_bm,r.cl_zbh";
+			    sql += " group by r.fgs_bm,r.j_gh,r.xl_bm,r.cl_zbh,r.j_name " +
+			    		"order by r.xl_bm,r.cl_zbh";
  
 			    list = jdbcTemplate.query(sql, new RowMapper<Singledata>() {
 					@Override
@@ -924,7 +929,7 @@ public class FormsServiceImpl implements FormsService {
 						+ " WHERE rq = '"+startDate+"'"
 						+ linesql
 						+ " union"
-						+ "  SELECT id,xlbm,nbbm,jsy,cdl as jzl,hd as yh,sh as sh,fgsdm FROM bsth_c_dlb"
+						+ " SELECT id,xlbm,nbbm,jsy,cdl as jzl,hd as yh,sh as sh,fgsdm FROM bsth_c_dlb"
 						+ " WHERE rq = '"+startDate+"'"
 						+ linesql;
 				List<Singledata> listNy = jdbcTemplate.query(nysql, new RowMapper<Singledata>() {
@@ -400,7 +400,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				sql += " and cl.line_code = '"+line+"'";
 			if(ttId.length() != 0)
 				sql += " and td.ttinfo = '"+ttId+"'";
-			sql += " group by td.lp";
+			sql += " group by td.lp, lp.lp_name";
  
 			 list = jdbcTemplate.query(sql,
 					new RowMapper<Map<String, Object>>(){
@@ -132,8 +132,8 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
  
 	Long getMaxId();
 	Map<String,Object> scheduleDaily(String line,String date);
-	
 	List<ScheduleRealInfo> realScheduleList(String line,String date);
+	List<ScheduleRealInfo> realScheduleList_zrw(String line,String date);
 	List<ScheduleRealInfo> realScheduleListQp(String line,String date);
  
 	List<Map<String,Object>> yesterdayDataList(String line,String date,String gsbm,String fgsbm,String jGh,String nbbm);
@@ -611,111 +611,119 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
      * 临加班次
      */
     @Override
-    public Map<String, Object> save(ScheduleRealInfo t) {
+    public Map<String, Object> save(ScheduleRealInfo sch) {
         Map<String, Object> rs = new HashMap<>();
         try {
-            if (!carExist(t.getGsBm(), t.getClZbh())) {
-                rs.put("msg", "车辆 " + t.getClZbh() + " <a href=\"/#/busInfoManage\" target=_blank>车辆基础信息</a> 里找不到！");
-                rs.put("status", ResponseCode.ERROR);
-                return rs;
+        	String clZbh = sch.getClZbh();
+            if (StringUtils.isNotEmpty(clZbh)) {
+                //检测
+                if (!carExist(sch.getGsBm(), clZbh)) {
+                    rs.put("status", ResponseCode.ERROR);
+                    rs.put("msg", "车辆 " + clZbh + " 不存在！");
+                    return rs;
+                } else if (!sch.getGsBm().equals(BasicData.nbbm2CompanyCodeMap.get(clZbh))) {
+                    rs.put("status", ResponseCode.ERROR);
+                    rs.put("msg", sch.getXlName() + "所属的公司编码下找不到自编号为【" + clZbh + "】的车辆");
+                    return rs;
+                }
             }
  
             SysUser user = SecurityUtils.getCurrentUser();
-            String schDate = DayOfSchedule.currSchDateMap.get(t.getXlBm());
+            String schDate = DayOfSchedule.currSchDateMap.get(sch.getXlBm());
  
             SimpleDateFormat sdfyyyyMMdd = new SimpleDateFormat("yyyy-MM-dd"), sdfyyyyMMddHHmm = new SimpleDateFormat("yyyy-MM-ddHH:mm");
  
-            if (StringUtils.isEmpty(t.getjGh())) {
+            if (StringUtils.isEmpty(sch.getjGh())) {
                 rs.put("status", ResponseCode.ERROR);
                 rs.put("msg", "驾驶员工号不能为空！");
                 return rs;
             }
             //截取驾驶员工号
-            if (t.getjGh().indexOf("-") != -1) {
-                t.setjGh(t.getjGh().split("-")[1]);
+            if (sch.getjGh().indexOf("-") != -1) {
+                sch.setjGh(sch.getjGh().split("-")[1]);
             }
             //检查驾驶员工号
-            String jName = getPersonName(t.getGsBm(), t.getjGh());
+            String jName = getPersonName(sch.getGsBm(), sch.getjGh());
             if (StringUtils.isEmpty(jName)) {
-                rs.put("msg", t.getXlName() + "所属的公司编码下找不到工号为【" + t.getjGh() + "】的驾驶员");
+                rs.put("msg", sch.getXlName() + "所属的公司编码下找不到工号为【" + sch.getjGh() + "】的驾驶员");
                 rs.put("status", ResponseCode.ERROR);
                 return rs;
-            } else if (StringUtils.isEmpty(t.getjName())) {
-                t.setjName(jName);//补上驾驶员名称
+            } else if (StringUtils.isEmpty(sch.getjName())) {
+                sch.setjName(jName);//补上驾驶员名称
             }
  
             //有售票员
-            if (StringUtils.isNotEmpty(t.getsGh())) {
-                String sName = getPersonName(t.getGsBm(), t.getsGh());
+            if (StringUtils.isNotEmpty(sch.getsGh())) {
+                String sName = getPersonName(sch.getGsBm(), sch.getsGh());
                 if (StringUtils.isEmpty(sName)) {
-                    rs.put("msg", t.getXlName() + "所属的公司编码下找不到工号为【" + t.getjGh() + "】的售票员");
+                    rs.put("msg", sch.getXlName() + "所属的公司编码下找不到工号为【" + sch.getjGh() + "】的售票员");
                     rs.put("status", ResponseCode.ERROR);
                     return rs;
-                } else if (StringUtils.isEmpty(t.getsName())) {
-                    t.setsName(sName);//补上售票员名称
+                } else if (StringUtils.isEmpty(sch.getsName())) {
+                    sch.setsName(sName);//补上售票员名称
                 }
             } else {
-                t.setsGh("");
-                t.setsName("");
+                sch.setsGh("");
+                sch.setsName("");
             }
  
             //公司 和 分公司名称
-            t.setGsName(BasicData.businessCodeNameMap.get(t.getGsBm()));
-            t.setFgsName(BasicData.businessFgsCodeNameMap.get(t.getFgsBm() + "_" + t.getGsBm()));
-            t.setCreateDate(new Date());
-            t.setScheduleDateStr(schDate);
-            t.setScheduleDate(sdfyyyyMMdd.parse(schDate));
-            t.setRealExecDate(schDate);
-
-            t.setCreateBy(user);
-            t.setSflj(true);
-            t.setLate(false);
-            t.setDfsj(t.getFcsj());
-            t.setZdsjT(sdfyyyyMMddHHmm.parse(schDate + t.getZdsj()).getTime());
-            t.setJhlcOrig(t.getJhlc());
-            t.setCreateDate(new Date());
-            t.setUpdateDate(new Date());
-            t.setSpId(-1L);
+            sch.setGsName(BasicData.businessCodeNameMap.get(sch.getGsBm()));
+            sch.setFgsName(BasicData.businessFgsCodeNameMap.get(sch.getFgsBm() + "_" + sch.getGsBm()));
+            sch.setCreateDate(new Date());
+            sch.setScheduleDateStr(schDate);
+            sch.setScheduleDate(sdfyyyyMMdd.parse(schDate));
+            sch.setRealExecDate(schDate);
+
+            sch.setCreateBy(user);
+            sch.setSflj(true);
+            sch.setLate(false);
+            sch.setDfsj(sch.getFcsj());
+            sch.setZdsjT(sdfyyyyMMddHHmm.parse(schDate + sch.getZdsj()).getTime());
+            sch.setJhlcOrig(sch.getJhlc());
+            sch.setCreateDate(new Date());
+            sch.setUpdateDate(new Date());
+            sch.setSpId(-1L);
             //起终点名称
-            String prefix = t.getXlBm() + "_" + t.getXlDir() + "_";
-            t.setQdzName(BasicData.getStationNameByCode(t.getQdzCode(), prefix));
-            t.setZdzName(BasicData.getStationNameByCode(t.getZdzCode(), prefix));
+            String prefix = sch.getXlBm() + "_" + sch.getXlDir() + "_";
+            sch.setQdzName(BasicData.getStationNameByCode(sch.getQdzCode(), prefix));
+            sch.setZdzName(BasicData.getStationNameByCode(sch.getZdzCode(), prefix));
  
             //计算班次实际执行时间
-            schAttrCalculator.calcRealDate(t).calcAllTimeByFcsj(t);
+            schAttrCalculator.calcRealDate(sch).calcAllTimeByFcsj(sch);
  
             //处理计达跨24点
-            LineConfig conf = lineConfigData.get(t.getXlBm());
-            if (t.getZdsj().compareTo(conf.getStartOpt()) < 0) {
-                t.setZdsjT(sdfyyyyMMddHHmm.parse(t.getScheduleDateStr() + t.getZdsj()).getTime() + (1000 * 60 * 60 * 24));
+            LineConfig conf = lineConfigData.get(sch.getXlBm());
+            if (sch.getZdsj().compareTo(conf.getStartOpt()) < 0) {
+                sch.setZdsjT(sdfyyyyMMddHHmm.parse(sch.getScheduleDateStr() + sch.getZdsj()).getTime() + (1000 * 60 * 60 * 24));
             }
  
             //班次历时
-            t.setBcsj((int) ((t.getZdsjT() - t.getDfsjT()) / 1000 / 60));
-            if (t.getZdsjT() < t.getFcsjT()) {
+            sch.setBcsj((int) ((sch.getZdsjT() - sch.getDfsjT()) / 1000 / 60));
+            if (sch.getZdsjT() < sch.getFcsjT()) {
                 rs.put("status", ResponseCode.ERROR);
                 rs.put("msg", "起终点时间异常！");
                 return rs;
             }
  
-            t.setId(dayOfSchedule.getId());
+            sch.setId(dayOfSchedule.getId());
             //实时入库
-            super.save(t);
+            super.save(sch);
  
             // 加入缓存
-            dayOfSchedule.put(t);
+            dayOfSchedule.put(sch);
  
             //更新起点应到时间
-            List<ScheduleRealInfo> ts = dayOfSchedule.updateQdzTimePlan(t);
+            List<ScheduleRealInfo> ts = dayOfSchedule.updateQdzTimePlan(sch);
  
             //重新计算车辆当前执行班次
-            dayOfSchedule.reCalcExecPlan(t.getClZbh());
+            dayOfSchedule.reCalcExecPlan(sch.getClZbh());
  
             //记录站到场历时数据
-            Station2ParkBuffer.put(t);
+            Station2ParkBuffer.put(sch);
  
             rs.put("ts", ts);
-            rs.put("t", t);
+            rs.put("t", sch);
         } catch (Exception e) {
             logger.error("", e);
             rs.put("status", ResponseCode.ERROR);
@@ -3433,6 +3441,195 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     }
  
     @Override
+    public List<ScheduleRealInfo> realScheduleList_zrw(String line, String date) {
+        List<ScheduleRealInfo> list = new ArrayList<ScheduleRealInfo>();
+        String lpName = "lpName";
+        String zdsj = "";
+        String zdsjActual = "";
+        String zdsj1 = "";
+        String zdsjActual1 = "";
+        List<ScheduleRealInfo> listInfo = scheduleRealInfoRepository.scheduleDdrb(line, date);
+        
+        /*
+         * 对计划发车时间相同的班次进行排序 out最前 in最后
+         */
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+        String minfcsj = "02:00";
+        List<Line> lineList = lineRepository.findLineByCode(line);
+        if (lineList.size() > 0) {
+            String sqlMinYysj = "select start_opt from bsth_c_line_config where "
+                    + " id = ("
+                    + "select max(id) from bsth_c_line_config where line ='" + lineList.get(0).getId() + "'"
+                    + ")";
+            minfcsj = jdbcTemplate.queryForObject(sqlMinYysj, String.class);
+        }
+        String[] minSjs = minfcsj.split(":");
+        Long minSj = Long.parseLong(minSjs[0]) * 60 + Long.parseLong(minSjs[1]);
+        for (int i = 0; i < listInfo.size(); i++) {
+            ScheduleRealInfo s = listInfo.get(i);
+            if (s.getBcType().equals("out")) {
+                s.setRemark("1");
+            } else if (s.getBcType().equals("in")) {
+                s.setRemark("3");
+            } else {
+                s.setRemark("2");
+            }
+            String[] fcsj = s.getFcsj().split(":");
+            Long fcsjL = Long.parseLong(fcsj[0]) * 60 + Long.parseLong(fcsj[1]);
+
+            Long fscjT = 0L;
+            if (fcsjL < minSj) {
+                Calendar calendar = new GregorianCalendar();
+                calendar.setTime(s.getScheduleDate());
+                calendar.add(calendar.DATE, 1);
+                s.setScheduleDate(calendar.getTime());
+                try {
+                    fscjT = sdf.parse(sdf.format(s.getScheduleDate()) + " " + s.getFcsj()).getTime();
+                } catch (ParseException e) {
+                    // TODO Auto-generated catch block
+                    e.printStackTrace();
+                }
+
+            } else {
+                try {
+                    fscjT = sdf.parse(s.getScheduleDateStr() + " " + s.getFcsj()).getTime();
+                } catch (ParseException e) {
+                    // TODO Auto-generated catch block
+                    e.printStackTrace();
+                }
+                ;
+            }
+            s.setFcsjT(fscjT);
+        }
+
+//        Collections.sort(listInfo, new compareLpFcsjType());
+        List<ScheduleRealInfo> listInfo2=new ArrayList<ScheduleRealInfo>();
+
+        Collections.sort(listInfo, new compareLpFcsjType());
+        for (int i = 0; i < listInfo.size(); i++) {
+            ScheduleRealInfo t = listInfo.get(i);
+            if (!lpName.equals(t.getLpName())) {
+                zdsjActual = t.getZdsjActual();
+                zdsj = t.getZdsj();
+                t.setZdsjActual("");
+                t.setZdsj("");
+            } else {
+                zdsj1 = t.getZdsj();
+                zdsjActual1 = t.getZdsjActual();
+                t.setZdsjActual(zdsjActual);
+                t.setZdsj(zdsj);
+                zdsj = zdsj1;
+                zdsjActual = zdsjActual1;
+            }
+            
+            
+           
+            lpName = t.getLpName();
+            listInfo2.add(t);
+            
+        }
+
+       Collections.sort(listInfo2,new compareDirLpFcsjType());
+       for (int i = 0; i < listInfo2.size(); i++) {
+    	   ScheduleRealInfo t=listInfo2.get(i);
+    	   list.add(t);
+           Set<ChildTaskPlan> childTaskPlans = t.getcTasks();
+           //计算营运里程，空驶里程
+           if (!childTaskPlans.isEmpty()) {
+               List<ChildTaskPlan> listit = new ArrayList<ChildTaskPlan>(childTaskPlans);
+               Collections.sort(listit, new ComparableChild());
+               for (int j = 0; j < listit.size(); j++) {
+                   ScheduleRealInfo s = new ScheduleRealInfo();
+                   ChildTaskPlan childTaskPlan = listit.get(j);
+                   if (childTaskPlan.getCcId() == null) {
+                       if (childTaskPlan.isDestroy()) {
+                           s.setFcsjActual("");
+                           s.setZdsjActual("");
+                       } else {
+                           s.setFcsjActual(childTaskPlan.getStartDate());
+                           s.setZdsjActual("");
+                           s.setJhlc(Double.parseDouble(String.valueOf(childTaskPlan.getMileage())));
+                       }
+                       s.setFcsj(childTaskPlan.getStartDate());
+                       s.setZdsj("");
+                       s.setQdzName(childTaskPlan.getStartStationName());
+                       s.setZdzName(childTaskPlan.getEndStationName());
+                       s.setRemarks(childTaskPlan.getRemarks());
+                       s.setAdjustExps("子");
+                       s.setLpName("");
+                       list.add(s);
+                   }
+               }
+           }
+       }
+        List<ScheduleRealInfo> xList = new ArrayList<ScheduleRealInfo>();
+        List<ScheduleRealInfo> yList = new ArrayList<ScheduleRealInfo>();
+        List<ScheduleRealInfo> zList = new ArrayList<ScheduleRealInfo>();
+        List<ScheduleRealInfo> newList = new ArrayList<ScheduleRealInfo>();
+        if (list.size() > 0) {
+            int a = list.size() % 3;
+            int b = list.size() / 3;
+            int x = 0, y = 0;
+            if (a == 2) {
+                x = b + 1;
+                y = x * 2;
+            } else if (a == 1) {
+                x = b + 1;
+                y = x * 2 - 1;
+            } else {
+                x = b;
+                y = 2 * x;
+
+            }
+            for (int i = 0; i < list.size(); i++) {
+                ScheduleRealInfo s = list.get(i);
+                if (i + 1 <= x) {
+                    xList.add(s);
+                } else if ((i + 1) > x && (i + 1) <= y) {
+                    yList.add(s);
+                } else {
+                    zList.add(s);
+                }
+            }
+            for (int i = 0; i < x; i++) {
+                newList.add(xList.get(i));
+                if (yList.size() > i) {
+                    newList.add(yList.get(i));
+                } else {
+                    newList.add(new ScheduleRealInfo());
+                }
+                if (zList.size() > i) {
+                    newList.add(zList.get(i));
+                } else {
+                    newList.add(new ScheduleRealInfo());
+                }
+
+            }
+        }
+      /*  for (int i = 0; i < newList.size(); i++) {
+            ScheduleRealInfo t1 = newList.get(i);
+            for (int j = 0; j < list.size(); j++) {
+                ScheduleRealInfo t2 = list.get(j);
+                if (t1.getId() == t2.getId()) {
+                    t1 = t2;
+                }
+            }
+        }*/
+
+        for (int i = 0; i < newList.size(); i++) {
+            ScheduleRealInfo t1 = newList.get(i);
+            String reamrks1 = t1.getRemarks() == null ? "" : t1.getRemarks();
+            if (reamrks1.length() > 4) {
+                t1.setRemarks(reamrks1.substring(0, 4));
+                t1.setRemark(reamrks1);
+            } else {
+                t1.setRemark(reamrks1);
+            }
+        }
+        return newList;
+    }
+    
+    @Override
     public List<ScheduleRealInfo> realScheduleList_mh_2(String line, String date) {
         List<ScheduleRealInfo> list = new ArrayList<ScheduleRealInfo>();
         String lpName = "lpName";
@@ -4774,13 +4971,18 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         String xlName = map.get("xlName").toString();
         String state = map.get("state").toString();
         String type = map.get("type").toString();
-
+        String genre =map.get("genre").toString();
         List<Map<String, Object>> dataList2 = new ArrayList<Map<String, Object>>();
         List<Map<String, Object>> dataList3 = new ArrayList<Map<String, Object>>();
         List<Map<String, Object>> list1 = this.statisticsDaily(line, date, xlName, null);
         List<ScheduleRealInfo> list2 = this.queryUserInfo(line, date, state);
-        List<ScheduleRealInfo> list3 = this.realScheduleList(line, date);
-
+        List<ScheduleRealInfo> list3 =   new ArrayList<ScheduleRealInfo>();
+        if(genre.equals("qp"))
+        	list3=this.realScheduleListQp(line, date);
+        else if(genre.equals("zrw"))	
+        	list3=this.realScheduleList_zrw(line, date);
+        else 
+        	list3=this.realScheduleList(line, date);
         Map<String, Object> nMap = new HashMap<String, Object>();
         nMap.put("date", xlName + date);
         nMap.put("jls", list1.get(0).get("jls"));
@@ -4908,7 +5110,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 }
             }
             tempMap.put("zdsjk" + x, zdsjk);
-            tempMap.put("zdsjm" + x, zdsjm);
+            tempMap.put("zdsjm" + x, zdsjm.equals("0")?"":zdsjm);
             tempMap.put("fcsj" + x, schedule.getFcsj());
             String fcsjActural = schedule.getFcsjActual() != null ? schedule.getFcsjActual() : "";
             String bcType = schedule.getBcType() != null ? schedule.getBcType() : "";
@@ -4935,7 +5137,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 }
             }
             tempMap.put("fcsjk" + x, fcsjk);
-            tempMap.put("fcsjm" + x, fcsjm);
+            tempMap.put("fcsjm" + x, fcsjm.equals("0")?"":fcsjm);
             tempMap.put("remarks" + x, schedule.getRemark() != null ? schedule.getRemark() : "");
  
             size++;
@@ -10,7 +10,10 @@ import java.util.List;
  * Created by xu on 16/5/9.
  */
 public interface CarConfigInfoService extends BService<CarConfigInfo, Long> {
+    // 判定车辆是否配置在其他线路上
     void validate_cars(CarConfigInfo carConfigInfo) throws ScheduleException;
+    // 判定车辆是否配置在其他线路上2
+    void validate_cars(Integer xlId, Integer clId) throws ScheduleException;
     // 判定车辆是否配置在当前线路中
     void validate_cars_config(CarConfigInfo carConfigInfo) throws ScheduleException;
     // 判定车辆所属公司和当前用户的所属公司
 package com.bsth.service.schedule;
  
 import com.bsth.entity.schedule.SchedulePlan;
-import com.bsth.service.schedule.rules.ttinfo2.Result;
+import com.bsth.service.schedule.impl.plan.kBase3.validate.rule.ValidateRuleResult;
+import com.bsth.service.schedule.impl.plan.kBase3.validate.timetable.Result;
  
 import java.util.Date;
  
@@ -26,4 +27,13 @@ public interface SchedulePlanService extends BService&lt;SchedulePlan, Long&gt; {
      * @return
      */
     Result validateTTInfo(Integer xlid, Date from, Date to);
+
+    /**
+     * 验证规则。
+     * @param xlId 线路id
+     * @param from 排班计划开始时间
+     * @param to 排班计划结束时间
+     * @return
+     */
+    ValidateRuleResult validateRule(Integer xlId, Date from, Date to);
 }
 \ No newline at end of file
@@ -130,6 +130,18 @@ public class CarConfigInfoServiceImpl extends BServiceImpl&lt;CarConfigInfo, Long&gt; 
     }
  
     @Override
+    public void validate_cars(Integer xlId, Integer clId) throws ScheduleException {
+        Map<String, Object> param = new HashMap<>();
+        param.put("cl.id_eq", clId);
+        List<CarConfigInfo> carConfigInfos = list(param);
+        for (CarConfigInfo carConfigInfo : carConfigInfos) {
+            if (!carConfigInfo.getXl().getId().equals(xlId)) {
+                throw new ScheduleException("车辆不配置在当前线路下，配置在" + carConfigInfo.getXl().getName() + "线路中！");
+            }
+        }
+    }
+
+    @Override
     public void validate_cars_config(CarConfigInfo carConfigInfo) throws ScheduleException {
         Map<String, Object> param = new HashMap<>();
         param.put("xl.id_eq", carConfigInfo.getXl().getId());
 package com.bsth.service.schedule.impl;
  
+import com.bsth.entity.CarDevice;
 import com.bsth.entity.Cars;
+import com.bsth.entity.schedule.CarConfigInfo;
+import com.bsth.repository.schedule.CarConfigInfoRepository;
+import com.bsth.service.schedule.CarDeviceService;
 import com.bsth.service.schedule.CarsService;
 import com.bsth.service.schedule.exception.ScheduleException;
 import com.bsth.service.schedule.utils.DataToolsFile;
@@ -12,7 +16,9 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
  
 import java.io.File;
+import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
  
 /**
@@ -24,6 +30,48 @@ public class CarsServiceImpl extends BServiceImpl&lt;Cars, Integer&gt; implements Cars
     @Qualifier(value = "cars_dataTool")
     private DataToolsService dataToolsService;
  
+    @Autowired
+    @Qualifier(value = "carDeviceServiceImpl_sc")
+    private CarDeviceService carDeviceService;
+
+    @Autowired
+    private CarConfigInfoRepository carConfigInfoRepository;
+
+    @Override
+    public Cars save(Cars cars) {
+        if (cars.getId() != null && cars.getScrapState()) { // 更新车辆信息，报废车辆
+            // 1、作废的车辆，修改报废号
+            String eCode = cars.getEquipmentCode();
+            cars.setEquipmentCode("BF-" + eCode);
+            cars.setScrapCode("BF-" + cars.getEquipmentCode());
+            // 2、添加一条相关的设备替换记录
+            // 查找在哪条线路上
+            List<CarConfigInfo> carConfigInfoList = carConfigInfoRepository.findByClId(cars.getId());
+            for (CarConfigInfo carConfigInfo : carConfigInfoList) {
+                CarDevice carDevice = new CarDevice();
+                carDevice.setGsName(cars.getCompany());
+                carDevice.setCompany(cars.getBusinessCode());
+                carDevice.setBrancheCompany(cars.getBrancheCompanyCode());
+                carDevice.setCl(cars.getId());
+                carDevice.setClZbh(cars.getInsideCode());
+                carDevice.setXl(carConfigInfo.getXl().getId());
+                carDevice.setXlName(carConfigInfo.getXl().getName());
+                carDevice.setXlBm(carConfigInfo.getXl().getLineCode());
+                carDevice.setOldDeviceNo(eCode);
+                carDevice.setNewDeviceNo("BF-" + eCode);
+                carDevice.setIsCancel(false);
+
+                carDevice.setCreateBy(cars.getCreateBy());
+                carDevice.setUpdateBy(cars.getUpdateBy());
+                carDevice.setCreateDate(new Date());
+                carDevice.setUpdateDate(new Date());
+                carDeviceService.save(carDevice);
+            }
+        }
+
+        return super.save(cars);
+    }
+
     @Override
     public void importData(File file, Map<String, Object> params) throws ScheduleException {
         dataToolsService.importData(file, params);
 package com.bsth.service.schedule.impl;
  
+import com.bsth.entity.Line;
 import com.bsth.entity.schedule.SchedulePlan;
 import com.bsth.entity.schedule.TTInfo;
 import com.bsth.repository.BusinessRepository;
@@ -7,10 +8,11 @@ import com.bsth.repository.LineRepository;
 import com.bsth.repository.schedule.*;
 import com.bsth.service.schedule.SchedulePlanService;
 import com.bsth.service.schedule.exception.ScheduleException;
-import com.bsth.service.schedule.plan.DroolsSchedulePlan;
-import com.bsth.service.schedule.rules.ScheduleRuleService;
-import com.bsth.service.schedule.rules.ttinfo2.CalcuParam;
-import com.bsth.service.schedule.rules.ttinfo2.Result;
+import com.bsth.service.schedule.impl.plan.kBase3.validate.rule.ValidateRuleResult;
+import com.bsth.service.schedule.impl.plan.kBase3.validate.timetable.CalcuParam;
+import com.bsth.service.schedule.impl.plan.kBase3.validate.timetable.Result;
+import com.bsth.service.schedule.impl.plan.DroolsSchedulePlan;
+import com.bsth.service.schedule.impl.plan.ScheduleRuleService;
 import org.joda.time.DateTime;
 import org.kie.api.KieBase;
 import org.kie.api.runtime.KieSession;
@@ -42,6 +44,10 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
     private KieBase preKBase;
  
     @Autowired
+    @Qualifier("KBase3")
+    private KieBase validateKBase;
+
+    @Autowired
     private ScheduleRule1FlatRepository scheduleRule1FlatRepository;
     @Autowired
     private TTInfoRepository ttInfoRepository;
@@ -52,6 +58,8 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
     @Autowired
     private CarConfigInfoRepository carConfigInfoRepository;
     @Autowired
+    private GuideboardInfoRepository guideboardInfoRepository;
+    @Autowired
     private EmployeeConfigInfoRepository employeeConfigInfoRepository;
     @Autowired
     private BusinessRepository businessRepository;
@@ -146,22 +154,25 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
     public Result validateTTInfo(Integer xlid, Date from, Date to) {
         // 构造drools session->载入数据->启动规则->计算->销毁session
         // 创建session，内部配置的是stateful
-        KieSession session = coreKBase.newKieSession();
+        KieSession session = validateKBase.newKieSession();
         // 设置gloable对象，在drl中通过别名使用
         session.setGlobal("log", logger);
-        session.setGlobal("lineRepository", lineRepository);
         session.setGlobal("tTInfoDetailRepository", ttInfoDetailRepository);
  
         Result rs = new Result(); // 输出gloable对象
         session.setGlobal("rs", rs);
  
         // 载入数据
+        Line line = lineRepository.findOne(xlid);
+        session.insert(line);
+
         CalcuParam calcuParam = new CalcuParam(
                 new DateTime(from), new DateTime(to), xlid);
         session.insert(calcuParam);
-        List<TTInfo> ttInfos = (List<TTInfo>) ttInfoRepository.findAll();
-        for (TTInfo ttInfo: ttInfos)
-                session.insert(ttInfo);
+        List<TTInfo> ttInfos = ttInfoRepository.findByXlId(xlid);
+        for (TTInfo ttInfo: ttInfos) {
+            session.insert(ttInfo);
+        }
  
         // 执行rule
         session.fireAllRules();
@@ -171,4 +182,30 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
  
         return rs;
     }
+
+    @Override
+    public ValidateRuleResult validateRule(Integer xlId, Date from, Date to) {
+        KieSession session = validateKBase.newKieSession();
+        session.setGlobal("LOG", logger);
+        session.setGlobal("ccRepo", carConfigInfoRepository);
+        session.setGlobal("lpRepo", guideboardInfoRepository);
+        session.setGlobal("ecRepo", employeeConfigInfoRepository);
+        session.setGlobal("ruleRepo", scheduleRule1FlatRepository);
+
+        ValidateRuleResult result = new ValidateRuleResult();
+        session.setGlobal("result", result);
+
+        com.bsth.service.schedule.impl.plan.kBase3.validate.rule.CalcuParam calcuParam =
+                new com.bsth.service.schedule.impl.plan.kBase3.validate.rule.CalcuParam();
+        calcuParam.setXlId(xlId);
+        calcuParam.setFromDate(new DateTime(from));
+        calcuParam.setToDate(new DateTime(to));
+        session.insert(calcuParam);
+
+        session.fireAllRules();
+
+        session.dispose();;
+
+        return result;
+    }
 }
-package com.bsth.service.schedule.plan;
+package com.bsth.service.schedule.impl.plan;
  
 import com.bsth.entity.Line;
 import com.bsth.entity.schedule.SchedulePlan;
@@ -8,17 +8,16 @@ import com.bsth.entity.schedule.rule.ScheduleRule1Flat;
 import com.bsth.repository.BusinessRepository;
 import com.bsth.repository.LineRepository;
 import com.bsth.repository.schedule.*;
-import com.bsth.service.schedule.rules.ScheduleRuleService;
-import com.bsth.service.schedule.rules.plan.PlanCalcuParam_input;
-import com.bsth.service.schedule.rules.plan.PlanResult;
-import com.bsth.service.schedule.rules.rerun.RerunRule_input;
-import com.bsth.service.schedule.rules.rerun.RerunRule_param;
-import com.bsth.service.schedule.rules.shiftloop.ScheduleCalcuParam_input;
-import com.bsth.service.schedule.rules.shiftloop.ScheduleResults_output;
-import com.bsth.service.schedule.rules.shiftloop.ScheduleRule_input;
-import com.bsth.service.schedule.rules.ttinfo.*;
-import com.bsth.service.schedule.rules.validate.ValidateParam;
-import com.bsth.service.schedule.rules.validate.ValidateResults_output;
+import com.bsth.service.schedule.impl.plan.kBase1.core.plan.PlanCalcuParam_input;
+import com.bsth.service.schedule.impl.plan.kBase1.core.plan.PlanResult;
+import com.bsth.service.schedule.impl.plan.kBase1.core.rerun.RerunRule_input;
+import com.bsth.service.schedule.impl.plan.kBase1.core.rerun.RerunRule_param;
+import com.bsth.service.schedule.impl.plan.kBase1.core.shiftloop.ScheduleCalcuParam_input;
+import com.bsth.service.schedule.impl.plan.kBase1.core.shiftloop.ScheduleResults_output;
+import com.bsth.service.schedule.impl.plan.kBase1.core.shiftloop.ScheduleRule_input;
+import com.bsth.service.schedule.impl.plan.kBase1.core.ttinfo.*;
+import com.bsth.service.schedule.impl.plan.kBase1.core.validate.ValidateParam;
+import com.bsth.service.schedule.impl.plan.kBase1.core.validate.ValidateResults_output;
 import org.apache.commons.lang3.StringUtils;
 import org.joda.time.DateTime;
 import org.kie.api.KieBase;
-package com.bsth.service.schedule.rules;
+package com.bsth.service.schedule.impl.plan;
  
 import org.kie.api.KieBase;
 import org.kie.api.KieBaseConfiguration;
@@ -56,27 +56,24 @@ public class MyDroolsConfiguration {
         // 3.2、写入drl（写法超多，有点混乱）
         // 这里使用文件的形式写入，TODO：以后考虑从数据库中读drl写入
         // 注意kfs写的时候如果指定path，强制为src/main/resources/加上文件名，还有就是文件名不要重复否则会覆盖的
-        kfs.write("src/main/resources/functions.drl", kieServices.getResources()
+        kfs.write("src/main/resources/kBase1_core_shiftloop.drl", kieServices.getResources()
                 .newInputStreamResource(this.getClass().getResourceAsStream(
-                        "/rules/functions.drl"), "UTF-8"));
-        kfs.write("src/main/resources/shiftloop_fb_2.drl", kieServices.getResources()
+                        "/rules/kBase1_core_shiftloop.drl"), "UTF-8"));
+        kfs.write("src/main/resources/kBase1_core_ttinfo.drl", kieServices.getResources()
                 .newInputStreamResource(this.getClass().getResourceAsStream(
-                        "/rules/shiftloop_fb_2.drl"), "UTF-8"));
-        kfs.write("src/main/resources/ttinfo.drl", kieServices.getResources()
+                        "/rules/kBase1_core_ttinfo.drl"), "UTF-8"));
+        kfs.write("src/main/resources/kBase1_core_plan.drl", kieServices.getResources()
                 .newInputStreamResource(this.getClass().getResourceAsStream(
-                        "/rules/ttinfo.drl"), "UTF-8"));
-        kfs.write("src/main/resources/ttinfo2.drl", kieServices.getResources()
+                        "/rules/kBase1_core_plan.drl"), "UTF-8"));
+        kfs.write("src/main/resources/kBase1_core_rerun.drl", kieServices.getResources()
                 .newInputStreamResource(this.getClass().getResourceAsStream(
-                        "/rules/ttinfo2.drl"), "UTF-8"));
-        kfs.write("src/main/resources/plan.drl", kieServices.getResources()
+                        "/rules/kBase1_core_rerun.drl"), "UTF-8"));
+        kfs.write("src/main/resources/kBase1_core_validate.drl", kieServices.getResources()
                 .newInputStreamResource(this.getClass().getResourceAsStream(
-                        "/rules/plan.drl"), "UTF-8"));
-        kfs.write("src/main/resources/rerun.drl", kieServices.getResources()
+                        "/rules/kBase1_core_validate.drl"), "UTF-8"));
+        kfs.write("src/main/resources/kBase1_core_functions.drl", kieServices.getResources()
                 .newInputStreamResource(this.getClass().getResourceAsStream(
-                        "/rules/rerun.drl"), "UTF-8"));
-        kfs.write("src/main/resources/validplan.drl", kieServices.getResources()
-                .newInputStreamResource(this.getClass().getResourceAsStream(
-                        "/rules/validplan.drl"), "UTF-8"));
+                        "/rules/kBase1_core_functions.drl"), "UTF-8"));
         // TODO：还有其他drl....
  
         // 4、创建KieBuilder，使用KieFileSystem构建
@@ -134,9 +131,9 @@ public class MyDroolsConfiguration {
         // 这里使用文件的形式写入，TODO：以后考虑从数据库中读drl写入
         // 注意kfs写的时候如果指定path，强制为src/main/resources/加上文件名，还有就是文件名不要重复否则会覆盖的
  
-        kfs.write("src/main/resources/ruleWrap.drl", kieServices.getResources()
+        kfs.write("src/main/resources/kBase2_wrap_rule.drl", kieServices.getResources()
                 .newInputStreamResource(this.getClass().getResourceAsStream(
-                        "/rules/ruleWrap.drl"), "UTF-8"));
+                        "/rules/kBase2_wrap_rule.drl"), "UTF-8"));
  
         // TODO：还有其他drl....
  
@@ -161,4 +158,52 @@ public class MyDroolsConfiguration {
  
         return kieBase;
     }
+
+    /**
+     * 验证相关的drl知识库。
+     * @return
+     */
+    @Bean(name = "KBase3")
+    public KieBase myKieBase3() {
+        KieServices kieServices = KieServices.Factory.get();
+        KieModuleModel kieModuleModel = kieServices.newKieModuleModel();
+        KieBaseModel kieBaseModel = kieModuleModel.newKieBaseModel("KBase3")
+                .setDefault(true)
+                .setEqualsBehavior(EqualityBehaviorOption.EQUALITY)
+                .setEventProcessingMode(EventProcessingOption.STREAM);
+        kieBaseModel.newKieSessionModel("KSession1")
+                .setDefault(true)
+                .setType(KieSessionModel.KieSessionType.STATEFUL)
+                .setClockType(ClockTypeOption.get("realtime"));
+
+        KieFileSystem kieFileSystem = kieServices.newKieFileSystem();
+        kieFileSystem.writeKModuleXML(kieModuleModel.toXML());
+
+        kieFileSystem.write(
+                "src/main/resources/kBase3_validate_timetable.drl",
+                kieServices.getResources().newInputStreamResource(
+                        this.getClass().getResourceAsStream("/rules/kBase3_validate_timetable.drl"),
+                        "UTF-8"));
+        kieFileSystem.write(
+                "src/main/resources/kbase3_validate_rule.drl",
+                kieServices.getResources().newInputStreamResource(
+                        this.getClass().getResourceAsStream("/rules/kBase3_validate_rule.drl"),
+                        "UTF-8"));
+
+        KieBuilder kieBuilder = kieServices.newKieBuilder(kieFileSystem).buildAll();
+        Results results = kieBuilder.getResults();
+        if (results.hasMessages(Message.Level.ERROR)) {
+            throw new IllegalStateException("构建drools6错误：" + results.getMessages());
+        }
+
+        ReleaseId releaseId = kieServices.getRepository().getDefaultReleaseId();
+        KieContainer kieContainer = kieServices.newKieContainer(releaseId);
+
+        KieBaseConfiguration kieBaseConfiguration = kieServices.newKieBaseConfiguration();
+        KieBase kieBase = kieContainer.newKieBase("KBase3", kieBaseConfiguration);
+
+        return kieBase;
+
+    }
+
 }
-package com.bsth.service.schedule.rules;
+package com.bsth.service.schedule.impl.plan;
  
 import com.bsth.entity.schedule.SchedulePlan;
 import com.bsth.entity.schedule.SchedulePlanInfo;
 import com.bsth.entity.schedule.temp.SchedulePlanRuleResult;
-import com.bsth.service.schedule.rules.rerun.RerunRule_input;
+import com.bsth.service.schedule.impl.plan.kBase1.core.rerun.RerunRule_input;
  
 import java.util.Date;
 import java.util.List;
-package com.bsth.service.schedule.rules;
+package com.bsth.service.schedule.impl.plan;
  
 import com.bsth.entity.schedule.SchedulePlan;
 import com.bsth.entity.schedule.SchedulePlanInfo;
 import com.bsth.entity.schedule.temp.SchedulePlanRuleResult;
-import com.bsth.service.schedule.rules.rerun.RerunRule_input;
+import com.bsth.service.schedule.impl.plan.kBase1.core.rerun.RerunRule_input;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-package com.bsth.service.schedule.rules.plan;
+package com.bsth.service.schedule.impl.plan.kBase1.core.plan;
  
 import com.bsth.entity.schedule.SchedulePlan;
-import com.bsth.service.schedule.rules.shiftloop.ScheduleResults_output;
-import com.bsth.service.schedule.rules.ttinfo.TTInfoResults_output;
+import com.bsth.service.schedule.impl.plan.kBase1.core.shiftloop.ScheduleResults_output;
+import com.bsth.service.schedule.impl.plan.kBase1.core.ttinfo.TTInfoResults_output;
  
 /**
  * 排班规则-规则输入参数。
-package com.bsth.service.schedule.rules.plan;
+package com.bsth.service.schedule.impl.plan.kBase1.core.plan;
  
 import com.bsth.entity.schedule.SchedulePlanInfo;
  
-package com.bsth.service.schedule.rules.rerun;
+package com.bsth.service.schedule.impl.plan.kBase1.core.rerun;
  
 /**
  * Created by xu on 17/4/26.
-package com.bsth.service.schedule.rules.rerun;
+package com.bsth.service.schedule.impl.plan.kBase1.core.rerun;
  
 import java.util.Set;
  
-package com.bsth.service.schedule.rules.shiftloop;
+package com.bsth.service.schedule.impl.plan.kBase1.core.shiftloop;
  
 import com.bsth.entity.schedule.TTInfoDetail;
 import org.kie.api.runtime.rule.AccumulateFunction;
-package com.bsth.service.schedule.rules.shiftloop;
+package com.bsth.service.schedule.impl.plan.kBase1.core.shiftloop;
  
 import com.bsth.entity.schedule.TTInfoDetail;
 import org.joda.time.LocalTime;
-package com.bsth.service.schedule.rules.shiftloop;
+package com.bsth.service.schedule.impl.plan.kBase1.core.shiftloop;
  
 import com.bsth.entity.schedule.TTInfoDetail;
 import org.kie.api.runtime.rule.AccumulateFunction;
-package com.bsth.service.schedule.rules.shiftloop;
+package com.bsth.service.schedule.impl.plan.kBase1.core.shiftloop;
  
 import com.bsth.entity.schedule.SchedulePlan;
 import org.joda.time.DateTime;
-package com.bsth.service.schedule.rules.shiftloop;
+package com.bsth.service.schedule.impl.plan.kBase1.core.shiftloop;
  
 import org.joda.time.DateTime;
  
-package com.bsth.service.schedule.rules.shiftloop;
+package com.bsth.service.schedule.impl.plan.kBase1.core.shiftloop;
  
 import com.bsth.entity.schedule.temp.SchedulePlanRuleResult;
 import org.apache.commons.lang3.StringUtils;
-package com.bsth.service.schedule.rules.shiftloop;
+package com.bsth.service.schedule.impl.plan.kBase1.core.shiftloop;
  
 /**
  * 排班规则_输入_输出_类型。
-package com.bsth.service.schedule.rules.shiftloop;
+package com.bsth.service.schedule.impl.plan.kBase1.core.shiftloop;
  
 import com.bsth.entity.schedule.rule.ScheduleRule1Flat;
 import com.google.common.base.Splitter;
-package com.bsth.service.schedule.rules.ttinfo;
+package com.bsth.service.schedule.impl.plan.kBase1.core.ttinfo;
  
 import org.joda.time.DateTime;
  
-package com.bsth.service.schedule.rules.ttinfo;
+package com.bsth.service.schedule.impl.plan.kBase1.core.ttinfo;
  
 import com.bsth.entity.schedule.TTInfoDetail;
 import org.kie.api.runtime.rule.AccumulateFunction;
-package com.bsth.service.schedule.rules.ttinfo;
+package com.bsth.service.schedule.impl.plan.kBase1.core.ttinfo;
  
 import java.util.ArrayList;
 import java.util.List;
-package com.bsth.service.schedule.rules.ttinfo;
+package com.bsth.service.schedule.impl.plan.kBase1.core.ttinfo;
  
-import com.bsth.service.schedule.rules.shiftloop.ScheduleRule_input;
+import com.bsth.service.schedule.impl.plan.kBase1.core.shiftloop.ScheduleRule_input;
 import org.joda.time.DateTime;
 import org.kie.api.runtime.rule.AccumulateFunction;
  
-package com.bsth.service.schedule.rules.ttinfo;
+package com.bsth.service.schedule.impl.plan.kBase1.core.ttinfo;
  
 import org.joda.time.DateTime;
  
-package com.bsth.service.schedule.rules.ttinfo;
+package com.bsth.service.schedule.impl.plan.kBase1.core.ttinfo;
  
 import org.joda.time.DateTime;
  
-package com.bsth.service.schedule.rules.ttinfo;
+package com.bsth.service.schedule.impl.plan.kBase1.core.ttinfo;
  
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Multimap;
-package com.bsth.service.schedule.rules.ttinfo;
+package com.bsth.service.schedule.impl.plan.kBase1.core.ttinfo;
  
 import com.bsth.entity.schedule.TTInfo;
 import org.apache.commons.lang3.StringUtils;
-package com.bsth.service.schedule.rules.validate;
+package com.bsth.service.schedule.impl.plan.kBase1.core.validate;
  
 import com.bsth.entity.schedule.SchedulePlanInfo;
 import org.kie.api.runtime.rule.AccumulateFunction;
-package com.bsth.service.schedule.rules.validate;
+package com.bsth.service.schedule.impl.plan.kBase1.core.validate;
  
 import com.bsth.entity.schedule.SchedulePlanInfo;
-import com.bsth.service.schedule.rules.ttinfo.LpInfoResult_output;
+import com.bsth.service.schedule.impl.plan.kBase1.core.ttinfo.LpInfoResult_output;
 import org.kie.api.runtime.rule.AccumulateFunction;
  
 import java.io.*;
-package com.bsth.service.schedule.rules.validate;
+package com.bsth.service.schedule.impl.plan.kBase1.core.validate;
  
 import com.bsth.entity.schedule.SchedulePlanInfo;
 import org.kie.api.runtime.rule.AccumulateFunction;
-package com.bsth.service.schedule.rules.validate;
+package com.bsth.service.schedule.impl.plan.kBase1.core.validate;
  
 import org.joda.time.DateTime;
 import org.joda.time.Period;
-package com.bsth.service.schedule.rules.validate;
+package com.bsth.service.schedule.impl.plan.kBase1.core.validate;
  
 import com.bsth.entity.schedule.SchedulePlanInfo;
-import com.bsth.service.schedule.rules.ttinfo.LpInfoResult_output;
+import com.bsth.service.schedule.impl.plan.kBase1.core.ttinfo.LpInfoResult_output;
  
 import java.util.Date;
 import java.util.List;
-package com.bsth.service.schedule.rules.validate;
+package com.bsth.service.schedule.impl.plan.kBase1.core.validate;
  
 import java.util.ArrayList;
 import java.util.Date;
+package com.bsth.service.schedule.impl.plan.kBase3.validate.rule;
+
+import org.joda.time.DateTime;
+
+/**
+ * 计算用参数。
+ */
+public class CalcuParam {
+    /** 线路Id */
+    private Integer xlId;
+
+    /** 计划开始计算日期 */
+    private DateTime fromDate;
+    /** 计划结束计算日期 */
+    private DateTime toDate;
+
+    public Integer getXlId() {
+        return xlId;
+    }
+
+    public void setXlId(Integer xlId) {
+        this.xlId = xlId;
+    }
+
+    public DateTime getFromDate() {
+        return fromDate;
+    }
+
+    public void setFromDate(DateTime fromDate) {
+        this.fromDate = fromDate;
+    }
+
+    public DateTime getToDate() {
+        return toDate;
+    }
+
+    public void setToDate(DateTime toDate) {
+        this.toDate = toDate;
+    }
+}
+package com.bsth.service.schedule.impl.plan.kBase3.validate.rule;
+
+
+import com.bsth.entity.schedule.EmployeeConfigInfo;
+import com.bsth.entity.schedule.GuideboardInfo;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.math.NumberUtils;
+import org.kie.api.runtime.rule.AccumulateFunction;
+
+import java.io.*;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 查找错误函数。
+ */
+public class ErrorInfoFunction implements AccumulateFunction {
+    @Override
+    public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+
+    }
+
+    @Override
+    public void writeExternal(ObjectOutput out) throws IOException {
+
+    }
+
+    protected static class ErrorInfoContext implements Externalizable {
+        /** 错误数量 */
+        public Integer errorCount = 0;
+        /** 错误Map，Map<规则id，errorInfo> */
+        public Map<Long, ValidateRuleResult.ErrorInfo> errorInfoMap = new HashMap<>();
+
+        public ErrorInfoContext() {
+
+        }
+
+        @Override
+        public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+            errorCount = in.readInt();
+            errorInfoMap = (Map<Long, ValidateRuleResult.ErrorInfo>) in.readObject();
+
+        }
+
+        @Override
+        public void writeExternal(ObjectOutput out) throws IOException {
+            out.writeInt(errorCount);
+            out.writeObject(errorInfoMap);
+        }
+
+    }
+
+    @Override
+    public Serializable createContext() {
+        return new ErrorInfoContext();
+    }
+
+    @Override
+    public void init(Serializable serializable) throws Exception {
+        ErrorInfoContext errorInfoContext = (ErrorInfoContext) serializable;
+        errorInfoContext.errorCount = 0;
+        errorInfoContext.errorInfoMap = new HashMap<>();
+    }
+
+    @Override
+    public void accumulate(Serializable serializable, Object o) {
+        ErrorInfoContext errorInfoContext = (ErrorInfoContext) serializable;
+        WrapInput wrapInput = (WrapInput) o;
+
+        ValidateRuleResult.ErrorInfo errorInfo = new ValidateRuleResult.ErrorInfo();
+        errorInfo.setRuleId(wrapInput.getRuleId());
+        errorInfo.setClZbh(wrapInput.getClZbh());
+        errorInfo.setQyrq(wrapInput.getQyrq());
+
+        // 1、车辆配置验证
+        if (StringUtils.isNotEmpty(wrapInput.getClZbh())) { // 自编号不能为空
+            if (wrapInput.getCcInfos().get(wrapInput.getClZbh()) == null) { // 车辆配置不在当前线路上
+                errorInfo.getErrorDescList().add("车辆配置不在当前线路，请重新编辑保存！");
+            }
+        } else {
+            errorInfo.getErrorDescList().add("自编号不能为空，请重新编辑保存！");
+        }
+
+        // 2、路牌id，路牌名字，路牌起始索引验证
+        if (StringUtils.isNotEmpty(wrapInput.getLpIds()) &&
+                StringUtils.isNotEmpty(wrapInput.getLpNames())) { // 冗余的路牌id和路牌名字都不能为空
+            String[] lpIds = wrapInput.getLpIds().split(",");
+            String[] lpNames = wrapInput.getLpNames().split(",");
+            if (lpIds.length == lpNames.length) { // 路牌id和路牌名字个数一致
+                for (int i = 0; i < lpIds.length; i++) {
+                    if (!NumberUtils.isDigits(lpIds[i])) { // 冗余路牌id必须是数字
+                        errorInfo.getErrorDescList().add("冗余路牌id必须是数字，请重新编辑保存！");
+                        break;
+                    }
+
+                    GuideboardInfo lpInfo = wrapInput.getLpInfos().get(NumberUtils.toLong(lpIds[i]));
+                    if (lpInfo == null) { // 路牌不在当前线路上
+                        errorInfo.getErrorDescList().add("路牌不在当前线路上，请重新编辑保存！");
+                    } else {
+                        if (StringUtils.isEmpty(lpNames[i]) ||
+                                !(lpNames[i].equals(lpInfo.getLpName()))) { // 路牌id和路牌名字不对应
+                            errorInfo.getErrorDescList().add("路牌id和路牌名字不对应，请重新编辑保存！");
+                            break;
+                        }
+                    }
+                }
+
+                if (wrapInput.getLpStartIndex() < 1 ||
+                        wrapInput.getLpStartIndex() > lpIds.length) { // 路牌起始索引溢出
+                    errorInfo.getErrorDescList().add("路牌起始索引溢出，请重新编辑保存！");
+                }
+            } else {
+                errorInfo.getErrorDescList().add("路牌id和路牌名字个数不一致，请重新编辑保存！");
+            }
+        } else {
+            errorInfo.getErrorDescList().add("冗余的路牌id和路牌名字都不能为空，请重新编辑保存！");
+        }
+
+        // 3、人员配置，搭班编码，人员起始索引验证
+        if (StringUtils.isNotEmpty(wrapInput.getEcIds()) &&
+                StringUtils.isNotEmpty(wrapInput.getEcDbbms())) { // 冗余的人员配置id和人员搭班编码都不能为空
+            String[] ecIds = wrapInput.getEcIds().split(",");
+            String[] ecDbbms = wrapInput.getEcDbbms().split(",");
+            if (ecIds.length == ecDbbms.length) { // 人员配置id和搭班编码个数一致
+                for (int i = 0; i < ecIds.length; i++) {
+                    if (ecIds[i].contains("-")) { // 分班标识
+                        String[] fb_ecIds = ecIds[i].split("-");
+                        String[] fb_ecDbbms = ecDbbms[i].split("-");
+                        if (fb_ecIds.length != 2 || fb_ecDbbms.length != 2) { // 只能早晚分班
+                            errorInfo.getErrorDescList().add("只能早晚分班，请重新编辑保存！");
+                            break;
+                        } else {
+                            EmployeeConfigInfo fb_ecInfo1 = wrapInput.getEcInfos().get(NumberUtils.toLong(fb_ecIds[0]));
+                            EmployeeConfigInfo fb_ecInfo2 = wrapInput.getEcInfos().get(NumberUtils.toLong(fb_ecIds[1]));
+                            if (fb_ecInfo1 == null || fb_ecInfo2 == null) { // 分班的人员配置不在当前线路
+                                errorInfo.getErrorDescList().add("分班的人员配置不在当前线路，请重新编辑保存！");
+                                break;
+                            } else {
+                                if (StringUtils.isEmpty(fb_ecDbbms[0]) ||
+                                        StringUtils.isEmpty(fb_ecDbbms[1]) ||
+                                        !(fb_ecDbbms[0].equals(fb_ecInfo1.getDbbm())) ||
+                                        !(fb_ecDbbms[1].equals(fb_ecInfo2.getDbbm()))) { // 分班人员配置id和搭班编码不对应
+                                    errorInfo.getErrorDescList().add("分班人员配置id和搭班编码不对应，请重新编辑保存！");
+                                    break;
+                                }
+                            }
+                        }
+
+                    } else {
+                        if (!NumberUtils.isDigits(ecIds[i])) { // 冗余的人员配置id必须是数字
+                            errorInfo.getErrorDescList().add("冗余的人员配置id必须是数字，请重新编辑保存！");
+                            break;
+                        }
+
+                        EmployeeConfigInfo ecInfo = wrapInput.getEcInfos().get(NumberUtils.toLong(ecIds[i]));
+                        if (ecInfo == null) { // 人员配置不在当前线路
+                            errorInfo.getErrorDescList().add("人员配置不在当前线路，请重新编辑保存！");
+                            break;
+                        } else {
+                            if (StringUtils.isEmpty(ecDbbms[i]) ||
+                                    !(ecDbbms[i].equals(ecInfo.getDbbm()))) { // 人员配置id和搭班编码不对应
+                                errorInfo.getErrorDescList().add("人员配置id和搭班编码不对应，请重新编辑保存！");
+                                break;
+                            }
+                        }
+                    }
+                }
+
+                if (wrapInput.getEcStartIndex() < 1 ||
+                        wrapInput.getEcStartIndex() > ecIds.length) { // 人员起始索引溢出
+                    errorInfo.getErrorDescList().add("人员起始索引溢出，请重新编辑保存！");
+                }
+            } else {
+                errorInfo.getErrorDescList().add("人员配置id和搭班编码个数不一致，请重新编辑保存！");
+            }
+        }
+
+        if (errorInfo.getErrorDescList().size() > 0) {
+            errorInfoContext.errorCount ++;
+            errorInfoContext.errorInfoMap.put(wrapInput.getRuleId(), errorInfo);
+        }
+
+    }
+
+    @Override
+    public void reverse(Serializable serializable, Object o) throws Exception {
+        ErrorInfoContext errorInfoContext = (ErrorInfoContext) serializable;
+        WrapInput wrapInput = (WrapInput) o;
+
+        if (errorInfoContext.errorInfoMap.get(wrapInput.getRuleId()) != null) {
+            errorInfoContext.errorInfoMap.remove(wrapInput.getRuleId());
+            errorInfoContext.errorCount --;
+        }
+    }
+
+    @Override
+    public Object getResult(Serializable serializable) throws Exception {
+        ErrorInfoContext errorInfoContext = (ErrorInfoContext) serializable;
+        return errorInfoContext.errorInfoMap;
+    }
+
+    @Override
+    public boolean supportsReverse() {
+        return true;
+    }
+
+    @Override
+    public Class<?> getResultType() {
+        return Map.class;
+    }
+
+}
+package com.bsth.service.schedule.impl.plan.kBase3.validate.rule;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 输出结果值。
+ */
+public class ValidateRuleResult {
+    /** 线路id */
+    private Integer xlId;
+    /** 规则总数量 */
+    private Integer count;
+    /** 启用的规则数量 */
+    private Integer qyCount;
+    /** 启用规则中的错误数量 */
+    private Integer qyErrorCount;
+    /** 错误列表 */
+    private List<ErrorInfo> errorInfos = new ArrayList<>();
+
+    public Integer getXlId() {
+        return xlId;
+    }
+
+    public void setXlId(Integer xlId) {
+        this.xlId = xlId;
+    }
+
+    public Integer getCount() {
+        return count;
+    }
+
+    public void setCount(Integer count) {
+        this.count = count;
+    }
+
+    public Integer getQyCount() {
+        return qyCount;
+    }
+
+    public void setQyCount(Integer qyCount) {
+        this.qyCount = qyCount;
+    }
+
+    public Integer getQyErrorCount() {
+        return qyErrorCount;
+    }
+
+    public void setQyErrorCount(Integer qyErrorCount) {
+        this.qyErrorCount = qyErrorCount;
+    }
+
+    public List<ErrorInfo> getErrorInfos() {
+        return errorInfos;
+    }
+
+    public void setErrorInfos(List<ErrorInfo> errorInfos) {
+        this.errorInfos = errorInfos;
+    }
+
+    public static class ErrorInfo {
+        /** 规则id */
+        private Long ruleId;
+        /** 车辆自编号 */
+        private String clZbh;
+        /** 启用日期 */
+        private Date qyrq;
+        /** 错误描述 */
+        private List<String> errorDescList = new ArrayList<>();
+
+        public Long getRuleId() {
+            return ruleId;
+        }
+
+        public void setRuleId(Long ruleId) {
+            this.ruleId = ruleId;
+        }
+
+        public String getClZbh() {
+            return clZbh;
+        }
+
+        public void setClZbh(String clZbh) {
+            this.clZbh = clZbh;
+        }
+
+        public Date getQyrq() {
+            return qyrq;
+        }
+
+        public void setQyrq(Date qyrq) {
+            this.qyrq = qyrq;
+        }
+
+        public List<String> getErrorDescList() {
+            return errorDescList;
+        }
+
+        public void setErrorDescList(List<String> errorDescList) {
+            this.errorDescList = errorDescList;
+        }
+    }
+}
+package com.bsth.service.schedule.impl.plan.kBase3.validate.rule;
+
+import com.bsth.entity.schedule.CarConfigInfo;
+import com.bsth.entity.schedule.EmployeeConfigInfo;
+import com.bsth.entity.schedule.GuideboardInfo;
+import com.bsth.entity.schedule.rule.ScheduleRule1Flat;
+import org.springframework.util.CollectionUtils;
+
+import java.util.*;
+
+/**
+ * 聚合输入的待判定数据。
+ */
+public class WrapInput {
+    /** 线路Id */
+    private Integer xlId;
+    /** 车辆自编号 */
+    private String clZbh;
+    /** 路牌id列表 */
+    private String lpIds;
+    /** 路牌名字列表 */
+    private String lpNames;
+    /** 人员配置列表 */
+    private String ecIds;
+    /** 人员搭班编码列表 */
+    private String ecDbbms;
+    /** 路牌循环起始索引 */
+    private Integer lpStartIndex;
+    /** 人员循环起始索引 */
+    private Integer ecStartIndex;
+    /** 规则id */
+    private Long ruleId;
+    /** 启用日期 */
+    private Date qyrq;
+
+    private Map<String, CarConfigInfo> ccInfos = new HashMap<>();
+    private Map<Long, GuideboardInfo> lpInfos = new HashMap<>();
+    private Map<Long, EmployeeConfigInfo> ecInfos = new HashMap<>();
+
+    public WrapInput(ScheduleRule1Flat r,
+                     Map<String, CarConfigInfo> cc,
+                     Map<Long, GuideboardInfo> lp,
+                     Map<Long, EmployeeConfigInfo> ec) {
+        this.xlId = r.getXl().getId();
+        this.clZbh = r.getCarConfigInfo().getCl().getInsideCode();
+        this.lpIds = r.getLpIds();
+        this.lpNames = r.getLpNames();
+        this.ecIds = r.getRyConfigIds();
+        this.ecDbbms = r.getRyDbbms();
+        this.lpStartIndex = r.getLpStart();
+        this.ecStartIndex = r.getRyStart();
+        this.ruleId = r.getId();
+        this.qyrq = r.getQyrq();
+
+        if (!CollectionUtils.isEmpty(cc)) {
+            this.ccInfos.putAll(cc);
+        }
+        if (!CollectionUtils.isEmpty(lp)) {
+            this.lpInfos.putAll(lp);
+        }
+        if (!CollectionUtils.isEmpty(ec)) {
+            this.ecInfos.putAll(ec);
+        }
+
+    }
+
+    public Integer getXlId() {
+        return xlId;
+    }
+
+    public void setXlId(Integer xlId) {
+        this.xlId = xlId;
+    }
+
+    public String getClZbh() {
+        return clZbh;
+    }
+
+    public void setClZbh(String clZbh) {
+        this.clZbh = clZbh;
+    }
+
+    public String getLpIds() {
+        return lpIds;
+    }
+
+    public void setLpIds(String lpIds) {
+        this.lpIds = lpIds;
+    }
+
+    public String getLpNames() {
+        return lpNames;
+    }
+
+    public void setLpNames(String lpNames) {
+        this.lpNames = lpNames;
+    }
+
+    public String getEcIds() {
+        return ecIds;
+    }
+
+    public void setEcIds(String ecIds) {
+        this.ecIds = ecIds;
+    }
+
+    public String getEcDbbms() {
+        return ecDbbms;
+    }
+
+    public void setEcDbbms(String ecDbbms) {
+        this.ecDbbms = ecDbbms;
+    }
+
+    public Integer getLpStartIndex() {
+        return lpStartIndex;
+    }
+
+    public void setLpStartIndex(Integer lpStartIndex) {
+        this.lpStartIndex = lpStartIndex;
+    }
+
+    public Integer getEcStartIndex() {
+        return ecStartIndex;
+    }
+
+    public void setEcStartIndex(Integer ecStartIndex) {
+        this.ecStartIndex = ecStartIndex;
+    }
+
+    public Long getRuleId() {
+        return ruleId;
+    }
+
+    public void setRuleId(Long ruleId) {
+        this.ruleId = ruleId;
+    }
+
+    public Date getQyrq() {
+        return qyrq;
+    }
+
+    public void setQyrq(Date qyrq) {
+        this.qyrq = qyrq;
+    }
+
+    public Map<String, CarConfigInfo> getCcInfos() {
+        return ccInfos;
+    }
+
+    public void setCcInfos(Map<String, CarConfigInfo> ccInfos) {
+        this.ccInfos = ccInfos;
+    }
+
+    public Map<Long, GuideboardInfo> getLpInfos() {
+        return lpInfos;
+    }
+
+    public void setLpInfos(Map<Long, GuideboardInfo> lpInfos) {
+        this.lpInfos = lpInfos;
+    }
+
+    public Map<Long, EmployeeConfigInfo> getEcInfos() {
+        return ecInfos;
+    }
+
+    public void setEcInfos(Map<Long, EmployeeConfigInfo> ecInfos) {
+        this.ecInfos = ecInfos;
+    }
+}
-package com.bsth.service.schedule.rules.ttinfo2;
+package com.bsth.service.schedule.impl.plan.kBase3.validate.timetable;
  
 import org.joda.time.DateTime;
  
-package com.bsth.service.schedule.rules.ttinfo2;
+package com.bsth.service.schedule.impl.plan.kBase3.validate.timetable;
  
 import com.bsth.entity.schedule.TTInfoDetail;
 import org.apache.commons.lang3.StringUtils;
-package com.bsth.service.schedule.rules.ttinfo2;
+package com.bsth.service.schedule.impl.plan.kBase3.validate.timetable;
  
 import java.util.ArrayList;
 import java.util.List;
@@ -22,6 +22,8 @@ public class Result {
         private Long ttid;
         /** 时刻表名字 */
         private String ttname;
+        /** 线路版本 */
+        private Integer lineVersion;
  
         /** 所有班次数 */
         private Long allbc;
@@ -90,5 +92,13 @@ public class Result {
         public void setErrorbc(Long errorbc) {
             this.errorbc = errorbc;
         }
+
+        public Integer getLineVersion() {
+            return lineVersion;
+        }
+
+        public void setLineVersion(Integer lineVersion) {
+            this.lineVersion = lineVersion;
+        }
     }
 }
@@ -10,13 +10,18 @@
     <directory>&#x2f;</directory>
     <parameters>
         <parameter>
+            <name>QUERY</name>
+            <default_value/>
+            <description>&#x67e5;&#x8be2;</description>
+        </parameter>
+        <parameter>
             <name>cgsbm_in</name>
             <default_value/>
             <description>&#x5206;&#x516c;&#x53f8;&#x7f16;&#x7801;</description>
         </parameter>
         <parameter>
             <name>filepath</name>
-            <default_value/>
+            <default_value>1&#x3d;1</default_value>
             <description>excel&#x6587;&#x4ef6;&#x8def;&#x5f84;</description>
         </parameter>
     </parameters>
@@ -192,6 +197,102 @@
     </attributes>
   </connection>
   <connection>
+    <name>JGJW_VM</name>
+    <server>192.168.198.240</server>
+    <type>ORACLE</type>
+    <access>Native</access>
+    <database>orcl</database>
+    <port>1521</port>
+    <username>jwgl</username>
+    <password>Encrypted 2be98afc86aa7f2e4cb79ce10d485a8d6</password>
+    <servername/>
+    <data_tablespace/>
+    <index_tablespace/>
+    <attributes>
+      <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute>
+      <attribute><code>FORCE_IDENTIFIERS_TO_UPPERCASE</code><attribute>N</attribute></attribute>
+      <attribute><code>IS_CLUSTERED</code><attribute>N</attribute></attribute>
+      <attribute><code>PORT_NUMBER</code><attribute>1521</attribute></attribute>
+      <attribute><code>PRESERVE_RESERVED_WORD_CASE</code><attribute>N</attribute></attribute>
+      <attribute><code>QUOTE_ALL_FIELDS</code><attribute>N</attribute></attribute>
+      <attribute><code>SUPPORTS_BOOLEAN_DATA_TYPE</code><attribute>Y</attribute></attribute>
+      <attribute><code>SUPPORTS_TIMESTAMP_DATA_TYPE</code><attribute>Y</attribute></attribute>
+      <attribute><code>USE_POOLING</code><attribute>N</attribute></attribute>
+    </attributes>
+  </connection>
+  <connection>
+    <name>NHJW_VM</name>
+    <server>192.168.198.240</server>
+    <type>ORACLE</type>
+    <access>Native</access>
+    <database>orcl</database>
+    <port>1521</port>
+    <username>nhjw</username>
+    <password>Encrypted 2be98afc86aa7f2e4cb79ce10d09aa5cd</password>
+    <servername/>
+    <data_tablespace/>
+    <index_tablespace/>
+    <attributes>
+      <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute>
+      <attribute><code>FORCE_IDENTIFIERS_TO_UPPERCASE</code><attribute>N</attribute></attribute>
+      <attribute><code>IS_CLUSTERED</code><attribute>N</attribute></attribute>
+      <attribute><code>PORT_NUMBER</code><attribute>1521</attribute></attribute>
+      <attribute><code>PRESERVE_RESERVED_WORD_CASE</code><attribute>N</attribute></attribute>
+      <attribute><code>QUOTE_ALL_FIELDS</code><attribute>N</attribute></attribute>
+      <attribute><code>SUPPORTS_BOOLEAN_DATA_TYPE</code><attribute>Y</attribute></attribute>
+      <attribute><code>SUPPORTS_TIMESTAMP_DATA_TYPE</code><attribute>Y</attribute></attribute>
+      <attribute><code>USE_POOLING</code><attribute>N</attribute></attribute>
+    </attributes>
+  </connection>
+  <connection>
+    <name>PDGJ_VM</name>
+    <server>192.168.198.240</server>
+    <type>ORACLE</type>
+    <access>Native</access>
+    <database>orcl</database>
+    <port>1521</port>
+    <username>pdgj</username>
+    <password>Encrypted 2be98afc86aa7f2e4cb79ce10ce96a8d0</password>
+    <servername/>
+    <data_tablespace/>
+    <index_tablespace/>
+    <attributes>
+      <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute>
+      <attribute><code>FORCE_IDENTIFIERS_TO_UPPERCASE</code><attribute>N</attribute></attribute>
+      <attribute><code>IS_CLUSTERED</code><attribute>N</attribute></attribute>
+      <attribute><code>PORT_NUMBER</code><attribute>1521</attribute></attribute>
+      <attribute><code>PRESERVE_RESERVED_WORD_CASE</code><attribute>N</attribute></attribute>
+      <attribute><code>QUOTE_ALL_FIELDS</code><attribute>N</attribute></attribute>
+      <attribute><code>SUPPORTS_BOOLEAN_DATA_TYPE</code><attribute>Y</attribute></attribute>
+      <attribute><code>SUPPORTS_TIMESTAMP_DATA_TYPE</code><attribute>Y</attribute></attribute>
+      <attribute><code>USE_POOLING</code><attribute>N</attribute></attribute>
+    </attributes>
+  </connection>
+  <connection>
+    <name>SNJW_VM</name>
+    <server>192.168.198.240</server>
+    <type>ORACLE</type>
+    <access>Native</access>
+    <database>orcl</database>
+    <port>1521</port>
+    <username>snjw</username>
+    <password>Encrypted 2be98afc86aa7f2e4cb79ce10cd9ca5cd</password>
+    <servername/>
+    <data_tablespace/>
+    <index_tablespace/>
+    <attributes>
+      <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute>
+      <attribute><code>FORCE_IDENTIFIERS_TO_UPPERCASE</code><attribute>N</attribute></attribute>
+      <attribute><code>IS_CLUSTERED</code><attribute>N</attribute></attribute>
+      <attribute><code>PORT_NUMBER</code><attribute>1521</attribute></attribute>
+      <attribute><code>PRESERVE_RESERVED_WORD_CASE</code><attribute>N</attribute></attribute>
+      <attribute><code>QUOTE_ALL_FIELDS</code><attribute>N</attribute></attribute>
+      <attribute><code>SUPPORTS_BOOLEAN_DATA_TYPE</code><attribute>Y</attribute></attribute>
+      <attribute><code>SUPPORTS_TIMESTAMP_DATA_TYPE</code><attribute>Y</attribute></attribute>
+      <attribute><code>USE_POOLING</code><attribute>N</attribute></attribute>
+    </attributes>
+  </connection>
+  <connection>
     <name>xlab_mysql_youle</name>
     <server>101.231.124.8</server>
     <type>MYSQL</type>
@@ -270,6 +371,102 @@
       <attribute><code>USE_POOLING</code><attribute>N</attribute></attribute>
     </attributes>
   </connection>
+  <connection>
+    <name>YGJW_VM</name>
+    <server>192.168.198.240</server>
+    <type>ORACLE</type>
+    <access>Native</access>
+    <database>orcl</database>
+    <port>1521</port>
+    <username>ygjw</username>
+    <password>Encrypted 2be98afc86aa7f2e4cb79ce10c795a5cd</password>
+    <servername/>
+    <data_tablespace/>
+    <index_tablespace/>
+    <attributes>
+      <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute>
+      <attribute><code>FORCE_IDENTIFIERS_TO_UPPERCASE</code><attribute>N</attribute></attribute>
+      <attribute><code>IS_CLUSTERED</code><attribute>N</attribute></attribute>
+      <attribute><code>PORT_NUMBER</code><attribute>1521</attribute></attribute>
+      <attribute><code>PRESERVE_RESERVED_WORD_CASE</code><attribute>N</attribute></attribute>
+      <attribute><code>QUOTE_ALL_FIELDS</code><attribute>N</attribute></attribute>
+      <attribute><code>SUPPORTS_BOOLEAN_DATA_TYPE</code><attribute>Y</attribute></attribute>
+      <attribute><code>SUPPORTS_TIMESTAMP_DATA_TYPE</code><attribute>Y</attribute></attribute>
+      <attribute><code>USE_POOLING</code><attribute>N</attribute></attribute>
+    </attributes>
+  </connection>
+  <connection>
+    <name>&#x516c;&#x53f8;jgjw</name>
+    <server>192.168.168.1</server>
+    <type>ORACLE</type>
+    <access>Native</access>
+    <database>orcl</database>
+    <port>1521</port>
+    <username>jwgl</username>
+    <password>Encrypted 2be98afc86aa7f2e4cb79ce10d485a8d6</password>
+    <servername/>
+    <data_tablespace/>
+    <index_tablespace/>
+    <attributes>
+      <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute>
+      <attribute><code>FORCE_IDENTIFIERS_TO_UPPERCASE</code><attribute>N</attribute></attribute>
+      <attribute><code>IS_CLUSTERED</code><attribute>N</attribute></attribute>
+      <attribute><code>PORT_NUMBER</code><attribute>1521</attribute></attribute>
+      <attribute><code>PRESERVE_RESERVED_WORD_CASE</code><attribute>N</attribute></attribute>
+      <attribute><code>QUOTE_ALL_FIELDS</code><attribute>N</attribute></attribute>
+      <attribute><code>SUPPORTS_BOOLEAN_DATA_TYPE</code><attribute>Y</attribute></attribute>
+      <attribute><code>SUPPORTS_TIMESTAMP_DATA_TYPE</code><attribute>Y</attribute></attribute>
+      <attribute><code>USE_POOLING</code><attribute>N</attribute></attribute>
+    </attributes>
+  </connection>
+  <connection>
+    <name>&#x516c;&#x53f8;snjw</name>
+    <server>192.168.168.1</server>
+    <type>ORACLE</type>
+    <access>Native</access>
+    <database>orcl</database>
+    <port>1521</port>
+    <username>snjw</username>
+    <password>Encrypted 2be98afc86aa7f2e4cb79ce10cd9ca5cd</password>
+    <servername/>
+    <data_tablespace/>
+    <index_tablespace/>
+    <attributes>
+      <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute>
+      <attribute><code>FORCE_IDENTIFIERS_TO_UPPERCASE</code><attribute>N</attribute></attribute>
+      <attribute><code>IS_CLUSTERED</code><attribute>N</attribute></attribute>
+      <attribute><code>PORT_NUMBER</code><attribute>1521</attribute></attribute>
+      <attribute><code>PRESERVE_RESERVED_WORD_CASE</code><attribute>N</attribute></attribute>
+      <attribute><code>QUOTE_ALL_FIELDS</code><attribute>N</attribute></attribute>
+      <attribute><code>SUPPORTS_BOOLEAN_DATA_TYPE</code><attribute>Y</attribute></attribute>
+      <attribute><code>SUPPORTS_TIMESTAMP_DATA_TYPE</code><attribute>Y</attribute></attribute>
+      <attribute><code>USE_POOLING</code><attribute>N</attribute></attribute>
+    </attributes>
+  </connection>
+  <connection>
+    <name>&#x516c;&#x53f8;ygjw</name>
+    <server>192.168.168.1</server>
+    <type>ORACLE</type>
+    <access>Native</access>
+    <database>orcl</database>
+    <port>1521</port>
+    <username>ygjw</username>
+    <password>Encrypted 2be98afc86aa7f2e4cb79ce10c795a5cd</password>
+    <servername/>
+    <data_tablespace/>
+    <index_tablespace/>
+    <attributes>
+      <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute>
+      <attribute><code>FORCE_IDENTIFIERS_TO_UPPERCASE</code><attribute>N</attribute></attribute>
+      <attribute><code>IS_CLUSTERED</code><attribute>N</attribute></attribute>
+      <attribute><code>PORT_NUMBER</code><attribute>1521</attribute></attribute>
+      <attribute><code>PRESERVE_RESERVED_WORD_CASE</code><attribute>N</attribute></attribute>
+      <attribute><code>QUOTE_ALL_FIELDS</code><attribute>N</attribute></attribute>
+      <attribute><code>SUPPORTS_BOOLEAN_DATA_TYPE</code><attribute>Y</attribute></attribute>
+      <attribute><code>SUPPORTS_TIMESTAMP_DATA_TYPE</code><attribute>Y</attribute></attribute>
+      <attribute><code>USE_POOLING</code><attribute>N</attribute></attribute>
+    </attributes>
+  </connection>
   <order>
   <hop> <from>&#x516c;&#x53f8;&#x67e5;&#x8be2;</from><to>&#x5206;&#x516c;&#x53f8;&#x67e5;&#x8be2;</to><enabled>Y</enabled> </hop>
   <hop> <from>&#x5206;&#x516c;&#x53f8;&#x67e5;&#x8be2;</from><to>&#x5b57;&#x6bb5;&#x9009;&#x62e9;</to><enabled>Y</enabled> </hop>
@@ -480,7 +677,7 @@
     <name>&#x5b57;&#x6bb5;&#x9009;&#x62e9;</name>
     <type>SelectValues</type>
     <description/>
-    <distribute>Y</distribute>
+    <distribute>N</distribute>
     <custom_distribution/>
     <copies>1</copies>
          <partitioning>
@@ -525,6 +722,36 @@
     </step>
  
   <step>
+    <name>&#x662f;&#x5426;&#x7535;&#x8f66;</name>
+    <type>ScriptValueMod</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <compatible>N</compatible>
+    <optimizationLevel>9</optimizationLevel>
+    <jsScripts>      <jsScript>        <jsScript_type>0</jsScript_type>
+        <jsScript_name>Script 1</jsScript_name>
+        <jsScript_script>&#x2f;&#x2f;Script here&#xa;&#xa;var &#x662f;&#x5426;&#x7535;&#x8f66; &#x3d; &#x22;&#x5426;&#x22;&#x3b;&#xa;&#xa;if&#x28;sfdc_cal &#x3d;&#x3d; 0&#x29; &#x7b;&#xa;	&#x662f;&#x5426;&#x7535;&#x8f66; &#x3d; &#x22;&#x5426;&#x22;&#x3b;&#xa;&#x7d; else if &#x28;sfdc_cal &#x3d;&#x3d; 1&#x29; &#x7b;&#xa;	&#x662f;&#x5426;&#x7535;&#x8f66; &#x3d; &#x22;&#x662f;&#x22;&#x3b;&#xa;&#x7d; else &#x7b;&#xa;	&#x662f;&#x5426;&#x7535;&#x8f66; &#x3d; &#x22;&#x5426;&#x22;&#x3b;&#xa;&#x7d;&#xa;</jsScript_script>
+      </jsScript>    </jsScripts>    <fields>      <field>        <name>&#x662f;&#x5426;&#x7535;&#x8f66;</name>
+        <rename>&#x662f;&#x5426;&#x7535;&#x8f66;</rename>
+        <type>String</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <replace>N</replace>
+      </field>    </fields>     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>695</xloc>
+      <yloc>173</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
     <name>&#x6dfb;&#x52a0;&#x67e5;&#x8be2;&#x5e38;&#x91cf;</name>
     <type>ScriptValueMod</type>
     <description/>
@@ -566,7 +793,7 @@
            <schema_name/>
            </partitioning>
     <connection>bus_control_variable</connection>
-    <sql>SELECT &#x2a; FROM bsth_c_cars&#xa;&#xa;</sql>
+    <sql>SELECT &#x2a; FROM bsth_c_cars&#xa;where &#x24;&#x7b;QUERY&#x7d;</sql>
     <limit>0</limit>
     <lookup/>
     <execute_each_row>N</execute_each_row>
@@ -580,36 +807,6 @@
       </GUI>
     </step>
  
-  <step>
-    <name>&#x662f;&#x5426;&#x7535;&#x8f66;</name>
-    <type>ScriptValueMod</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-         <partitioning>
-           <method>none</method>
-           <schema_name/>
-           </partitioning>
-    <compatible>N</compatible>
-    <optimizationLevel>9</optimizationLevel>
-    <jsScripts>      <jsScript>        <jsScript_type>0</jsScript_type>
-        <jsScript_name>Script 1</jsScript_name>
-        <jsScript_script>&#x2f;&#x2f;Script here&#xa;&#xa;var &#x662f;&#x5426;&#x7535;&#x8f66; &#x3d; &#x22;&#x5426;&#x22;&#x3b;&#xa;&#xa;if&#x28;sfdc_cal&#x29; &#x7b;&#xa;	&#x662f;&#x5426;&#x7535;&#x8f66; &#x3d; &#x22;&#x662f;&#x22;&#x3b;&#xa;&#x7d;&#xa;</jsScript_script>
-      </jsScript>    </jsScripts>    <fields>      <field>        <name>&#x662f;&#x5426;&#x7535;&#x8f66;</name>
-        <rename>&#x662f;&#x5426;&#x7535;&#x8f66;</rename>
-        <type>String</type>
-        <length>-1</length>
-        <precision>-1</precision>
-        <replace>N</replace>
-      </field>    </fields>     <cluster_schema/>
- <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>695</xloc>
-      <yloc>173</yloc>
-      <draw>Y</draw>
-      </GUI>
-    </step>
-
   <step_error_handling>
   </step_error_handling>
    <slave-step-copy-partition-distribution>
-package com.bsth.service.schedule;
-
-import accumulate com.bsth.service.schedule.rules.ttinfo2.ErrorBcCountFunction ecount;
-import accumulate com.bsth.service.schedule.rules.shiftloop.GidsCountFunction gidscount;
-import accumulate com.bsth.service.schedule.rules.shiftloop.GidFbTimeFunction gidfbtime;
-import accumulate com.bsth.service.schedule.rules.shiftloop.GidFbFcnoFunction gidfbfcno;
-import accumulate com.bsth.service.schedule.rules.ttinfo.LpInfoResultsFunction lpinforesult;
-import accumulate com.bsth.service.schedule.rules.ttinfo.MinRuleQyrqFunction minruleqyrq;
-import accumulate com.bsth.service.schedule.rules.validate.ValidRepeatBcFunction vrb;
-import accumulate com.bsth.service.schedule.rules.validate.ValidWholeRerunBcFunction vwrb;
-import accumulate com.bsth.service.schedule.rules.validate.ValidWantLpFunction vwlp;
+package com.bsth.service.schedule.impl.plan.kBase1.core;
+
+import accumulate com.bsth.service.schedule.impl.plan.kBase1.core.shiftloop.GidsCountFunction gidscount;
+import accumulate com.bsth.service.schedule.impl.plan.kBase1.core.shiftloop.GidFbTimeFunction gidfbtime;
+import accumulate com.bsth.service.schedule.impl.plan.kBase1.core.shiftloop.GidFbFcnoFunction gidfbfcno;
+import accumulate com.bsth.service.schedule.impl.plan.kBase1.core.ttinfo.LpInfoResultsFunction lpinforesult;
+import accumulate com.bsth.service.schedule.impl.plan.kBase1.core.ttinfo.MinRuleQyrqFunction minruleqyrq;
+import accumulate com.bsth.service.schedule.impl.plan.kBase1.core.validate.ValidRepeatBcFunction vrb;
+import accumulate com.bsth.service.schedule.impl.plan.kBase1.core.validate.ValidWholeRerunBcFunction vwrb;
+import accumulate com.bsth.service.schedule.impl.plan.kBase1.core.validate.ValidWantLpFunction vwlp;
-package com.bsth.service.schedule.plan;
+package com.bsth.service.schedule.impl.plan.kBase1.core.plan;
  
 import org.joda.time.*;
 import java.util.*;
  
-import com.bsth.service.schedule.rules.plan.PlanCalcuParam_input;
-import com.bsth.service.schedule.rules.plan.PlanResult;
+import com.bsth.service.schedule.impl.plan.kBase1.core.plan.PlanCalcuParam_input;
+import com.bsth.service.schedule.impl.plan.kBase1.core.plan.PlanResult;
  
 import com.bsth.repository.schedule.TTInfoDetailRepository;
 import com.bsth.repository.schedule.CarConfigInfoRepository;
@@ -12,10 +12,10 @@ import com.bsth.repository.schedule.EmployeeConfigInfoRepository;
 import com.bsth.repository.LineRepository;
 import com.bsth.repository.BusinessRepository;
  
-import com.bsth.service.schedule.rules.shiftloop.ScheduleResult_output;
-import com.bsth.service.schedule.rules.shiftloop.ScheduleResults_output;
-import com.bsth.service.schedule.rules.ttinfo.TTInfoResult_output;
-import com.bsth.service.schedule.rules.ttinfo.TTInfoResults_output;
+import com.bsth.service.schedule.impl.plan.kBase1.core.shiftloop.ScheduleResult_output;
+import com.bsth.service.schedule.impl.plan.kBase1.core.shiftloop.ScheduleResults_output;
+import com.bsth.service.schedule.impl.plan.kBase1.core.ttinfo.TTInfoResult_output;
+import com.bsth.service.schedule.impl.plan.kBase1.core.ttinfo.TTInfoResults_output;
 import com.bsth.entity.Line;
 import com.bsth.entity.Business;
  
@@ -28,7 +28,7 @@ import com.bsth.entity.schedule.SchedulePlanInfo;
 import org.slf4j.Logger
 import org.joda.time.format.DateTimeFormat
 import org.apache.commons.lang3.StringUtils
-import com.bsth.service.schedule.rules.shiftloop.ScheduleRule_Type;
+import com.bsth.service.schedule.impl.plan.kBase1.core.shiftloop.ScheduleRule_Type;
  
  
 // 全局日志类（一般使用调用此规则的service类）
-package com.bsth.service.schedule.rerun;
+package com.bsth.service.schedule.impl.plan.kBase1.core.rerun;
  
 import org.joda.time.*;
 import java.util.*;
  
-import com.bsth.service.schedule.rules.shiftloop.ScheduleResult_output;
-import com.bsth.service.schedule.rules.shiftloop.ScheduleResults_output;
+import com.bsth.service.schedule.impl.plan.kBase1.core.shiftloop.ScheduleResult_output;
+import com.bsth.service.schedule.impl.plan.kBase1.core.shiftloop.ScheduleResults_output;
  
-import com.bsth.service.schedule.rules.rerun.RerunRule_input;
-import com.bsth.service.schedule.rules.rerun.RerunRule_param;
+import com.bsth.service.schedule.impl.plan.kBase1.core.rerun.RerunRule_input;
+import com.bsth.service.schedule.impl.plan.kBase1.core.rerun.RerunRule_param;
  
 import com.bsth.repository.schedule.CarConfigInfoRepository;
 import com.bsth.repository.schedule.EmployeeConfigInfoRepository;
  
-import org.slf4j.Logger
-import com.bsth.entity.schedule.CarConfigInfo
-import java.util.HashMap
-import com.bsth.entity.schedule.EmployeeConfigInfo
+import org.slf4j.Logger;
+import com.bsth.entity.schedule.CarConfigInfo;
+import java.util.HashMap;
+import com.bsth.entity.schedule.EmployeeConfigInfo;
 import com.bsth.entity.schedule.SchedulePlanInfo;
  
 // 全局日志类（一般使用调用此规则的service类）
-package com.bsth.service.schedule.shiftloop;
+package com.bsth.service.schedule.impl.plan.kBase1.core.shiftloop;
  
 import org.joda.time.*;
 import java.util.*;
  
-import com.bsth.service.schedule.rules.ttinfo.LpInfoResult_output;
+import com.bsth.service.schedule.impl.plan.kBase1.core.ttinfo.LpInfoResult_output;
  
 import com.bsth.service.schedule.utils.Md5Util;
  
-import com.bsth.service.schedule.rules.shiftloop.ScheduleCalcuParam_input;
-import com.bsth.service.schedule.rules.shiftloop.ScheduleRule_input;
-import com.bsth.service.schedule.rules.shiftloop.ScheduleRule_Type;
-import com.bsth.service.schedule.rules.shiftloop.ScheduleResult_output;
-import com.bsth.service.schedule.rules.shiftloop.ScheduleResults_output;
+import com.bsth.service.schedule.impl.plan.kBase1.core.shiftloop.ScheduleCalcuParam_input;
+import com.bsth.service.schedule.impl.plan.kBase1.core.shiftloop.ScheduleRule_input;
+import com.bsth.service.schedule.impl.plan.kBase1.core.shiftloop.ScheduleRule_Type;
+import com.bsth.service.schedule.impl.plan.kBase1.core.shiftloop.ScheduleResult_output;
+import com.bsth.service.schedule.impl.plan.kBase1.core.shiftloop.ScheduleResults_output;
  
 import com.bsth.entity.schedule.temp.SchedulePlanRuleResult;
  
 import com.bsth.entity.schedule.SchedulePlan;
  
-import com.bsth.service.schedule.rules.ScheduleRuleService;
+import com.bsth.service.schedule.impl.plan.ScheduleRuleService;
  
 import org.slf4j.Logger;
  
-package com.bsth.service.schedule.ttinfo;
+package com.bsth.service.schedule.impl.plan.kBase1.core.ttinfo;
+
+import accumulate com.bsth.service.schedule.impl.plan.kBase1.core.shiftloop.GidsCountFunction gidscount;
+import accumulate com.bsth.service.schedule.impl.plan.kBase1.core.shiftloop.GidFbTimeFunction gidfbtime;
+import accumulate com.bsth.service.schedule.impl.plan.kBase1.core.shiftloop.GidFbFcnoFunction gidfbfcno;
+import accumulate com.bsth.service.schedule.impl.plan.kBase1.core.ttinfo.LpInfoResultsFunction lpinforesult;
+import accumulate com.bsth.service.schedule.impl.plan.kBase1.core.ttinfo.MinRuleQyrqFunction minruleqyrq;
+import accumulate com.bsth.service.schedule.impl.plan.kBase1.core.validate.ValidRepeatBcFunction vrb;
+import accumulate com.bsth.service.schedule.impl.plan.kBase1.core.validate.ValidWholeRerunBcFunction vwrb;
+import accumulate com.bsth.service.schedule.impl.plan.kBase1.core.validate.ValidWantLpFunction vwlp;
  
 import org.joda.time.*;
 import java.util.*;
  
-import com.bsth.service.schedule.rules.ttinfo.TTInfoCalcuParam_input;
-import com.bsth.service.schedule.rules.ttinfo.TTInfo_input;
-import com.bsth.service.schedule.rules.ttinfo.TTInfoResult_output;
-import com.bsth.service.schedule.rules.ttinfo.TTInfoResults_output;
-import com.bsth.service.schedule.rules.ttinfo.LpInfoResult_output;
-import com.bsth.service.schedule.rules.ttinfo.LpInfoResults_output;
+import com.bsth.service.schedule.impl.plan.kBase1.core.ttinfo.TTInfoCalcuParam_input;
+import com.bsth.service.schedule.impl.plan.kBase1.core.ttinfo.TTInfo_input;
+import com.bsth.service.schedule.impl.plan.kBase1.core.ttinfo.TTInfoResult_output;
+import com.bsth.service.schedule.impl.plan.kBase1.core.ttinfo.TTInfoResults_output;
+import com.bsth.service.schedule.impl.plan.kBase1.core.ttinfo.LpInfoResult_output;
+import com.bsth.service.schedule.impl.plan.kBase1.core.ttinfo.LpInfoResults_output;
  
-import com.bsth.service.schedule.rules.shiftloop.ScheduleRule_input;
+import com.bsth.service.schedule.impl.plan.kBase1.core.shiftloop.ScheduleRule_input;
  
 import com.bsth.repository.schedule.TTInfoDetailRepository;
  
-package com.bsth.service.schedule.rules.validate;
+package com.bsth.service.schedule.impl.plan.kBase1.core.validate;
  
 import com.bsth.entity.schedule.SchedulePlanInfo;
-import com.bsth.service.schedule.rules.ttinfo.LpInfoResult_output;
-import com.bsth.service.schedule.rules.validate.ValidateResource;
+import com.bsth.service.schedule.impl.plan.kBase1.core.ttinfo.LpInfoResult_output;
+import com.bsth.service.schedule.impl.plan.kBase1.core.validate.ValidateResource;
  
 import org.joda.time.*;
 import java.util.*;
-package com.bsth.service.schedule.rulewrap;
+package com.bsth.service.schedule.impl.plan.kBase2.wrap.rule;
  
 import org.joda.time.*;
 import java.util.*;
 import org.slf4j.Logger;
  
-import com.bsth.service.schedule.rules.shiftloop.ScheduleCalcuParam_input;
-import com.bsth.service.schedule.rules.shiftloop.ScheduleRule_input;
-import com.bsth.service.schedule.rules.shiftloop.ScheduleRule_Type;
+import com.bsth.service.schedule.impl.plan.kBase1.core.shiftloop.ScheduleCalcuParam_input;
+import com.bsth.service.schedule.impl.plan.kBase1.core.shiftloop.ScheduleRule_input;
+import com.bsth.service.schedule.impl.plan.kBase1.core.shiftloop.ScheduleRule_Type;
+import com.bsth.service.schedule.impl.plan.kBase1.core.rerun.RerunRule_input;
  
 import com.bsth.repository.schedule.RerunRuleRepository;
 import com.bsth.repository.schedule.ScheduleRule1FlatRepository;
  
-import com.bsth.service.schedule.rules.rerun.RerunRule_input;
-import com.bsth.service.schedule.rules.ScheduleRuleService;
+import com.bsth.service.schedule.impl.plan.ScheduleRuleService;
  
 import com.bsth.entity.Line;
 import com.bsth.entity.schedule.CarConfigInfo
+package com.bsth.service.schedule.impl.plan.kBase3.validate.rule;
+
+import accumulate com.bsth.service.schedule.impl.plan.kBase3.validate.rule.ErrorInfoFunction srif;
+import accumulate com.bsth.service.schedule.impl.plan.kBase3.validate.timetable.ErrorBcCountFunction ecount;
+
+import org.joda.time.*;
+import java.util.*;
+
+import com.bsth.service.schedule.impl.plan.kBase3.validate.rule.CalcuParam;
+import com.bsth.service.schedule.impl.plan.kBase3.validate.rule.ValidateRuleResult;
+import com.bsth.service.schedule.impl.plan.kBase3.validate.rule.ValidateRuleResult.ErrorInfo;
+import com.bsth.service.schedule.impl.plan.kBase3.validate.rule.WrapInput;
+
+import com.bsth.repository.schedule.ScheduleRule1FlatRepository
+import com.bsth.repository.schedule.CarConfigInfoRepository;
+import com.bsth.repository.schedule.GuideboardInfoRepository;
+import com.bsth.repository.schedule.EmployeeConfigInfoRepository;
+
+import com.bsth.entity.schedule.rule.ScheduleRule1Flat;
+import com.bsth.entity.schedule.CarConfigInfo;
+import com.bsth.entity.schedule.GuideboardInfo;
+import com.bsth.entity.schedule.EmployeeConfigInfo;
+
+import org.slf4j.Logger
+
+// 全局日志
+global Logger LOG;
+
+// repository查询
+global CarConfigInfoRepository ccRepo;
+global GuideboardInfoRepository lpRepo;
+global EmployeeConfigInfoRepository ecRepo;
+global ScheduleRule1FlatRepository ruleRepo;
+
+// return输出
+global ValidateRuleResult result;
+
+
+//------------------ 第一阶段、车辆信息，路牌信息，人员信息载入 -----------------//
+
+// 1、车辆信息载入
+declare CarConfig_Wraps
+    xlId: Integer // 线路Id
+    ccMap: Map // 车辆配置Map Map<车辆自编号, CarConfigInfo>
+end
+
+rule "calcu_CarConfig_Wraps"
+    salience 800
+    when
+        $param: CalcuParam($xlId: xlId)
+    then
+        List ccInfos = ccRepo.findByXlId($xlId);
+
+        CarConfig_Wraps carConfig_wraps = new CarConfig_Wraps();
+        carConfig_wraps.setXlId($xlId);
+        carConfig_wraps.setCcMap(new HashMap());
+
+        for (int i = 0; i < ccInfos.size(); i++) {
+            CarConfigInfo ccInfo = (CarConfigInfo) ccInfos.get(i);
+            if (!ccInfo.getIsCancel()) {
+                carConfig_wraps.getCcMap().put(ccInfo.getCl().getInsideCode(), ccInfo);
+            }
+        }
+
+        insert(carConfig_wraps);
+
+        LOG.info("第一阶段 --> 1、车辆信息载入 calcu_CarConfig_Wraps 有效配置车辆数={}", ccInfos.size());
+end
+
+// 2、路牌信息载入
+declare Lp_Wraps
+    xlId: Integer // 线路Id
+    lpMap: Map // 路牌Map Map<id, GuideboardInfo>
+end
+
+rule "calcu_Lp_Wraps"
+    salience 800
+    when
+        $param: CalcuParam($xlId: xlId)
+    then
+        List lpInfos = lpRepo.findByXlId($xlId);
+        Lp_Wraps lp_wraps = new Lp_Wraps();
+        lp_wraps.setXlId($xlId);
+        lp_wraps.setLpMap(new HashMap());
+
+        for (int i = 0; i < lpInfos.size(); i++) {
+            GuideboardInfo lpInfo = (GuideboardInfo) lpInfos.get(i);
+            if (!lpInfo.getIsCancel()) {
+                lp_wraps.getLpMap().put(lpInfo.getId(), lpInfo);
+            }
+        }
+
+        insert(lp_wraps);
+
+        LOG.info("第一阶段 --> 2、路牌信息载入 calcu_Lp_Wraps 有效路牌数={}", lpInfos.size());
+
+end
+
+// 3、人员信息载入
+declare EmployeeConfig_Wraps
+    xlId: Integer // 线路Id
+    ecMap: Map // 人员配置Map Map<id, EmployeeConfigInfo>
+end
+
+rule "calcu_EmployeeConfig_Wraps"
+    salience 800
+    when
+        $param: CalcuParam($xlId: xlId)
+    then
+        List ecInfos = ecRepo.findByXlId($xlId);
+
+        EmployeeConfig_Wraps employeeConfig_wraps = new EmployeeConfig_Wraps();
+        employeeConfig_wraps.setXlId($xlId);
+        employeeConfig_wraps.setEcMap(new HashMap());
+
+        for (int i = 0; i < ecInfos.size(); i++) {
+            EmployeeConfigInfo ecInfo = (EmployeeConfigInfo) ecInfos.get(i);
+            if (!ecInfo.getIsCancel()) {
+                employeeConfig_wraps.getEcMap().put(ecInfo.getId(), ecInfo);
+            }
+        }
+
+        insert(employeeConfig_wraps);
+
+        LOG.info("第一阶段 --> 3、人员信息载入 calcu_EmployeeConfig_Wraps 有效人员配置数={}", ecInfos.size());
+end
+
+//------------------ 第二阶段、规则载入，计算相关数量 -----------------//
+
+declare Rule_Wraps
+    xlId: Integer // 线路Id
+    qyrq: Date // 启用日期
+    rule: ScheduleRule1Flat // ScheduleRule1Flat规则
+end
+
+rule "calcu_schedule_rule_wrap"
+    salience 700
+    when
+        $param: CalcuParam($xlId: xlId)
+        $rule: ScheduleRule1Flat($qyrq: qyrq) from ruleRepo.findByXlId($xlId)
+    then
+        Rule_Wraps rw = new Rule_Wraps();
+        rw.setXlId($xlId);
+        rw.setQyrq($qyrq);
+        rw.setRule($rule);
+        insert(rw);
+end
+
+rule "calcu_all_rule_count"
+    salience 600
+    when
+        $param: CalcuParam($xlId: xlId, $fd: fromDate, $td: toDate)
+        $allList: ArrayList() from collect(Rule_Wraps(xlId == $xlId))
+    then
+        result.setXlId($xlId);
+        result.setCount($allList.size());
+
+        LOG.info("第二阶段 --> 规则总数={}", $allList.size());
+end
+
+rule "calcu_all_qy_rule_count"
+    salience 500
+    when
+        $param: CalcuParam($xlId: xlId, $fd: fromDate, $td: toDate)
+        $qyList: ArrayList() from collect(
+            Rule_Wraps(xlId == $xlId, qyrq.getTime() <= $td.getMillis()))
+    then
+        result.setXlId($xlId);
+        result.setQyCount($qyList.size());
+
+        LOG.info("第二阶段 --> 启用规则数={}", $qyList.size());
+
+end
+
+//------------------ 第三阶段、规则判定 -----------------//
+
+rule "calcu_Wrap_input"
+    salience 400
+    when
+        $param: CalcuParam($xlId: xlId, $fd: fromDate, $td: toDate)
+        $qy_rule: Rule_Wraps(xlId == $xlId, qyrq.getTime() <= $td.getMillis())
+        $cc: CarConfig_Wraps(xlId == $xlId)
+        $lp: Lp_Wraps(xlId == $xlId)
+        $ec: EmployeeConfig_Wraps(xlId == $xlId)
+    then
+        WrapInput wr = new WrapInput(
+            $qy_rule.getRule(),
+            $cc.getCcMap(),
+            $lp.getLpMap(),
+            $ec.getEcMap()
+        );
+        insert(wr);
+end
+
+rule "calcu_error_info"
+    salience 300
+    when
+        $param: CalcuParam($xlId: xlId)
+        $errorMap: Map() from accumulate ($wr: WrapInput(xlId == $xlId), srif($wr))
+    then
+        result.setQyErrorCount($errorMap.size());
+        result.getErrorInfos().addAll($errorMap.values());
+
+        LOG.info("第三阶段 --> 规则总数={}, 启用规则数={}, 错误的启用规则数={}",
+            result.getCount(), result.getQyCount(), result.getQyErrorCount());
+
+end
+
+
-package com.bsth.service.schedule.ttinfo2;
+package com.bsth.service.schedule.impl.plan.kBase3.validate.timetable;
  
 import org.joda.time.*;
 import java.util.*;
 import org.apache.commons.lang3.StringUtils;
  
-import com.bsth.service.schedule.rules.ttinfo2.Result;
-import com.bsth.service.schedule.rules.ttinfo2.Result.StatInfo;
-import com.bsth.service.schedule.rules.ttinfo2.CalcuParam;
+import com.bsth.service.schedule.impl.plan.kBase3.validate.timetable.Result;
+import com.bsth.service.schedule.impl.plan.kBase3.validate.timetable.Result.StatInfo;
+import com.bsth.service.schedule.impl.plan.kBase3.validate.timetable.CalcuParam;
  
 import com.bsth.entity.schedule.TTInfo;
 import com.bsth.entity.schedule.TTInfoDetail;
 import com.bsth.entity.Line;
  
-import com.bsth.repository.LineRepository;
 import com.bsth.repository.schedule.TTInfoDetailRepository;
  
 import org.slf4j.Logger
@@ -23,7 +22,6 @@ import java.lang.Object;
  
 // 全局日志类（一般使用调用此规则的service类）
 global Logger log;
-global LineRepository lineRepository;
 global TTInfoDetailRepository tTInfoDetailRepository;
  
 // 输出
@@ -63,15 +61,14 @@ rule &quot;calcu_iter_days&quot;
             $toDate: toDate,
             $fromDate.isBefore($toDate) || $fromDate.isEqual($toDate)
         )
+        $line: Line(id == $xlId)
     then
         // 构造Calcu_iter_days_result对象，进行下一步计算
         Calcu_iter_days_result cidr = new Calcu_iter_days_result();
         Period p = new Period($fromDate, $toDate, PeriodType.days());
  
-        Line line = (Line) lineRepository.findOne($xlId);
-
         cidr.setXlId($xlId);
-        cidr.setXlName(line.getName());
+        cidr.setXlName($line.getName());
  
         cidr.setCalcu_day(new Integer(1));
         cidr.setCalcu_weekday(Integer.valueOf($fromDate.getDayOfWeek()));
@@ -311,6 +308,9 @@ rule &quot;statinfo_result&quot; // 统计计算结果
         $statInfo.setYybc($yybc);
         $statInfo.setErrorbc($errorbc);
  
+        int lineVersion = ((TTInfoDetail) $ttInfoDetails_wrap.getBcInfoList().get(0)).getLineVersion();
+        $statInfo.setLineVersion(lineVersion);
+
         rs.getInfos().add($statInfo);
  
 end
@@ -632,7 +632,6 @@
 		data-exclude=1></script>
 <!-- echarts4 误删 -->
 <script src="/metronic_v4.5.4/plugins/echarts4/echarts.min.js"></script>
-<script src="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.jquery.js"  merge="plugins"></script>
  
 </body>
 </html>
 \ No newline at end of file
@@ -386,8 +386,6 @@
                 }
  
             });
-
-
     	}
 	});	
 	/** 生成路线（路段和站点） */
@@ -58,15 +58,17 @@ window.WorldsBMap = function () {
         marker.enableDragging();
         dragMarker = marker;
         dragMarker._old_point = dragMarker._position;
+        centerPoint = dragMarker._position;
         //监听拖拽事件 dragging
         dragMarker.addEventListener('dragging', dragMarkerDragEvent);
     };
  
     var dragMarkerDragEvent = function (e) {
         if (editPolygon) {
-            if (!BMapLib.GeoUtils.isPointInPolygon(e.target._position, editPolygon))
+            // 中心点是否超出多边形
+            if (!BMapLib.GeoUtils.isPointInPolygon(e.target._position, editPolygon)) {
                 dragMarker.setPosition(dragMarker._old_point);//还原位置
-
+            }
             centerPoint = e.target._position;
         }
         else if (editCircle) {
@@ -21,10 +21,10 @@
 	<li><a href="/pages/home.html" data-pjax>首页</a> <i class="fa fa-circle"></i></li>
 	<li><span class="active">运营计划管理</span> <i class="fa fa-circle"></i></li>
     <li>
-        <a href="/#/ttInfoManage">时刻表管理</a>
+        <a href="/#/ttInfoManage2">智能时刻表管理</a>
         <i class="fa fa-circle"></i>
     </li>
-	<li><span class="active">时刻表明细制作建模</span></li>
+	<li><span class="active">智能时刻表明细制作建模</span></li>
 </ul>
 <!-- 线路信息导航栏组件 END -->
 <div class="portlet light bordered" id="form-wizard-info">
@@ -152,7 +152,7 @@
                                             <input type="radio" class="icheck" name="baseRes" value=2 > 发车间隔分析（旧：一步调整）
                                         </label>
                                         <label>
-                                            <input type="radio" class="icheck" name="baseRes" value=3 checked> 发车间隔分析（新：增量调整-单向进出场）
+                                            <input type="radio" class="icheck" name="baseRes" value=3 checked> 发车间隔分析（新：增量调整-单向进场）
                                         </label>
 										<label>
 											<input type="radio" class="icheck" name="baseRes" value=0> 客流大数据分析
@@ -217,11 +217,11 @@ text.alert-danger {
 }
  
 .sx {
-	 background-color: #233f5d;
+	 background-color: #ff2949;
 }
  
 .xx {
-	 background-color: #31394a;
+	 background-color: #518fe3;
 }
  
 .tipso_bubble {
@@ -201,7 +201,7 @@ $(&#39;#addBc_mobal&#39;).on(&#39;addBcMobal.show&#39;, function(e,lpData,lpDataCount,echartsDra
 			// 'dir' : {required : true},
 			'fcsj' : {required : true},
 			'bcType' : {required : true},
-			'bcsj' : {number : true,required : true},
+			'bcsj' : {min : 1, digits : true, required : true},
 			'isfb' : {required : true}
 		},
 		invalidHandler : function(event, validator) {
@@ -224,50 +224,54 @@ $(&#39;#addBc_mobal&#39;).on(&#39;addBcMobal.show&#39;, function(e,lpData,lpDataCount,echartsDra
             var fcsj = Date.parse(DateTimeTool.getDateTime(params.fcsj));
             var ARRIVALTIME = fcsj + parseInt(params.bcsj)*60000 ;
  
-            for(var i=0; i<data.length-1; i++) {
-                if(data[i].value[0] == params.lpName) {
-                    if(data[i].value[7] < params.fcno) {
-                        prevBcObj = data[i];
-                        bcObj = $.extend(true, {}, bcObj, data[i]);
-                        index = i+1;
-                    } else {
-                        if(type) {
-                            type = false;
-                            nextBcObj = data[i];
+            if(params.bcsj > 0){
+                for(var i=0; i<data.length-1; i++) {
+                    if(data[i].value[0] == params.lpName) {
+                        if(data[i].value[7] < params.fcno) {
+                            prevBcObj = data[i];
+                            bcObj = $.extend(true, {}, bcObj, data[i]);
+                            index = i+1;
+                        } else {
+                            if(type) {
+                                type = false;
+                                nextBcObj = data[i];
+                            }
+                            data[i].value[7] += 1;
                         }
-                        data[i].value[7] += 1;
                     }
                 }
-            }
-            bcObj.value[1] = fcsj;
-            bcObj.value[2] = ARRIVALTIME;
-            bcObj.value[3] = params.bcsj*60000;
-            // bcObj.value[4] = lpNo;
-            bcObj.value[6] = params.bcType;
-            bcObj.value[7] = parseInt(params.fcno);
-            var dir = bcObj.value[8] == 1 ? 0:1;
-            bcObj.value[8] = dir;
-            bcObj.itemStyle.normal.color = dir==0?"#ff2949":"#518fe3";
-            // 起终点互换
-            var station = bcObj.value[13];
-            bcObj.value[13] = bcObj.value[14];
-            bcObj.value[14] = station;
-            bcObj.value[16] = parseInt(params.isfb);
-            data.splice(index, 0 , bcObj);
+                bcObj.value[1] = fcsj;
+                bcObj.value[2] = ARRIVALTIME;
+                bcObj.value[3] = params.bcsj*60000;
+                // bcObj.value[4] = lpNo;
+                bcObj.value[6] = params.bcType;
+                bcObj.value[7] = parseInt(params.fcno);
+                var dir = bcObj.value[8] == 1 ? 0:1;
+                bcObj.value[8] = dir;
+                bcObj.itemStyle.normal.color = dir==0?"#ff2949":"#518fe3";
+                // 起终点互换
+                var station = bcObj.value[13];
+                bcObj.value[13] = bcObj.value[14];
+                bcObj.value[14] = station;
+                bcObj.value[16] = parseInt(params.isfb);
+                data.splice(index, 0 , bcObj);
  
-            if(nextBcObj != null && (nextBcObj.value[1] < ARRIVALTIME || prevBcObj.value[2] > fcsj)){
-                layer.confirm('添加的班次与前后班次有时间冲突，是否添加？', {
-                    btn : [ '添加','取消' ], icon: 3, title:'提示'
-                }, function(){
-                    echartsDrawGTT.init(data,false,true);
+                if(nextBcObj != null && (nextBcObj.value[1] < ARRIVALTIME || prevBcObj.value[2] > fcsj)){
+                    layer.confirm('添加的班次与前后班次有时间冲突，是否添加？', {
+                        btn : [ '添加','取消' ], icon: 3, title:'提示'
+                    }, function(){
+                        echartsDrawGTT.init(data,false,true,false);
+                        echartsDrawGTT.refreshDrag();
+                        layer.msg('路牌:'+params.lpName+' fnco:'+params.fcno+' 班次添加成功,注意修改冲突班次！');
+                    });
+                } else {
+                    echartsDrawGTT.init(data,false,true,false);
                     echartsDrawGTT.refreshDrag();
-                    layer.msg('路牌:'+params.lpName+' fnco:'+params.fcno+' 班次添加成功,注意修改冲突班次！');
-                });
+                    layer.msg('路牌:'+params.lpName+' fnco:'+params.fcno+' 班次添加成功！');
+                }
             } else {
-                echartsDrawGTT.init(data,false,true);
-                echartsDrawGTT.refreshDrag();
-                layer.msg('路牌:'+params.lpName+' fnco:'+params.fcno+' 班次添加成功！');
-            }
+                layer.msg('班次时间为0分钟，为无效班次添加失败！');
+			}
             $('#addBc_mobal').modal('hide');
         }
     });
@@ -104,7 +104,7 @@ $(&#39;#deletelp_mobal&#39;).on(&#39;deletelpMobal.show&#39;, function(e,lpData,echartsDrawGTT){
                 		lpData.splice(index,1);
                 });
                 echartsDrawGTT.setLpData(lpData);
-                echartsDrawGTT.init(data,false,true);
+                echartsDrawGTT.init(data,false,true,false);
                 echartsDrawGTT.refreshDrag();
                 $('#deletelp_mobal').modal('hide');
                 layer.msg('删除路牌【'+ params.lpName +'】成功！');
@@ -162,7 +162,7 @@ $(&#39;#editBc_mobal&#39;).on(&#39;editBcMobal.show&#39;, function(e,index,echartsDrawGTT){
 			// 'dir' : {required : true},
 			'fcsj' : {required : true},
 			'bcType' : {required : true},
-			'bcsj' : {number : true,required : true},
+			'bcsj' : {min : 1, digits : true,required : true},
 			'isfb' : {required : true}
 		},
 		invalidHandler : function(event, validator) {
@@ -192,7 +192,7 @@ $(&#39;#editBc_mobal&#39;).on(&#39;editBcMobal.show&#39;, function(e,index,echartsDrawGTT){
             bcObj.value[7] = parseInt(params.fcno);
             bcObj.value[16] = parseInt(params.isfb);
  
-            echartsDrawGTT.init(data,false,true);
+            echartsDrawGTT.init(data,false,true,false);
             echartsDrawGTT.refreshDrag();
             layer.msg('路牌:'+params.lpName+' fnco:'+params.fcno+' 班次修改成功！');
             $('#editBc_mobal').modal('hide');
@@ -14,10 +14,10 @@
 	<li><a href="/pages/home.html" data-pjax>首页</a> <i class="fa fa-circle"></i></li>
 	<li><span class="active">运营计划管理</span> <i class="fa fa-circle"></i></li>
     <li>
-        <a href="/#/ttInfoManage">时刻表管理</a>
+        <a href="/#/ttInfoManage2">智能时刻表管理</a>
         <i class="fa fa-circle"></i>
     </li>
-	<li><span class="active">时刻表明细模型</span></li>
+	<li><span class="active">智能时刻表明细模型</span></li>
 </ul>
 <!-- 线路信息导航栏组件 END -->
  
@@ -160,6 +160,11 @@
 	</div>
 	<!-- col-md-12 组件END -->
 </div>
+
+
+<!-- echarts4 误删 -->
+<script src="/metronic_v4.5.4/plugins/echarts4/echarts.min.js"></script>
+
 <!-- row 组件END -->
 <script src="/pages/base/timesmodel/js/raty/lib/jquery.raty.js"></script>
 <script src="/pages/base/timesmodel/js/ContextJS/js/context.js"></script>
@@ -186,8 +191,8 @@
 -->
  
 <script src="/pages/base/timesmodel/js/v2_2/InternalScheduleObj.js"></script>
-<script src="/pages/base/timesmodel/js/v2_2/main_v2_2_excel.js"></script>
 <script src="/pages/base/timesmodel/js/v2_2/main_v2_2.js"></script>
+<script src="/pages/base/timesmodel/js/v2_2/Main_v2_2_ExcelObj.js"></script>
 <script src="/pages/base/timesmodel/js/v2_2/strategy/workhours/ModifyBcTripWHS1.js"></script>
 <script src="/pages/base/timesmodel/js/v2_2/strategy/headway/CalcuHeadwayS1.js"></script>
 <script src="/pages/base/timesmodel/js/v2_2/strategy/headway/CalcuHeadwayS2.js"></script>
-
 /**
  * @description : (TODO) 表单的导航向导、验证、提交
  */
@@ -288,12 +287,12 @@ var SKBFormWizard = function() {
 		// 4、返回判断结果布尔值.
 		return tag;
 	}
-	
+
 	/**
 	 * @description : (TODO) 获取客流数据.
-	 * 
+	 *
 	 * @params [url--请求地址;data--请求参数;cb--回调函数]
-	 * 
+	 *
 	 * */
 	function getJSONP(url, data, cb) {
 		$.ajax({
@@ -305,24 +304,24 @@ var SKBFormWizard = function() {
 			success : cb
 		});
 	}
-	
+
 	/**
 	 * @description : (TODO) 根据获取参数方式来获取表单参数详情html模版页.
-	 * 
+	 *
 	 * @param [n--获取参数方式;map--表单参数;lineId--线路ID;krl--客容量;cb--回调函数]
-	 * 
+	 *
 	 * @return 返回表单参数详情html模版页.
-	 * 
+	 *
 	 * @status OK.
 	 * */
 	var getHtmlTemp = function(n,map,lineId,krl,cb) {
 		// 1、定义模版名称.
 		var tempName = '';
-		if(n==0) 
+		if(n==0)
 			tempName = 'carnum_temp';
 		else if(n==1)
 			tempName = 'bctype_temp';
-        else if (n==2 || n == 3)
+        else if (n==2 || n==3)
             tempName = 'fcjx_temp';
 		// 2、获参数详情模版html内容.
 		$.get('/pages/base/timesmodel/tepms/'+ tempName + '.html', function(html){
@@ -348,9 +347,9 @@ var SKBFormWizard = function() {
 				var params = {'xlid':lineId,'startDateTime':startDateTime,'endDateTime':endDateTime,'zzsj':zzsj};
 				/**
 				 * getJSONP请求获取客流数据.
-				 * 
+				 *
 				 * 返回的是一个每次以半小时为间隔作为开始时间点, 在加上周转时间作为结束时间点的 时段段内的客流最大通过量.
-				 * */ 
+				 * */
 				getJSONP("http://139.196.13.237:8080/bsth-busfareflow-gj/Crlcxb/selectsjbctgl.do",params,function(json){
 					// 定义时段集合,可容量.
 					var sjdArr = getsjdArr(map),krlInt = parseInt(krl);
@@ -390,11 +389,29 @@ var SKBFormWizard = function() {
  
 					// 返回参数详情模版.
 					return cb && cb ({'forminput':template(tempName,{map:map}),'datadisplay': template(tempName +'config',{map:null})});
-				}); 
+				});
 			}else if(n==1) {
-				// 返回参数详情模版.
-				return cb && cb ({'forminput':template(tempName,{map:map}),'datadisplay': template(tempName +'config',{map:null})});
-			}else if (n==2 || n == 3) {
+                // 更具站点路由版本获取起点终点站
+                var iversion = $('#lineVersionSelect').val();
+                $get('/stationroute/all',{'line.id_eq':lineId,'destroy_eq':0, 'versions_eq': iversion},function(result) {
+                    $.each(result, function(i, d) {
+                        if (d.stationMark == 'B' && d.directions == 0) {
+                            // alert(d.stationName);
+                            map.line.startStationName = d.stationName;
+                        } else if (d.stationMark == 'E' && d.directions == 0) {
+                            // alert(d.stationName);
+                            map.line.endStationName = d.stationName;
+                        }
+                    });
+
+                    // return cb && cb({
+                    //     'forminput': template(tempName, {map: map}),
+                    //     'datadisplay': template(tempName + '_config', {map: null})
+                    // });
+                    // 返回参数详情模版.
+                    return cb && cb ({'forminput':template(tempName,{map:map}),'datadisplay': template(tempName +'config',{map:null})});
+                });
+			}else if (n==2 || n==3) {
                 // 更具站点路由版本获取起点终点站
                 var iversion = $('#lineVersionSelect').val();
                 $get('/stationroute/all',{'line.id_eq':lineId,'destroy_eq':0, 'versions_eq': iversion},function(result) {
@@ -417,8 +434,8 @@ var SKBFormWizard = function() {
  
             }
 		});
-	}
-	
+	};
+
 	/**
 	 * @description (TODO) 格式化成渲染图形数据格式.
 	 * 
@@ -540,7 +557,17 @@ var SKBFormWizard = function() {
 					'bxrc' : {required : true},// 班型人次,必填项
 					'linePlayType' : {required : true},// 线路规划类型,必填项
 					'zdzcrl' : {number : true,digits : true},
-
+					// 新增时间段字段
+                    'start1' : {required : true},
+                    'end1' : {required : true},
+                    'start2' : {required : true},
+                    'end2' : {required : true},
+                    'start3' : {required : true},
+                    'end3' : {required : true},
+                    'start4' : {required : true},
+                    'end4' : {required : true},
+                    'start5' : {required : true},
+                    'end5' : {required : true},
  
                     'gfupStopTime' : {required : true,number : true}, // 高峰上行停站时间,必填项、必须为整数.
                     'gfdownStopTime' : {required : true,number : true}, // 高峰下行停站时间,必填项、必须为整数.
@@ -957,6 +984,16 @@ var SKBFormWizard = function() {
                                     $('#zgfjssjInput').datetimepicker({format : 'HH:mm',locale: 'zh-cn'});// 早高峰结束时间
                                     $('#wgfkssjInput').datetimepicker({format : 'HH:mm',locale: 'zh-cn'});// 晚高峰开始时间
                                     $('#wgfjssjInput').datetimepicker({format : 'HH:mm',locale: 'zh-cn'});// 晚高峰结束时间
+                                    $('#startInput1').datetimepicker({format : 'HH:mm',locale: 'zh-cn'});
+                                    $('#endInput1').datetimepicker({format : 'HH:mm',locale: 'zh-cn'});
+                                    $('#startInput2').datetimepicker({format : 'HH:mm',locale: 'zh-cn'});
+                                    $('#endInput2').datetimepicker({format : 'HH:mm',locale: 'zh-cn'});
+                                    $('#startInput3').datetimepicker({format : 'HH:mm',locale: 'zh-cn'});
+                                    $('#endInput3').datetimepicker({format : 'HH:mm',locale: 'zh-cn'});
+                                    $('#startInput4').datetimepicker({format : 'HH:mm',locale: 'zh-cn'});
+                                    $('#endInput4').datetimepicker({format : 'HH:mm',locale: 'zh-cn'});
+                                    $('#startInput5').datetimepicker({format : 'HH:mm',locale: 'zh-cn'});
+                                    $('#endInput5').datetimepicker({format : 'HH:mm',locale: 'zh-cn'});
                                     // 初始化停车场下拉框.
                                     gettccInfo(function(cd) {
                                         var options = '<option value="">请选择...</option><optgroup label="停车场">';
 /** 时间工具类*/
 var DateTimeTool = function () {
+    var jsd = [];
+    var initSJD = function (map) {
+        jsd = map;
+    };
     // 数字格式转化为时间格式
     var calculateHours = function (time) {
         if(!time)
@@ -44,9 +48,38 @@ var DateTimeTool = function () {
             +':'
             +(date.getMinutes()<10? '0' + date.getMinutes() : date.getMinutes());
     };
+    // 判断时间在什么时间段段内
+    var judgmentTimeQuantum = function (t) {
+        if(t <= getDateTime(jsd[0].end))
+            return 0;
+        else if(t > getDateTime(jsd[1].start) && t <= getDateTime(jsd[1].end))
+            return 1;
+        else if(t > getDateTime(jsd[2].start) && t <= getDateTime(jsd[2].end))
+            return 2;
+        else if(t > getDateTime(jsd[3].start) && t <= getDateTime(jsd[3].end))
+            return 3;
+        else if(t > getDateTime(jsd[4].start))
+            return 4;
+    };
+
+    // 8:31-16:00专用
+    var judgmentTimeQuantum1 = function (t) {
+        var start = DateTimeTool.getDateTime(jsd[2].start);
+        if(t > start && t <= start.setHours(start.getHours() + 2))
+            return 1;
+        else if(t > start.setHours(start.getHours() + 2) && t <= start.setHours(start.getHours() + 4))
+            return 2;
+        else if(t > start.setHours(start.getHours() + 4) && t <= start.setHours(start.getHours() + 6))
+            return 2;
+        else if(t > start.setHours(start.getHours() + 6) && t <= DateTimeTool.getDateTime(jsd[2].end))
+            return 1;
+    };
     return{
+        initSJD : initSJD,
         calculateHours : calculateHours,
         getDateTime : getDateTime,
-        getHHmmStr : getHHmmStr
+        getHHmmStr : getHHmmStr,
+        judgmentTimeQuantum : judgmentTimeQuantum,
+        judgmentTimeQuantum1 : judgmentTimeQuantum1
     }
 }();
@@ -5,7 +5,7 @@ var echartsDrawGTT = function () {
     var upDowndom = document.getElementById("upDownContainer");
     var upDownChart = echarts.init(upDowndom);
     // upDowndom.style.height = '200px';
-    var option,upDownOption,dataZoomStart = 0,dataZoomEnd = 80;//图层对象
+    var option,upDownOption,dataZoomStart = 0,dataZoomEnd = 70;//图层对象
     var historyData = [],// 保存操作图形后的数据集合(撤销与恢复操作)
         _keyIndex = -1,// 记录当前操作步骤 (在撤销与恢复操作时)
         dataUp = [],// （上/下）行发车时刻表数据
@@ -107,7 +107,8 @@ var echartsDrawGTT = function () {
                         bcObj.qdz,
                         bcObj.zdz,
                         bcObj.STOPTIME,
-                        bcObj.isfb = 0
+                        bcObj.isfb ? 1:0,
+                        bcObj.qs
                         //bcObj.isSwitchXl,
                         //bcObj.bz,
                     ],
@@ -329,7 +330,7 @@ var echartsDrawGTT = function () {
                             bcTypeStr = bcType[type];
  
                         var arr = [
-                            '{left|' + timeStr + '}{type|' + bcTypeStr +'}',
+                            '{left|' + timeStr + '}{type|'+ ((dataZoomEnd - dataZoomStart) <= 70 ? bcType[type] : '') +'}',
                             '{left|' + lastStr + '}{left|' + stayStr + '}'
                         ];
                         return arr.join('\n');
@@ -601,11 +602,17 @@ var echartsDrawGTT = function () {
                                     lastStr = "行:" + last;
                             }
  
+                            // 分班显示‘分’
+                            if(params.data.value[16] == 1)
+                                bcTypeStr = "分";
+                            else
+                                bcTypeStr = bcType[type];
+
                             if(type == 'normal') {
                                 stayStr = "停:" + params.data.value[15];
                             }
                             var arr = [
-                                '{left|' + timeStr + '}{type|'+ ((e.end - e.start) < 80 ? bcType[type] : '') +'}',
+                                '{left|' + timeStr + '}{type|'+ ((dataZoomEnd - dataZoomStart) <= 70 ? bcType[type] : '') +'}',
                                 '{left|' + lastStr + '}{left|' + stayStr + '}'
                             ];
  
@@ -895,14 +902,15 @@ var echartsDrawGTT = function () {
                     data[dataIndex].value[2] = xMax;
                     data[dataIndex].value[1] = data[dataIndex].value[2] - data[dataIndex].value[3];
                 }
-
             }
-            _keyIndex++;
+
+            set_keyIndex(++_keyIndex);
  
             historyData[_keyIndex] = $.extend(true, [], historyData[_keyIndex], data);// 历史数组增加一次数据
             refreshDrag();
             refreshUpDownData();
             historyData.splice(_keyIndex + 1, historyData.length);// 数据改变后过后清除多余的历史数据
+            init(historyData[_keyIndex],false,false);
         } else {
             refreshDrag();
         }
@@ -936,7 +944,12 @@ var echartsDrawGTT = function () {
                 color: '#333'
             },
             min: 0,
-            max: 30,
+            max:  function(value) {
+                if(value.max < 30)
+                    return 30;
+                else
+                    return value.max + 5;
+            },
             axisTick: {show: false},
             //axisLine: {lineStyle: {color: '#ccc'}},
             axisLabel: {show: false},
 (function() {
+    var indexLoad = layer.load(0, {content:'拼命计算中...',time: 10*1000,success: function(layero){
+            layero.find('.layui-layer-content').css('padding-top', '40px');
+        }});
 	// 全屏模式点击事件.
 	// $(document).on('click','.fullscreen',function() {
 	// 	if($('.ganttSvgContainer').height()>400)
@@ -34,7 +37,7 @@
 		      offsetX         : offsetX,
 		      offsetY         : offsetY,
 		      content	      :'<div class="tipsdscontinue"> <span>图例：</span> <div class="dscrp sx"></div><span>：上行</span>  <div class="dscrp xx"></div> <span>：下行</span></br><div/></br>' +
-		      				   '<div class="tipsdscontinue"> <span>该模块支持鼠标拖拽、鼠标绘制(鼠标右键按下3S开始)框选功能.</span> <div/>' 
+		      				   '<div class="tipsdscontinue"> <span>该模块支持鼠标拖拽功能.</span> <div/>'
  
 		});
 		$('.tipso-animation').tipso('show');
@@ -99,7 +102,6 @@
                 Main_v2.exportDataConfig(data.aInternalLpObj);
             } else if (map.baseRes == '3') { // 主站停站使用v2_2版本
                 data = Main_v2_2.BXPplaceClassesTime03(_paramObj, CSMap.maxCar);
-                Main_v2_2.exportDataConfig(data.aInternalLpObj);
             }
  
 		}else {
@@ -124,12 +126,12 @@
 				}
 				// 按照发车序号顺序排序.
 				lpbc_.sort(function(a,b){return a.fcno-b.fcno});
-                resultJA = resultJA.concat(BaseFun.addjclbbc01(lpbc_,dataMap,stopAraay[0].lbsj,map));
+                resultJA = resultJA.concat(BaseFun.addjclbbc01(lpbc_,dataMap,stopArray[0].lbsj,map));
 			}
 			data = {'json':rsjar,'bxrcgs':null};
 		}
         echartsDrawGTT.init(data.json,true,true);
-		console.log(data.json);
+		// console.log(data.json);
         // 创建甘特图对象.
         // var graph = d3.select('#ganttSvg').relationshipGraph(
 			// 	getGraphArgus({'ganttInitParams': map,'yAxisCarArray':CSMap.maxCar,
@@ -140,6 +142,55 @@
         // graph.addHistory();
         // // 初始化右键菜单.
         // contextInit(graph);
+
+        if (map.baseRes == '3' || map.baseRes == '1') {
+            // 导入导出设置
+            // Main_v2_2.exportExcelConfig($_GlobalGraph.getDataArray);
+
+            var _dfun = function() {
+                // fix，从新的甘特图中获取数据
+                var _keyIndex = echartsDrawGTT.get_keyIndex();
+                var historyData = echartsDrawGTT.getHistoryData();
+                var _data = $.extend(true, [], data, historyData[_keyIndex]);
+
+                var _i;
+                var _j;
+                var _gObj;
+
+                var _rtnBcArray = [];
+                for (_i = 0; _i < _data.length; _i++) {
+                    _gObj = _data[_i].value;
+                    _rtnBcArray.push({
+                        lpName : _gObj[0],
+                        fcsj: moment(_gObj[1]).format("HH:mm"),
+                        ARRIVALTIME: moment(_gObj[2]).format("HH:mm"),
+                        bcsj: _gObj[3] / 60000,
+                        lpNo: _gObj[4],
+                        lpType: _gObj[5],
+                        bcType: _gObj[6],
+                        fcno: _gObj[7],
+                        xlDir: (_gObj[8] == 0 ? "relationshipGraph-up" : "relationshipGraph-down"),
+                        jhlc: _gObj[9],
+                        tcc: _gObj[10],
+                        ttinfo: _gObj[11],
+                        xl: _gObj[12],
+                        qdz: _gObj[13],
+                        zdz: _gObj[14],
+                        STOPTIME: _gObj[15],
+                        isfb: _gObj[16]
+                    });
+                }
+
+                console.log("重组前数据=" + _data);
+                console.log("重组后数据=" + _rtnBcArray);
+                return _rtnBcArray;
+            };
+
+            // Main_v2_2.exportExcelConfig(_dfun);
+        }
+
+        // 关闭弹出层
+        layer.close(indexLoad);
 	},500);
  
 	/**
@@ -214,9 +265,10 @@
 				'gftzsj': BaseFun.formatPairing(gatps.gfupStopTime,gatps.gfdownStopTime),// 高峰停站时间.
 				'dgtzsj' : BaseFun.formatPairing(gatps.dgupStopTime,gatps.dgdownStopTime),// 低谷停站时间.
 				'dgmaxtzsj' :  parseInt(gatps.dgmaxtzsj),// 低谷最大停站时间.
-				'dgmaxfcjx' :  parseInt(gatps.dgmaxfcjx),// 低谷最大发车间隙.
+				// 'dgmaxfcjx' :  parseInt(gatps.dgmaxfcjx),// 低谷最大发车间隙.
+				'dgmaxfcjx' :  20,// 低谷最大发车间隙.
 				'map' : gatps,
-				'zzsj':gatps.zzsj,// 周转时间.
+				'zzsj':gatps.zzsj// 周转时间.
 			};
 	}
  
@@ -13,8 +13,7 @@ $(&#39;.recover&#39;).on(&#39;click&#39;,function() {
         echartsDrawGTT.set_keyIndex(++_keyIndex);
         var historyData = echartsDrawGTT.getHistoryData();
         var data = $.extend(true, [], data, historyData[_keyIndex]);
-        echartsDrawGTT.init(data,false,false);
-        echartsDrawGTT.refreshDrag();
+        echartsDrawGTT.init(data,false,false,false);
         layer.msg('恢复到操作记录的【第'+(_keyIndex+1)+'步】了!');
     }
 });
@@ -33,8 +32,7 @@ $(&quot;.revoke&quot;).on(&quot;click&quot;,function(){
         echartsDrawGTT.set_keyIndex(--_keyIndex);
         var historyData = echartsDrawGTT.getHistoryData();
         var data = $.extend(true, [], data, historyData[_keyIndex]);
-        echartsDrawGTT.init(data,false,false);
-        echartsDrawGTT.refreshDrag();
+        echartsDrawGTT.init(data,false,false,false);
         layer.msg('撤销到操作记录的【第'+(_keyIndex+1)+'步】了!');
     }
 });
@@ -101,8 +99,7 @@ $(&#39;#bcAdjustListSubmit&#39;).on(&#39;click&#39;,function() {
             data[bcAdjustList[i]].value[0] = lpName;
             data[bcAdjustList[i]].value[4] = lpDataCount[lpName][2];
         }
-        echartsDrawGTT.init(data,false,true);
-        echartsDrawGTT.refreshDrag();
+        echartsDrawGTT.init(data,false,true,false);
     } else
         layer.msg('没有找到目标路牌，请重新选择！');
     $('.bc-adjust-list').addClass('hidden');
@@ -115,8 +112,8 @@ $(&#39;#bcAdjustListSubmit&#39;).on(&#39;click&#39;,function() {
 /* 右击菜单事件
 * 1.修改      update
 * 2.删除      delete
-* 3.设为上行  setUp
-* 4.设为下行  setDown
+* 3.班次切换上下行  dropdownMenuSwitchUpDown
+* 4.路牌切换上下行  dropdownMenuLpSwitchUpDown
 * 5.设为正常  setNormal
 * 6.设为区间  setRegion
 * 7.设为分班  setFb
@@ -148,13 +145,16 @@ function dropdownMenuDelete(dataIndex) {
             // 关闭弹出层.
             layer.closeAll();
             data.splice(dataIndex,1);
-            echartsDrawGTT.init(data,false,true);
-            echartsDrawGTT.refreshDrag();
+            $.each(data, function () {
+                if(bc.value[0] == this.value[0] && bc.value[7] < this.value[7])
+                    this.value[7] -= 1;
+            });
+            echartsDrawGTT.init(data,false,true,false);
             layer.msg('删除成功！');
         });
     }
 }
-// 切换上下行
+// 班次切换上下行
 function dropdownMenuSwitchUpDown(dataIndex) {
     // 获取当前操作步数
     var _keyIndex = echartsDrawGTT.get_keyIndex(),
@@ -180,9 +180,17 @@ function dropdownMenuSwitchUpDown(dataIndex) {
             data[dataIndex].value[3] = parseInt(dataMap.map.downInTimer)*60000;
         data[dataIndex].value[2] = data[dataIndex].value[1] + data[dataIndex].value[3];
     }
-    echartsDrawGTT.init(data,false,true);
-    echartsDrawGTT.refreshDrag();
-    layer.msg('设置为上行成功！');
+    if(data[dataIndex].value[3] <= 0){
+        var bc = data[dataIndex];
+        data.splice(dataIndex,1);
+        $.each(data, function () {
+            if(bc.value[0] == this.value[0] && bc.value[7] < this.value[7])
+                this.value[7] -= 1;
+        });
+        layer.msg('班次切换上下行成功，切换后班次运送时间为0分钟，无意义所以删除改班次！',{time: 8000});
+    } else
+        layer.msg('班次切换上下行成功！');
+    echartsDrawGTT.init(data,false,true,false);
 }
 // 路牌切换上下行
 function dropdownMenuLpSwitchUpDown(dataIndex) {
@@ -211,10 +219,16 @@ function dropdownMenuLpSwitchUpDown(dataIndex) {
                     data[i].value[3] = parseInt(dataMap.map.downInTimer)*60000;
                 data[i].value[2] = data[i].value[1] + data[i].value[3];
             }
+            if(data[i].value[3] <= 0){
+                data.splice(i,1);
+                $.each(data, function () {
+                    if(data[i].value[0] == this.value[0] && data[i].value[7] < this.value[7])
+                        this.value[7] -= 1;
+                });
+            }
         }
     }
-    echartsDrawGTT.init(data,false,true);
-    echartsDrawGTT.refreshDrag();
+    echartsDrawGTT.init(data,false,true,false);
     layer.msg('路牌切换上下行成功！');
 }
 // 设为正常
@@ -226,11 +240,7 @@ function dropdownMenuSetNormal(dataIndex) {
  
     if(!isType(data[dataIndex].value[6],'设置为正常班次','normal','正常班次')) {
         data[dataIndex].value[6] = 'normal';
-        historyData.push(data);
-        echartsDrawGTT.set_keyIndex(++_keyIndex);
-        echartsDrawGTT.setHistoryData(historyData);
-        echartsDrawGTT.refreshDrag();
-        echartsDrawGTT.refreshUpDownData();
+        echartsDrawGTT.init(data,false,true,false);
         layer.msg('设置为正常成功！');
     }
 }
@@ -242,11 +252,7 @@ function dropdownMenuSetRegion(dataIndex) {
         data = $.extend(true, [], data, historyData[_keyIndex]);
     if(!isType(data[dataIndex].value[6],'设置为区间班次','region','区间班次')) {
         data[dataIndex].value[6] = 'region';
-        historyData.push(data);
-        echartsDrawGTT.set_keyIndex(++_keyIndex);
-        echartsDrawGTT.setHistoryData(historyData);
-        echartsDrawGTT.refreshDrag();
-        echartsDrawGTT.refreshUpDownData();
+        echartsDrawGTT.init(data,false,true,false);
         layer.msg('设置为区间成功！');
     }
 }
@@ -258,11 +264,7 @@ function dropdownMenuSetFb(dataIndex) {
         data = $.extend(true, [], data, historyData[_keyIndex]);
     if(!isType(data[dataIndex].value[6],'设置为分班班次') && !isType(data[dataIndex].value[16],'设置为分班班次',1,'分班班次')) {
         data[dataIndex].value[16] = 1;
-        historyData.push(data);
-        echartsDrawGTT.set_keyIndex(++_keyIndex);
-        echartsDrawGTT.setHistoryData(historyData);
-        echartsDrawGTT.refreshDrag();
-        echartsDrawGTT.refreshUpDownData();
+        echartsDrawGTT.init(data,false,true,false);
         layer.msg('设置为分班成功！');
     }
 }
@@ -274,11 +276,7 @@ function dropdownMenuSetNoFb(dataIndex) {
         data = $.extend(true, [], data, historyData[_keyIndex]);
     if(!isType(data[dataIndex].value[6],'取消分班') && !isType(data[dataIndex].value[16],0,'不是分班班次')) {
         data[dataIndex].value[16] = 0;
-        historyData.push(data);
-        echartsDrawGTT.set_keyIndex(++_keyIndex);
-        echartsDrawGTT.setHistoryData(historyData);
-        echartsDrawGTT.refreshDrag();
-        echartsDrawGTT.refreshUpDownData();
+        echartsDrawGTT.init(data,false,true,false);
         layer.msg('取消分班成功！');
     }
 }
@@ -290,11 +288,7 @@ function dropdownMenuSetVenting(dataIndex) {
         data = $.extend(true, [], data, historyData[_keyIndex]);
     if(!isType(data[dataIndex].value[6],'设置为直放班次','venting','直放班次')) {
         data[dataIndex].value[6] = 'venting';
-        historyData.push(data);
-        echartsDrawGTT.set_keyIndex(++_keyIndex);
-        echartsDrawGTT.setHistoryData(historyData);
-        echartsDrawGTT.refreshDrag();
-        echartsDrawGTT.refreshUpDownData();
+        echartsDrawGTT.init(data,false,true,false);
         layer.msg('设置为直放成功！');
     }
 }
@@ -306,11 +300,7 @@ function dropdownMenuSetMajor(dataIndex) {
         data = $.extend(true, [], data, historyData[_keyIndex]);
     if(!isType(data[dataIndex].value[6],'设置为放站班次','major','放站班次')){
         data[dataIndex].value[6] =  'major' ;
-        historyData.push(data);
-        echartsDrawGTT.set_keyIndex(++_keyIndex);
-        echartsDrawGTT.setHistoryData(historyData);
-        echartsDrawGTT.refreshDrag();
-        echartsDrawGTT.refreshUpDownData();
+        echartsDrawGTT.init(data,false,true,false);
         layer.msg('设置为放站成功！');
     }
 }
@@ -460,6 +450,6 @@ $(&#39;.parambtn&#39;).on(&#39;click&#39;, function() {
     $.get('/pages/base/timesmodel/paramadd.html', function(m){
         $(pjaxContainer).append(m);
         // 规定被选元素要触发的事件。可以使自定义事件（使用 bind() 函数来附加），或者任何标准事件。
-        $('#paramadd_mobal').trigger('paramAddMobal.show', [Main_v2, Main_v2_2, InternalScheduleObj_v2_2]);
+        $('#paramadd_mobal').trigger('paramAddMobal.show', Main_v2);
     });
 });
 \ No newline at end of file
@@ -15,26 +15,47 @@
  */
 var AdjustTrip = function () {
     var departureClearanceAdjust = function (bcList, dataMap) {
-        var upBc = new Array(), downBc = new Array();
-        // 取出上下行班次，并按发车时间排序
-        $.each(bcList, function () {
-            if(this.bcType == "normal"){
-                if(this.xlDir == "relationshipGraph-up")
-                    upBc.push(this);
-                if(this.xlDir == "relationshipGraph-down")
-                    downBc.push(this);
+        var upDownbc = bcFun.getUpAndDownBc(bcList, dataMap);
+
+        // 升序排序
+        // upDownbc[0].sort(function(a,b){return DateTimeTool.getDateTime(a.fcsj)-DateTimeTool.getDateTime(b.fcsj)});
+        // upDownbc[1].sort(function(a,b){return DateTimeTool.getDateTime(a.fcsj)-DateTimeTool.getDateTime(b.fcsj)});
+        for(var i=1; i<20; i++) {
+            if(i%2 == 0) {
+                calculate(upDownbc[1], bcList, dataMap, 5);
+                calculate(upDownbc[0], bcList, dataMap, 5);
+            } else {
+                calculate(upDownbc[0], bcList, dataMap, 5);
+                calculate(upDownbc[1], bcList, dataMap, 5);
+
             }
-        });
-        // upBc.sort(function(a,b){return a.fcint-b.fcint});
-        // downBc.sort(function(a,b){return a.fcint-b.fcint});
-        calculate(upBc, bcList, dataMap, 11);
-        calculate(downBc, bcList, dataMap, 11);
+        }
+        for(var i=1; i<20; i++) {
+            if(i%2 == 0) {
+                calculateReverse(upDownbc[1], bcList, dataMap, 5);
+                calculateReverse(upDownbc[0], bcList, dataMap, 5);
+            } else {
+                calculateReverse(upDownbc[0], bcList, dataMap, 5);
+                calculateReverse(upDownbc[1], bcList, dataMap, 5);
+
+            }
+        }
+        for(var i=1; i<10; i++) {
+            if(i%2 == 0) {
+                calculate(upDownbc[1], bcList, dataMap, 5);
+                calculate(upDownbc[0], bcList, dataMap, 5);
+            } else {
+                calculate(upDownbc[0], bcList, dataMap, 5);
+                calculate(upDownbc[1], bcList, dataMap, 5);
+
+            }
+        }
     };
  
     var iBcCountOfGroup = 3; // 3个班次一次参与计算
     var dirBcOfGroup = [];
     var dirBcIntervalOfGroup = []; // 班次间隔列表，3个班次，2个间隔
-    var oBcFcTime; // 班次发车时间
+    var oBcFcTime = null; // 班次发车时间
     /**
      * 平衡车距内部方法。
      * @param dirBc {array} 单方向班次列表
@@ -46,19 +67,20 @@ var AdjustTrip = function () {
     var calculate = function (dirBc, bcList, dataMap, iFre) {
         if(iFre > 0){
             // 升序排序
-            dirBc.sort(function(a,b){return a.fcint-b.fcint});
+            dirBc.sort(function(a,b){return DateTimeTool.getDateTime(a.fcsj)-DateTimeTool.getDateTime(b.fcsj)});
  
             for (var i = 0; i <= dirBc.length; i++) {
                 // 获取班次列表
                 _calcuBcGroup(i, dirBc);
  
-                if (dirBcOfGroup.length > 0) {
+                if (dirBcOfGroup.length > 2) {
                     // 获取中间预调整的班次时间
-                    oBcFcTime = dirBcOfGroup[1].fcint;
+                    oBcFcTime = dirBcOfGroup[1].fcsj;
                     // 获取发车间隙：用发车时间判断
-                    var fcjx = dataMap.fcjx[judgmentTimeQuantum(oBcFcTime)];
+                    var fcjx = dataMap.fcjx[DateTimeTool.judgmentTimeQuantum(DateTimeTool.getDateTime(oBcFcTime))];
                     // 发车时间所在时间段
-                    // var timeQuantum = judgmentTimeQuantum(oBcFcTime);
+                    // var timeQuantum = DateTimeTool.judgmentTimeQuantum(oBcFcTime);
+
                     if (dirBcIntervalOfGroup[0] < fcjx.min) {
                         // 发车间隙调整为高峰发车间隙 +时间
                         if (_isModifyBcFcsj(
@@ -73,6 +95,21 @@ var AdjustTrip = function () {
                                 dataMap,
                                 1
                             );
+                        } else {
+                            // 最后一个班次不能为末班车 中间班次不能调整，就调整后一个的班次
+                            if (!bcFun.lpBcIsHaveLast(dirBcOfGroup,dataMap.smbcsjArr) && _isModifyBcFcsj(
+                                    bcList,
+                                    dirBcOfGroup[2],
+                                    dataMap,
+                                    -1
+                                )) {
+                                _modifyFcsj(
+                                    bcList,
+                                    dirBcOfGroup[2],
+                                    dataMap,
+                                    -1
+                                );
+                            }
                         }
                     } else if (dirBcIntervalOfGroup[0] > fcjx.max) {
                         // 发车间隙调整为高峰发车间隙 -时间
@@ -81,17 +118,35 @@ var AdjustTrip = function () {
                                 dirBcOfGroup[1],
                                 dataMap,
                                 -1
+                                // fcjx.max - dirBcIntervalOfGroup[0]
                             )) {
                             _modifyFcsj(
                                 bcList,
                                 dirBcOfGroup[1],
                                 dataMap,
                                 -1
+                                // fcjx.max - dirBcIntervalOfGroup[0]
                             );
+                        } else {
+                            // 下一个班次不能为首班车 中间班次不能调整，就调整下一个的班次
+                            if (!bcFun.lpBcIsHaveLast(dirBcOfGroup,dataMap.smbcsjArr) && _isModifyBcFcsj(
+                                    bcList,
+                                    dirBcOfGroup[2],
+                                    dataMap,
+                                    fcjx.max - dirBcIntervalOfGroup[0]
+                                )) {
+                                _modifyFcsj(
+                                    bcList,
+                                    dirBcOfGroup[2],
+                                    dataMap,
+                                    fcjx.max - dirBcIntervalOfGroup[0]
+                                );
+                            }
                         }
                     } else {
                         // -1或+1分钟
                         if (Math.abs(dirBcIntervalOfGroup[0] - dirBcIntervalOfGroup[1]) <= 1) {
+                            continue;
                             // 两个间隔相差1分钟，不处理
                         } else if (dirBcIntervalOfGroup[0] > dirBcIntervalOfGroup[1]) {
                             if (_isModifyBcFcsj(
@@ -106,6 +161,21 @@ var AdjustTrip = function () {
                                     dataMap,
                                     -1
                                 );
+                            } else {
+                                // 前一个班次不能为首班车 中间班次不能调整，就调整前一个的班次
+                                if (!bcFun.lpBcIsHaveFirst(dirBcOfGroup,dataMap.smbcsjArr) && _isModifyBcFcsj(
+                                        bcList,
+                                        dirBcOfGroup[0],
+                                        dataMap,
+                                        1
+                                    )) {
+                                    _modifyFcsj(
+                                        bcList,
+                                        dirBcOfGroup[0],
+                                        dataMap,
+                                        1
+                                    );
+                                }
                             }
                         } else {
                             if (_isModifyBcFcsj(
@@ -120,6 +190,21 @@ var AdjustTrip = function () {
                                     dataMap,
                                     1
                                 );
+                            } else {
+                                // 最后一个班次不能为末班车 中间班次不能调整，就调整后一个的班次
+                                if (!bcFun.lpBcIsHaveLast(dirBcOfGroup,dataMap.smbcsjArr) && _isModifyBcFcsj(
+                                        bcList,
+                                        dirBcOfGroup[2],
+                                        dataMap,
+                                        -1
+                                    )) {
+                                    _modifyFcsj(
+                                        bcList,
+                                        dirBcOfGroup[2],
+                                        dataMap,
+                                        -1
+                                    );
+                                }
                             }
                         }
                     }
@@ -140,7 +225,10 @@ var AdjustTrip = function () {
         dirBcOfGroup = [];
         dirBcIntervalOfGroup = [];
         for (var i = iStartIndex; i < iStartIndex + iBcCountOfGroup && iStartIndex < dirBc.length - 2; i++) {
-            dirBcOfGroup.push(dirBc[i]);
+            if(dirBc[i].bcType == 'cf')
+                iStartIndex++;
+            else
+                dirBcOfGroup.push(dirBc[i]);
         }
         for (var j = 0; j < dirBcOfGroup.length - 1; j++) {
             dirBcIntervalOfGroup.push((DateTimeTool.getDateTime(dirBcOfGroup[j + 1].fcsj).getTime() - DateTimeTool.getDateTime(dirBcOfGroup[j].fcsj).getTime())/60000);
@@ -149,6 +237,201 @@ var AdjustTrip = function () {
     };
  
     /**
+     * 平衡车距内部方法（反方向）。
+     * @param dirBc {array} 单方向班次列表
+     * @param bcList {array} 所有班次列表对象
+     * @param dataMap {array} 参数对象
+     * @param iFre {int} 递归次数
+     * @private
+     */
+    var calculateReverse = function (dirBc, bcList, dataMap, iFre) {
+        if(iFre > 0){
+            // 降序排序
+            dirBc.sort(function(a,b){return DateTimeTool.getDateTime(b.fcsj)-DateTimeTool.getDateTime(a.fcsj)});
+
+            for (var i = 0; i <= dirBc.length; i++) {
+                // 获取班次列表
+                _calcuReverseBcGroup(i, dirBc);
+
+                if (dirBcOfGroup.length > 2) {
+                    // 获取中间预调整的班次时间
+                    oBcFcTime = dirBcOfGroup[1].fcsj;
+                    // 获取发车间隙：用发车时间判断
+                    var fcjx = dataMap.fcjx[DateTimeTool.judgmentTimeQuantum(DateTimeTool.getDateTime(oBcFcTime))];
+                    // 发车时间所在时间段
+                    // var timeQuantum = DateTimeTool.judgmentTimeQuantum(oBcFcTime);
+
+                    if (dirBcIntervalOfGroup[0] < fcjx.min) {
+                        // 发车间隙调整为高峰发车间隙 +时间
+                        if (_isModifyBcFcsj(
+                                bcList,
+                                dirBcOfGroup[1],
+                                dataMap,
+                                -1
+                            )) {
+                            _modifyFcsj(
+                                bcList,
+                                dirBcOfGroup[1],
+                                dataMap,
+                                -1
+                            );
+                        } else {
+                            // 最后一个班次不能为末班车 中间班次不能调整，就调整后一个的班次
+                            if (!bcFun.lpBcIsHaveFirst(dirBcOfGroup,dataMap.smbcsjArr) && _isModifyBcFcsj(
+                                    bcList,
+                                    dirBcOfGroup[2],
+                                    dataMap,
+                                    1
+                                )) {
+                                _modifyFcsj(
+                                    bcList,
+                                    dirBcOfGroup[2],
+                                    dataMap,
+                                    1
+                                );
+                            }
+                        }
+                    } else if (dirBcIntervalOfGroup[0] > fcjx.max) {
+                        // 发车间隙调整为高峰发车间隙 -时间
+                        if (_isModifyBcFcsj(
+                                bcList,
+                                dirBcOfGroup[1],
+                                dataMap,
+                                1
+                                // fcjx.max - dirBcIntervalOfGroup[0]
+                            )) {
+                            _modifyFcsj(
+                                bcList,
+                                dirBcOfGroup[1],
+                                dataMap,
+                                1
+                                // fcjx.max - dirBcIntervalOfGroup[0]
+                            );
+                        } else {
+                            // 最后一个班次不能为首班车 中间班次不能调整，就调整后一个的班次
+                            if (!bcFun.lpBcIsHaveFirst(dirBcOfGroup,dataMap.smbcsjArr) && _isModifyBcFcsj(
+                                    bcList,
+                                    dirBcOfGroup[2],
+                                    dataMap,
+                                    dirBcIntervalOfGroup[0] - fcjx.max
+                                )) {
+                                _modifyFcsj(
+                                    bcList,
+                                    dirBcOfGroup[2],
+                                    dataMap,
+                                    dirBcIntervalOfGroup[0] - fcjx.max
+                                );
+                            } else {
+                                // 前一个班次不能为首班车 中间班次不能调整，就调整前一个的班次
+                                if (!bcFun.lpBcIsHaveLast(dirBcOfGroup[0]) && _isModifyBcFcsj(
+                                        bcList,
+                                        dirBcOfGroup[0],
+                                        dataMap,
+                                        -1
+                                    )) {
+                                    _modifyFcsj(
+                                        bcList,
+                                        dirBcOfGroup[0],
+                                        dataMap,
+                                        -1
+                                    );
+                                }
+                            }
+                        }
+                    } else {
+                        // -1或+1分钟
+                        if (Math.abs(dirBcIntervalOfGroup[0] - dirBcIntervalOfGroup[1]) <= 1) {
+                            continue;
+                            // 两个间隔相差1分钟，不处理
+                        } else if (dirBcIntervalOfGroup[0] > dirBcIntervalOfGroup[1]) {
+                            if (_isModifyBcFcsj(
+                                    bcList,
+                                    dirBcOfGroup[1],
+                                    dataMap,
+                                    1
+                                )) {
+                                _modifyFcsj(
+                                    bcList,
+                                    dirBcOfGroup[1],
+                                    dataMap,
+                                    1
+                                );
+                            } else {
+                                // 前一个班次不能为首班车 中间班次不能调整，就调整前一个的班次
+                                if (!bcFun.lpBcIsHaveLast(dirBcOfGroup,dataMap.smbcsjArr) && _isModifyBcFcsj(
+                                        bcList,
+                                        dirBcOfGroup[0],
+                                        dataMap,
+                                        -1
+                                    )) {
+                                    _modifyFcsj(
+                                        bcList,
+                                        dirBcOfGroup[0],
+                                        dataMap,
+                                        -1
+                                    );
+                                }
+                            }
+                        } else {
+                            if (_isModifyBcFcsj(
+                                    bcList,
+                                    dirBcOfGroup[1],
+                                    dataMap,
+                                    -1
+                                )) {
+                                _modifyFcsj(
+                                    bcList,
+                                    dirBcOfGroup[1],
+                                    dataMap,
+                                    -1
+                                );
+                            } else {
+                                // 最后一个班次不能为末班车 中间班次不能调整，就调整后一个的班次
+                                if (!bcFun.lpBcIsHaveFirst(dirBcOfGroup,dataMap.smbcsjArr) && _isModifyBcFcsj(
+                                        bcList,
+                                        dirBcOfGroup[2],
+                                        dataMap,
+                                        1
+                                    )) {
+                                    _modifyFcsj(
+                                        bcList,
+                                        dirBcOfGroup[2],
+                                        dataMap,
+                                        1
+                                    );
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            // bcFun.deleteNotInRangeBc(dirBc, dataMap.smbcsjArr[].kssj, dataMap.smbcsjArr[].jssj);
+            // 递归迭代
+            calculateReverse(dirBc, bcList, dataMap, iFre - 1);
+        }
+    };
+    /**
+     * 按照规则计算班次列表()。
+     * @param iStartIndex {int} 开始索引
+     * @param dirBc {array} 班次列表
+     * @private
+     */
+    var _calcuReverseBcGroup = function(iStartIndex, dirBc) {
+        dirBcOfGroup = [];
+        dirBcIntervalOfGroup = [];
+        for (var i = iStartIndex; i < iStartIndex + iBcCountOfGroup && iStartIndex < dirBc.length - 2; i++) {
+            if(dirBc[i].bcType == 'cf')
+                iStartIndex++;
+            else
+                dirBcOfGroup.push(dirBc[i]);
+        }
+        for (var j = 0; j < dirBcOfGroup.length - 1; j++) {
+            dirBcIntervalOfGroup.push((DateTimeTool.getDateTime(dirBcOfGroup[j].fcsj).getTime() - DateTimeTool.getDateTime(dirBcOfGroup[j + 1].fcsj).getTime())/60000);
+            // dirBcIntervalOfGroup.push(Math.round((dirBcOfGroup[j + 1].fcint - dirBcOfGroup[j].fcint)/360000));
+        }
+    };
+
+    /**
      * 是否可以调整班次发车时间。
      * @param bcList {InternalLpObj} 所有班次对象
      * @param oBc {InternalBcObj} 调整班次对象
@@ -159,19 +442,21 @@ var AdjustTrip = function () {
         // 获取前后班次
         var bc = getLpPrevAndNextBc(bcList, oBc),
             prevBc = bc[0],
-            nextBc = bc[1];
+            nextBc = bc[1],
+            cfBc = bc[2],
+            cfBcsj = 0;
+        if(cfBc != null){
+            cfBcsj = cfBc.bcsj;
+        }
         if (prevBc != null && nextBc != null){
-            if (prevBc.bcType == 'cf') { // 如果是吃饭班次，不能修改发车时间
-                return false;
-            }
             // 上一个班次的停站范围， 本班次停站范围， 上一班次停站时间， 本班次停站时间
-            var prevStopTimeScope = dataMap.tzsj[bcFun.upDownStrConvertNum(prevBc.xlDir)][judgmentTimeQuantum(prevBc.fcint)],
-                StopTimeScope = dataMap.tzsj[bcFun.upDownStrConvertNum(oBc.xlDir)][judgmentTimeQuantum(oBc.fcint)],
+            var prevStopTimeScope = dataMap.tzsj[bcFun.upDownStrConvertNum(prevBc.xlDir)][DateTimeTool.judgmentTimeQuantum(prevBc.fcint)],
+                StopTimeScope = dataMap.tzsj[bcFun.upDownStrConvertNum(oBc.xlDir)][DateTimeTool.judgmentTimeQuantum(oBc.fcint)],
                 // prevBcStopTime = prevBc.STOPTIME + iStep,
                 // BcStopTime = oBc.STOPTIME + iStep;
                 // iStep为班次往后移动的时间，调整后的时间 = 停站 - 往后移动的时间
                 prevBcStopTime = (DateTimeTool.getDateTime(oBc.fcsj) - DateTimeTool.getDateTime(prevBc.ARRIVALTIME))/60000 + iStep,
-                BcStopTime = (DateTimeTool.getDateTime(nextBc.fcsj) - DateTimeTool.getDateTime(oBc.ARRIVALTIME))/60000 - iStep;
+                BcStopTime = (DateTimeTool.getDateTime(nextBc.fcsj) - DateTimeTool.getDateTime(oBc.ARRIVALTIME))/60000 - iStep - cfBcsj; // 如果有吃饭，则多减掉一个吃饭班次的运行时间
             // 班次移动调整发车间隔时，需要考录的移动班次的前后停站
             if (prevBcStopTime >= 0 && BcStopTime >= 0) {
                 return true;
@@ -179,9 +464,9 @@ var AdjustTrip = function () {
                 return false;
             }
         } else if(prevBc == null && nextBc != null) {
-            var StopTimeScope = dataMap.tzsj[bcFun.upDownStrConvertNum(nextBc.xlDir)][judgmentTimeQuantum(nextBc.fcint)],
-                BcStopTime = (DateTimeTool.getDateTime(nextBc.fcsj) - DateTimeTool.getDateTime(oBc.ARRIVALTIME))/60000 - iStep;
-            // 班次移动调整发车间隔时，需要考录的移动班次的前后停站     TODO：没有判定调整发车时间后会不会不够
+            var StopTimeScope = dataMap.tzsj[bcFun.upDownStrConvertNum(nextBc.xlDir)][DateTimeTool.judgmentTimeQuantum(nextBc.fcint)],
+                BcStopTime = (DateTimeTool.getDateTime(nextBc.fcsj) - DateTimeTool.getDateTime(oBc.ARRIVALTIME))/60000 - iStep - cfBcsj; // 如果有吃饭，则多减掉一个吃饭班次的运行时间
+            // 班次移动调整发车间隔时，需要考录的移动班次的前后停站
             if (BcStopTime >= 0) {
                 return true;
             } else {
@@ -189,10 +474,7 @@ var AdjustTrip = function () {
             }
             // 如果是第一个班次为空
         } else if(prevBc != null && nextBc == null) {
-            if (prevBc.bcType == 'cf') { // 如果是吃饭班次，不能修改发车时间
-                return false;
-            }
-            var prevStopTimeScope = dataMap.tzsj[bcFun.upDownStrConvertNum(prevBc.xlDir)][judgmentTimeQuantum(prevBc.fcint)],
+            var prevStopTimeScope = dataMap.tzsj[bcFun.upDownStrConvertNum(prevBc.xlDir)][DateTimeTool.judgmentTimeQuantum(prevBc.fcint)],
                 prevBcStopTime = (DateTimeTool.getDateTime(oBc.fcsj) - DateTimeTool.getDateTime(prevBc.ARRIVALTIME))/60000 + iStep;
             // 班次移动调整发车间隔时，需要考录的移动班次的前后停站
             if (prevBcStopTime >= 0) {
@@ -202,53 +484,6 @@ var AdjustTrip = function () {
             }
         }
     }
-    /*function _isModifyBcFcsj(bcList, oBc, dataMap, iStep) {
-        // 获取前后班次
-        var bc = getLpPrevAndNextBc(bcList, oBc),
-            prevBc = bc[0],
-            nextBc = bc[1];
-        if (prevBc != null && nextBc != null){
-            if (prevBc.bcType == 'cf') { // 如果是吃饭班次，不能修改发车时间
-                return false;
-            }
-            // 上一个班次的停站范围， 本班次停站范围， 上一班次停站时间， 本班次停站时间
-            var prevStopTimeScope = dataMap.tzsj[bcFun.upDownStrConvertNum(prevBc.xlDir)][judgmentTimeQuantum(prevBc.fcint)],
-                StopTimeScope = dataMap.tzsj[bcFun.upDownStrConvertNum(oBc.xlDir)][judgmentTimeQuantum(oBc.fcint)],
-                // prevBcStopTime = prevBc.STOPTIME + iStep,
-                // BcStopTime = oBc.STOPTIME + iStep;
-                // iStep为班次往后移动的时间，调整后的时间 = 停站 - 往后移动的时间
-                prevBcStopTime = (DateTimeTool.getDateTime(oBc.fcsj) - DateTimeTool.getDateTime(prevBc.ARRIVALTIME))/60000 + iStep,
-                BcStopTime = (DateTimeTool.getDateTime(nextBc.fcsj) - DateTimeTool.getDateTime(oBc.ARRIVALTIME))/60000 - iStep;
-            // 班次移动调整发车间隔时，需要考录的移动班次的前后停站
-            if (prevBcStopTime >= prevStopTimeScope.min && BcStopTime >= StopTimeScope.min) {
-                return true;
-            } else {
-                return false;
-            }
-        } else if(prevBc == null && nextBc != null) {
-            var StopTimeScope = dataMap.tzsj[bcFun.upDownStrConvertNum(nextBc.xlDir)][judgmentTimeQuantum(nextBc.fcint)],
-                BcStopTime = (DateTimeTool.getDateTime(nextBc.fcsj) - DateTimeTool.getDateTime(oBc.ARRIVALTIME))/60000 - iStep;
-            // 班次移动调整发车间隔时，需要考录的移动班次的前后停站     TODO：没有判定调整发车时间后会不会不够
-            if (BcStopTime >= StopTimeScope.min) {
-                return true;
-            } else {
-                return false;
-            }
-            // 如果是第一个班次为空
-        } else if(prevBc != null && nextBc == null) {
-            if (prevBc.bcType == 'cf') { // 如果是吃饭班次，不能修改发车时间
-                return false;
-            }
-            var prevStopTimeScope = dataMap.tzsj[bcFun.upDownStrConvertNum(prevBc.xlDir)][judgmentTimeQuantum(prevBc.fcint)],
-                prevBcStopTime = (DateTimeTool.getDateTime(oBc.fcsj) - DateTimeTool.getDateTime(prevBc.ARRIVALTIME))/60000 + iStep;
-            // 班次移动调整发车间隔时，需要考录的移动班次的前后停站
-            if (prevBcStopTime >= prevStopTimeScope.min) {
-                return true;
-            } else {
-                return false;
-            }
-        }
-    }*/
  
     /**
      * 调整发车时间（调整当前班次后，需要处理后续路牌的所有班次）。
@@ -261,19 +496,26 @@ var AdjustTrip = function () {
     function _modifyFcsj(bcList, oBc, dataMap, iMin) {
         var bc = getLpPrevAndNextBc(bcList, oBc),
             prevBc = bc[0],
-            nextBc = bc[1];
+            nextBc = bc[1],
+            cfBc = bc[2];
         var fcsj = DateTimeTool.getDateTime(oBc.fcsj);
         fcsj.setMinutes(fcsj.getMinutes() + iMin);
         $.each(bcList, function () {
-            if(this.lpNo == oBc.lpNo && this.fcno == oBc.fcno){
+            if(this.lpNo == oBc.lpNo && this.fcno == oBc.fcno && this.bcType != 'cf'){
                 var time = new Date(fcsj);
-                this.ARRIVALTIME = DateTimeTool.getHHmmStr(time.setMinutes(time.getMinutes() + this.bcsj));
+                time.setMinutes(time.getMinutes() + this.bcsj);
+                this.ARRIVALTIME = DateTimeTool.getHHmmStr(time);
                 this.fcsj = DateTimeTool.getHHmmStr(fcsj);
                 this.fcint = fcsj.getTime();
-                // 前一个班次停站时间 = 原停站时间 - 中间班次移动时间
-                this.STOPTIME -= iMin;
+                // 不是分班班次这调整停站   前一个班次停站时间 = 原停站时间 - 中间班次移动时间
+                if(this.isfb == 0)
+                    this.STOPTIME -= iMin;
+                if(cfBc != null) {
+                    cfBc.fcsj = this.ARRIVALTIME;
+                    cfBc.ARRIVALTIME = DateTimeTool.getHHmmStr(time.setMinutes(time.getMinutes() + cfBc.bcsj));
+                }
             }
-            if(prevBc != undefined && prevBc != null && this.lpNo == oBc.lpNo && this.fcno == prevBc.fcno){
+            if(prevBc != undefined && prevBc != null && this.lpNo == oBc.lpNo && this.fcno == prevBc.fcno && this.isfb == 0){
                 // 前一个班次停站时间 = 原停站时间 + 中间班次移动时间
                 this.STOPTIME += iMin;
             }
@@ -283,37 +525,25 @@ var AdjustTrip = function () {
     var getLpPrevAndNextBc = function (bcList, oBc) {
         var lpBc = new Array(),
             // 前一个班次
-            prevBc = null, nextBc = null;
+            prevBc = null, nextBc = null, cfBc = null;
         $.each(bcList, function () {
             if(this.lpNo == oBc.lpNo)
                 lpBc.push(this);
         });
-        lpBc.sort(function (a,b) {return a.fcint - b.fcint;});
+        lpBc.sort(function (a,b) {return DateTimeTool.getDateTime(a.fcsj)-DateTimeTool.getDateTime(b.fcsj);});
         for(var n = 0; n < lpBc.length; n++) {
             if(lpBc[n].fcno == oBc.fcno && n > 0)
                 prevBc = lpBc[n-1];
-            if(lpBc[n].fcno == oBc.fcno && n < lpBc.length-1)
-                nextBc = lpBc[n+1];
+            if(lpBc[n].fcno == oBc.fcno && n < lpBc.length-1){
+                if(lpBc[n+1].bcType == 'cf'){
+                    nextBc = lpBc[n+2];
+                    cfBc = lpBc[n+1];
+                } else {
+                    nextBc = lpBc[n+1];
+                }
+            }
         }
-        return [prevBc, nextBc];
-    };
-    // 判断时间在什么时间段段内
-    /**
-     * 判断时间在什么时间段段内
-     * @param t 时间
-     * @private
-     */
-    var judgmentTimeQuantum = function (t) {
-        if(t <= DateTimeTool.getDateTime('6:30'))
-            return 0;
-        else if(t > DateTimeTool.getDateTime('6:30') && t <= DateTimeTool.getDateTime('8:30'))
-            return 1;
-        else if(t > DateTimeTool.getDateTime('8:30') && t <= DateTimeTool.getDateTime('16:00'))
-            return 2;
-        else if(t > DateTimeTool.getDateTime('16:00') && t <= DateTimeTool.getDateTime('18:00'))
-            return 3;
-        else if(t > DateTimeTool.getDateTime('18:00'))
-            return 4;
+        return [prevBc, nextBc, cfBc];
     };
     return {
         departureClearanceAdjust : departureClearanceAdjust
@@ -30,6 +30,7 @@ var bcFun = function() {
         obj.bcType = type;
         obj.xlDir = dir;
         obj.fcno = xh;
+        obj.qs = xh;
         obj.jhlc = jhlc;// 计划里程
         obj.tcc = gatps.tcc_id;// 停车场id
         obj.ttinfo = gatps.skbName;// 时刻表id
@@ -125,6 +126,7 @@ var bcFun = function() {
             }
         }
     };
+
     /**
      * @description (TODO) 获取 上、下行的正常、区间、空放、直放班次.
      * @param 需要分割的班次数据集合.
@@ -135,7 +137,7 @@ var bcFun = function() {
         var upArray = new Array(),downArray = new Array(),rs = new Array();
         for(var j = 0 ; j< json.length ; j++) {
             // 判断是否为正常、区间、空放、直放班次
-            if(json[j].bcType== dataMap.bcTypeArr.normal ||
+            /*if(json[j].bcType== dataMap.bcTypeArr.normal ||
                 json[j].bcType== dataMap.bcTypeArr.region ||
                 json[j].bcType== dataMap.bcTypeArr.major ||
                 json[j].bcType== dataMap.bcTypeArr.venting) {
@@ -143,9 +145,13 @@ var bcFun = function() {
                     upArray.push(json[j]);
                 else if(json[j].xlDir == dataMap.dira[1])
                     downArray.push(json[j]);
-            }
+            }*/
+            if(json[j].xlDir == dataMap.dira[0])
+                upArray.push(json[j]);
+            else if(json[j].xlDir == dataMap.dira[1])
+                downArray.push(json[j]);
         }
-        rs.push(upArray,downArray);
+        rs.push(upArray, downArray);
         // 返回数据.
         return rs;
     };
@@ -180,9 +186,9 @@ var bcFun = function() {
             }
             // 按照发车序号顺序排序.
             lpbc_.sort(function(a,b){return a.fcno-b.fcno});
-            addcfbc01(lpbc_,dataMap,map);
-            // 按照发车序号顺序排序.
-            lpbc_.sort(function(a,b){return a.fcno-b.fcno});
+            // addcfbc01(lpbc_,dataMap,map);
+            // // 按照发车序号顺序排序.
+            // lpbc_.sort(function(a,b){return a.fcno-b.fcno});
             var tt = addjclbbc01(lpbc_,dataMap,dataMap.lbsj,map);
             bcs = updfcno(tt,bcs);
             resultJA = resultJA.concat(tt);
@@ -227,24 +233,39 @@ var bcFun = function() {
                 result.push(getbcObj(
                     dqbcfcsj,dataMap.ccsjArr[fxdm],car,dataMap.bcTypeArr.out,
                     dataMap.dira[fxdm],2,dataMap.cclcArr[fxdm],gatps,0,dataMap.qdzArr[fxdm],null,null,0,0));// 出场班次
-                fcno ++;
+                fcno = 3;
             }else if(b==bc.length-1){
-                var fcno_ =  dxfno + 2;
+                fxdm = fxdm == 0 ? 1:0;
+                // var fcno_ =  dxfno + 2;
                 var qdbcddsj = DateTimeTool.getDateTime(bc[b].ARRIVALTIME);
-                result.push(getbcObj(
-                    qdbcddsj,dataMap.jcsjArr[fxdm],car,dataMap.bcTypeArr.in_,
-                    dataMap.dira[fxdm],fcno_++,dataMap.jclcArr[fxdm],gatps,0,dataMap.qdzArr[fxdm],null,null,0,0));// 进场班次
+                if(dataMap.jcsjArr[fxdm] > 0){
+                    result.push(getbcObj(
+                        qdbcddsj,dataMap.jcsjArr[fxdm],car,dataMap.bcTypeArr.in_,
+                        dataMap.dira[fxdm],++fcno,dataMap.jclcArr[fxdm],gatps,0,dataMap.qdzArr[fxdm],null,null,0,0));// 进场班次
+                }
                 result.push(getbcObj(
                     qdbcddsj,dataMap.jcsjArr[fxdm],car,dataMap.bcTypeArr.lc,
-                    dataMap.dira[fxdm],fcno_++,0,gatps,0,null,null,null,0,lbsj));// 晚班例保班次
+                    dataMap.dira[fxdm],++fcno,0,gatps,0,null,null,null,0,lbsj));// 晚班例保班次
+            } else if(bc[b].isfb && b!=bc.length-1){
+                fxdm = fxdm == 0 ? 1:0;
+                var qdbcddsj = DateTimeTool.getDateTime(bc[b].ARRIVALTIME);
+                if(dataMap.jcsjArr[fxdm] > 0){
+                    result.push(getbcObj(
+                        qdbcddsj,dataMap.jcsjArr[fxdm],car,dataMap.bcTypeArr.in_,
+                        dataMap.dira[fxdm],++fcno,dataMap.jclcArr[fxdm],gatps,0,dataMap.qdzArr[fxdm],null,null,0,0));// 进场班次
+                }
             }
-            dxfno = bc[b].fcno + fcno;
-            bc[b].fcno = dxfno;
-            if(stas) {
+            // dxfno = bc[b].fcno + fcno;
+            // bc[b].fcno = dxfno;
+
+            bc[b].fcno = fcno;
+            result.push(bc[b]);
+            fcno++;
+
+            /*if(stas) {
                 fcno ++;
                 stas = false;
-            }
-            result.push(bc[b]);
+            }*/
         }
         return result;
     };
@@ -254,7 +275,7 @@ var bcFun = function() {
         for(var g = 0 ; g <lpbcar.length-1;g++ ) {
             if( parseInt((DateTimeTool.getDateTime(lpbcar[g+1].fcsj)  - DateTimeTool.getDateTime(lpbcar[g].ARRIVALTIME))/60000) > 180
                 && lpbcar[g].STOPTIME==0 && lpbcar[g].bcType =='normal' ) {
-                lpbcar[g].isfb = 1;
+                lpbcar[g].isfb = true;
             }
         }
     };
@@ -265,6 +286,222 @@ var bcFun = function() {
             return 1;
     };
  
+    /**
+     * @description (TODO) 横向调整 调整停站时间.
+     * @param cara 路牌数组.
+     * @param tempa 所有的班次数组集合.
+     * @param dataMap 封装的 以上、下行方向成对存在的 一些参数数组 [下标0 -- 代表上行 ; 下标1 -- 代表下行].
+     *
+     * ********************************  思路  *************************************************
+     * 					第一步 等到每个路牌下的班次数组集合.
+     *
+     * 				 	第二步 顺序排序每个路牌下的班次数组集合.
+     *
+     * 					第三步 从第二个班次开始,用第二个班次的发车时间 - 上一个班次的到达时间 得到 上一个班次的停站时间.
+     *
+     * 					第四步 修改上一个班次的停站时间.
+     *
+     * 						  修改停站时间规则：以行驶时间的10%-15% 为标准。
+     * 								  		如果超出该范围。则以录入参数低谷最大停站间隙为准。
+     * 								  		停站时间最大不能超过该停站时间。
+     * 								  		高峰附近的班次的停站时间在离高峰最近一个班次的停站时间浮动范围【1-2】分钟。
+     *
+     * ****************************************************************************************
+     */
+    var resizeByPitStopTime = function(cara,tempa,dataMap) {
+        var cLen = cara.length,tLen = tempa.length;
+        if(cLen<= 0 || tLen<=0 || dataMap==null)
+            return;
+        // 定义低谷最大停站时间、行业标准最小、最大停站时间(行驶时间的10%~15%).
+        var dgmaxtzsj = dataMap.dgmaxtzsj,normmintzsj, normmaxtzsj;
+        for(var t = 0 ; t < cLen ; t++) {
+            // 定义当前路牌班次数组集合.
+            var sslpbcA = new Array();
+            for(var j =0 ; j < tLen ; j++) {
+                // 判断当期遍历的班次是否属于当前的路牌.如果是则添加到当前的路牌班次数组集合.
+                if(tempa[j].lpNo == cara[t].lpNo) {
+                    tempa[j].fcint = DateTimeTool.getDateTime(tempa[j].fcsj).getTime();
+                    sslpbcA.push(tempa[j]);
+                }
+            }
+            if(sslpbcA.length > 0) {
+                // 按发车时间顺序排序.
+                sslpbcA.sort(function(a,b){return a.fcint-b.fcint});
+                // 按照规则修改停站时间.
+                for(var r = 0 ; r < sslpbcA.length-1 ; r++) {
+                    if(sslpbcA[r].isfb)
+                        continue;
+                    // test
+                    //if(sslpbcA[r].bcType == 'cf') {
+                    //    alert('cf' + sslpbcA[r-1].fcsj);
+                    //}
+                    // 定义上一个班次的发车时间、当前班次的到达时间、发车时间.
+                    var sgbcfcsj = DateTimeTool.getDateTime(sslpbcA[r+1].fcsj),
+                        dqbcddsj = DateTimeTool.getDateTime(sslpbcA[r].ARRIVALTIME),
+                        dqbcfcsj = DateTimeTool.getDateTime(sslpbcA[r].fcsj);
+                    // 定义当前班次方向下标代码[0代表上行;1代表下行].
+                    var cctag = dirDmToIndex(sslpbcA[r].xlDir); //  dataMap.smbcsjArr
+                    // 定义每每相邻两个班次之间的时间差分钟数(也就是停站时间.)
+                    var dxmin = parseInt( (sgbcfcsj - dqbcddsj)/60000);
+                    // 定义是否高峰
+                    var tt_flag = scheduleInitialize.isPeakTimeScope(dqbcfcsj , dataMap);
+                    // 获取行驶时间.
+                    var xxsj = scheduleInitialize.judgeXSSJ(cctag, dqbcfcsj, dataMap);
+                    var time = dataMap.tzsj[cctag][DateTimeTool.judgmentTimeQuantum(xxsj)];
+
+                    normmintzsj = time.min;
+                    normmaxtzsj = time.max;
+                    var flag = false;
+
+                    // 如果小于零
+                    if(dxmin < 0 && sslpbcA[r].isfb ==0) {
+                        // 根据不同时段的停站时间.重新赋值停站时间.
+                        if(sslpbcA[r].bcType=='normal' && sslpbcA[r+1].bcType =='normal')
+                        //dxmin = tt_flag ?  dataMap.gftzsj[cctag] : dataMap.dgtzsj[cctag];
+                            dxmin = 1;
+                        else
+                            dxmin = 0;
+                        flag = true;
+                    }else if(dxmin==0){
+                        if (sslpbcA[r].bcType == 'cf') { // 如果是吃饭班次，停站为0
+                            dxmin = 0;
+                        } else {
+                            // 这里区分，如果下一个班次是吃饭班次，停站为0
+                            if (sslpbcA[r + 1].bcType=='cf') {
+                                dxmin = 0;
+                            } else { // 否则使用最小停站时间
+                                dxmin = normmintzsj;
+                            }
+                        }
+
+                        flag = true;
+                    }else {
+                        // 如果 大于等于低谷最大停站时间 并且 小于等于三小时.则把低谷最大停站时间 作为 停站时间.
+                        if(dxmin >= dgmaxtzsj && dxmin < 180 && sslpbcA[r].isfb==false) {
+                            dxmin = dgmaxtzsj;
+                            flag = true;
+                            // 如果大于零 并且 小于等于行业标准的最小停站时间
+                        }else if(dxmin > 0 && dxmin <= normmintzsj ) {
+                            // dxmin = dxmin;
+                            flag = true;
+                            // 如果大于行业标准的最小停站时间  并且  小于等于行业标准的最大停站时间
+                        }else if(dxmin > normmintzsj && dxmin <= normmaxtzsj ) {
+                            // dxmin = dxmin;
+                            flag = true;
+                            // 如果大于行业标准的最大停站时间  并且 小于低谷最大停站时间
+                        }else if(dxmin > normmaxtzsj && dxmin < dgmaxtzsj ) {
+                            // dxmin = dxmin;
+                            flag = true;
+                        }else if (dxmin >= 180){
+                            dxmin = 0;
+                        }
+                    }
+                    if(flag) {
+                        if(!isDirSmbc(dirDmToIndex(sslpbcA[r+1].xlDir) , sslpbcA[r+1].fcsj , dataMap)) {
+                            // 修改当前班次的停站时间.
+                            sslpbcA[r].STOPTIME =  parseInt(dxmin) ;
+                            // 当前班次的到达时间 + 停站时间 作为下一个班次的发车时间.
+                            dqbcddsj.setMinutes(dqbcddsj.getMinutes() + dxmin);
+                            // 修改下一个班次的发车时间.
+                            sslpbcA[r+1].fcsj = DateTimeTool.getHHmmStr(dqbcddsj);
+                            // 下一个班次的发车时间 + 行驶时间 作为下一个班次的到达时间.
+                            dqbcddsj.setMinutes(dqbcddsj.getMinutes() + sslpbcA[r+1].bcsj);
+                            // 修改下一个班次的到达时间.
+                            sslpbcA[r+1].ARRIVALTIME = DateTimeTool.getHHmmStr(dqbcddsj);
+                        }else {
+                            if(r>0) {
+                                // 修改当前班次的停站时间.
+                                sslpbcA[r].STOPTIME =  parseInt(dxmin) ;
+                                sgbcfcsj.setMinutes(sgbcfcsj.getMinutes() - sslpbcA[r].STOPTIME);
+                                sslpbcA[r].ARRIVALTIME = DateTimeTool.getHHmmStr(sgbcfcsj);
+                                sgbcfcsj.setMinutes(sgbcfcsj.getMinutes() - sslpbcA[r].bcsj);
+                                sslpbcA[r].fcsj = DateTimeTool.getHHmmStr(sgbcfcsj);
+                                sslpbcA[r-1].STOPTIME = parseInt( ( sgbcfcsj -  DateTimeTool.getDateTime(sslpbcA[r-1].ARRIVALTIME))/60000);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    };
+
+    var isDirSmbc = function(dirDm , fcsj ,  dataMap) {
+        var falg = false;
+        if(fcsj == dataMap.smbcsjArr[dirDm].kssj || fcsj == dataMap.smbcsjArr[dirDm].jssj)
+            falg = true;
+        return falg;
+    };
+
+
+
+    /**
+     * @description (TODO) 标记上、下行首末班车.
+     * @param jsonArray 初始化路牌下的所有班次并且已经均匀发车间隙的数组集合.
+     * @param dataMap 封装的 以上、下行方向成对存在的 一些参数数组 [下标0 -- 代表上行 ; 下标1 -- 代表下行].
+     */
+    var markLastBus = function(jsonArray , dataMap) {
+        // 定义上、下行的正常、区间、空放、直放班次、返回数组集合.
+        var listMap = getUpAndDownBc( jsonArray , dataMap) , resultArray = new Array();
+        for(var i = 0 ; i < listMap.length ; i++) {
+            if(listMap[i].length > 0){
+                // 把班次顺序排序.
+                listMap[i].sort(function(a,b){return a.fcint-b.fcint});
+                // 确定首末班车时间.
+                markFirstAndLastBusAlso(listMap[i] , dataMap , i);
+            }
+            resultArray = resultArray.concat(listMap[i]);
+        }
+        return resultArray;
+    };
+
+    /**
+     * @description (TODO) 确定某方向下的末班车.
+     * @param dirArray 某方向下的数组集合.
+     * @param dataMap 封装的 以上、下行方向成对存在的 一些参数数组 [下标0 -- 代表上行 ; 下标1 -- 代表下行].
+     * @param dir 方向.
+     */
+    var markFirstAndLastBusAlso = function(dirArray , dataMap , dir) {
+        if(dirArray.length>=2) {
+            // 定义最后一个班次.
+            var dirLastBc = dirArray[dirArray.length-1];
+            // 确认末班车时间
+            if(dirLastBc.fcsj != dataMap.smbcsjArr[dir].jssj) {
+                // 修改最后一个班次的发车时间.
+                dirLastBc.fcsj = dataMap.smbcsjArr[dir].jssj;
+                // 定义到达时间.
+                var ddsj_ = DateTimeTool.getDateTime(dirLastBc.fcsj);
+                ddsj_.setMinutes(ddsj_.getMinutes() + dataMap.xssj[dir][4]);
+                // 修改最后一个班次的到达时间.
+                dirLastBc.ARRIVALTIME = DateTimeTool.getHHmmStr(ddsj_);
+                dirLastBc.bcsj = dataMap.xssj[dir][4];
+            }
+        }
+    };
+
+    /**
+     * @description (TODO) 判断某路牌下是否存在末班车时间班次.
+     * @param arr 某路牌下的班次.
+     * @param smbcsjArr 首末班车时间点数组集合.
+     */
+    var lpBcIsHaveLast = function(arr , smbcsjArr) {
+        for(var a = 0 ; a < arr.length ; a++) {
+            for(var s = 0 ; s < smbcsjArr.length ; s++) {
+                if(arr[a].fcsj == smbcsjArr[s].jssj && dirDmToIndex(arr[a].xlDir) == s)
+                    return true;
+            }
+        }
+        return false;
+    };
+    var lpBcIsHaveFirst = function(arr , smbcsjArr) {
+        for(var a = 0 ; a < arr.length ; a++) {
+            for(var s = 0 ; s < smbcsjArr.length ; s++) {
+                if(arr[a].fcsj == smbcsjArr[s].kssj && dirDmToIndex(arr[a].xlDir) == s)
+                    return true;
+            }
+        }
+        return false;
+    };
+
     return{
         getbcObj : getbcObj, //封装班次属性值
         upDownStrConvertNum : upDownStrConvertNum,
@@ -272,6 +509,11 @@ var bcFun = function() {
         markFirstAndLastBusAlsoDietNotInRangeBc : markFirstAndLastBusAlsoDietNotInRangeBc,
         getUpAndDownBc : getUpAndDownBc,
         addInOutFieldBc : addInOutFieldBc, //添加进出场班次
-        updfcno : updfcno
+        updfcno : updfcno,
+        resizeByPitStopTime : resizeByPitStopTime,
+        markLastBus : markLastBus, //标记上、下行末班车
+        lpBcIsHaveLast : lpBcIsHaveLast, // 判断路牌班次是否有末班车
+        lpBcIsHaveFirst : lpBcIsHaveFirst, // 判断路牌班次是否有首班车
+        dirDmToIndex : dirDmToIndex // 字符串转换为方向
     }
 }();
@@ -64,49 +64,6 @@ var lpFun = function () {
         // 返回数据.
         return list.sort(function(a,b){return b.hoursV-a.hoursV});
     };
-    /**
-     * @description (TODO) 把班型人次合理的分配到不同的路牌上.
-     * @param list 班型人次数组集合.
-     * @param clzs 路牌数组.
-     * @return 返回一个把路牌合理的分配到班型人次下组成的数据集合.
-     * */
-    var bxAlloTotLp = function(arr,clzs){
-        var cLen = clzs.length;
-        var type = getMode(arr);
-        var i=0;
-        while(clzs.length > i){
-            for(var j=0; j<type.length; j++) {
-                if(arr[type[j]].len-- > 0) {
-                    arr[type[j]].bx.sslp.push(clzs[i]);
-                    i++
-                }
-            }
-        }
-    };
-    var getMode = function(arr){
-        var mode = [], bxRcList = arr;
-        var count = bxRcList[0].lps;
-        for(var i=1; i<bxRcList.length; i++) {
-            if(bxRcList[i].lps < count)
-                count = bxRcList[i].lps;
-        }
-        for(var i=0; i<bxRcList.length; i++) {
-            bxRcList[i] = {'bx':bxRcList[i],'len':bxRcList[i].lps, 'ratio':Math.round(bxRcList[i].lps/count)}
-        }
-        for(var i=0; i<bxRcList.length; i++) {
-            for(var j=0; j<bxRcList[i].ratio; j++) {
-                mode.push(i);
-            }
-        }
-        // for(var m=0; m<mode.length-2; m++) {
-        //     if(mode[m] == mode[m+1]) {
-        //         var a = mode[m+1];
-        //         mode[m+1] = mode[m+2];
-        //         mode[m+2] = a;
-        //     }
-        // }
-        return mode;
-    };
     // 路牌整理
     var lpNeaten = function (bxRcList, carList, dataMap) {
         var carListH = new Array();
@@ -132,11 +89,12 @@ var lpFun = function () {
         // carListH：带工时和圈数的车辆list,carListCache：缓存为分班车辆
         var carListH = [],carListCache = [];
  
-        // 最少分班路牌 = 总路牌 - （低谷周转/低谷最大发车间隔）向上取整
+        // 最多分班路牌 = 总路牌 - （低谷周转/低谷最大发车间隔）向上取整
         var fblps = carList.length - Math.ceil((dataMap.zzsj[2]) / map.dgmaxfcjx);
         // 取出有工时的路牌
         for (var i = 0; i < bxRcList.length; i++) {
             var sslp = bxRcList[i].bx.sslp, bx = bxRcList[i].bx;
+            // 路牌能有多少圈
             var count = Math.round(bx.hoursV / (dataMap.zzsj[1]/60));// 早高峰周转：dataMap.zzsj[1]
             if(bx.type == '五工二休') {
                 $.each(sslp, function () {
@@ -167,7 +125,7 @@ var lpFun = function () {
             cutCar(carListH,carListCache);
             var index = Math.floor(carListH.length / fblps);
             for(var s=1; s<=fblps; s++){
-                carListH[s*index].isfb = true;
+                carListH[s*index - 1].isfb = true;
             }
         }
         carListH = carListH.concat(carListCache);
@@ -179,6 +137,16 @@ var lpFun = function () {
         }
         return carListH;
     };
+    // 切割出连班路牌
+    var cutCar = function(carListH,carListCache) {
+        for(var c=0; c<carListH.length; c++){
+            if(carListH[c].isfb) {
+                carListCache.push(carListH[c]);
+                carListH.splice(c,1);
+                cutCar(carListH,carListCache);
+            }
+        }
+    };
     // 确定路牌分班数
     var lpfbs = function (fblps, bxRcList, index) {
         if(fblps > bxRcList[index].lps){