Merge branch 'minhang' into qingpu_20180808

# Conflicts: # src/main/resources/application-prod.properties # src/main/resources/datatools/config-prod.properties # src/main/resources/ms-jdbc.properties # src/main/resources/static/index.html # src/main/resources/static/login.html # src/main/resources/static/metronic_v4.5.4/plugins/echarts4/echarts.js # src/main/resources/static/metronic_v4.5.4/plugins/echarts4/echarts.min.js # src/main/resources/static/real_control_v2/main.html # src/main/resources/traffic-jdbc.properties

Merge branch 'minhang' into qingpu_20180808
# Conflicts: # src/main/resources/application-prod.properties # src/main/resources/datatools/config-prod.properties # src/main/resources/ms-jdbc.properties # src/main/resources/static/index.html # src/main/resources/static/login.html # src/main/resources/static/metronic_v4.5.4/plugins/echarts4/echarts.js # src/main/resources/static/metronic_v4.5.4/plugins/echarts4/echarts.min.js # src/main/resources/static/real_control_v2/main.html # src/main/resources/traffic-jdbc.properties
王通
2 parents 4f6eade0 70b2f1f9
Showing 97 changed files with 2743 additions and 654 deletions
src/main/java/com/bsth/XDApplication.java
src/main/java/com/bsth/common/Constants.java
src/main/java/com/bsth/controller/StationController.java
src/main/java/com/bsth/controller/StationRouteController.java
src/main/java/com/bsth/controller/realcontrol/PageForwardingController.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/EmployeeConfigInfoController.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/data/gpsdata_v2/utils/GeoUtils.java
src/main/java/com/bsth/data/gpsdata_v2/utils/GpsDataRecovery.java
src/main/java/com/bsth/data/schedule/late_adjust/LateAdjustHandle.java
src/main/java/com/bsth/data/schedule/thread/CalcOilThread.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/filter/BaseFilter.java
src/main/java/com/bsth/repository/CarDeviceRepository.java
@@ -169,7 +169,7 @@ public class XDApplication implements CommandLineRunner {
         sexec.scheduleWithFixedDelay(schedulePstThread, 180, 10, TimeUnit.SECONDS);//班次延迟入库线程
         sexec.scheduleWithFixedDelay(seiPstThread, 180, 60, TimeUnit.SECONDS);//班次修正日志入库
         sexec.scheduleWithFixedDelay(directivesPstThread, 120, 60, TimeUnit.SECONDS);//调度指令延迟入库
-        sexec.scheduleWithFixedDelay(threadMonotor, 240, 60, TimeUnit.SECONDS);//线程监听（防止重要的线程阻塞、异常结束。以及部分主备切换工作）
+        //sexec.scheduleWithFixedDelay(threadMonotor, 240, 60, TimeUnit.SECONDS);//线程监听（防止重要的线程阻塞、异常结束。以及部分主备切换工作）
         sexec.scheduleWithFixedDelay(sampleTimeDataLoader, 140, 120 * 60, TimeUnit.SECONDS);//到离站预测需要的站点间耗时数据
         sexec.scheduleWithFixedDelay(basicDataLoader, 1, 1, TimeUnit.HOURS);//基础数据更新
         sexec.scheduleWithFixedDelay(autoExecScanThread, 180, 50, TimeUnit.SECONDS);//班次自动执行
@@ -20,6 +20,8 @@ public class Constants {
 	public static final String METRONIC_URL = "/metronic_v4.5.4/**";
 	public static final String LOGIN_FAILURE = "/user/loginFailure";
 	public static final String CAPTCHA = "/captcha.jpg";
+	public static final String XIANDIAO_LOGIN = "/xdlogin.html";
+	public static final String IPAD_IMG_URL = "/apple-touch-icon-72x72.png";
 	//对外的营运数据接口
 	public static final String SERVICE_INTERFACE = "/companyService/**";
 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;
 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.bsth.entity.Station;
-import com.bsth.service.StationService;
-import com.bsth.util.GetUIDAndCode;
+import java.util.Map;
 /**
  * 
@@ -34,6 +35,9 @@ public class StationController extends BaseController&lt;Station, Integer&gt; {
 	@Autowired
 	private StationService service;
+
+	/** 日志记录器 */
+	private static final Logger LOGGER = LoggerFactory.getLogger(StationController.class);
 	/**
 	 * @Description :TODO(根据坐标点匹配数据库中的站点)
@@ -153,10 +157,13 @@ public class StationController extends BaseController&lt;Station, Integer&gt; {
 	 */
 	@RequestMapping(value="updateStationAndSectionCode" , method = RequestMethod.GET)
 	public int updateStationAndSectionCode(@RequestParam Integer stationCount, Integer sectionCount) {
+		System.out.println(stationCount+" _ "+ sectionCount );
 		for(int i = 0; i <  stationCount; i++) {
+			System.out.println(i);
 			GetUIDAndCode.getStationId();
 		}
-		for(int i = 0; i <  sectionCount; i++) {
+		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(站点路由控制器)
@@ -6,10 +6,12 @@ import com.bsth.security.util.SecurityUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.servlet.ModelAndView;
 import javax.servlet.http.HttpServletResponse;
+import javax.ws.rs.Path;
 /**
  * 线调登入页面转发
@@ -21,7 +23,7 @@ public class PageForwardingController {
     Logger logger = LoggerFactory.getLogger(this.getClass());
-    @RequestMapping("/v2")
+    /*@RequestMapping("/v2")
     public ModelAndView v2(HttpServletResponse response){
         ModelAndView mv = new ModelAndView();
         SysUser user = SecurityUtils.getCurrentUser();
@@ -50,5 +52,42 @@ public class PageForwardingController {
         //正常线调主页
         mv.setViewName("/real_control_v2/main.html");
         return mv;
+    }*/
+
+    @RequestMapping("/{type}")
+    public ModelAndView v2(@PathVariable("type") String type, HttpServletResponse response){
+        ModelAndView mv = new ModelAndView();
+        SysUser user = SecurityUtils.getCurrentUser();
+
+        //班次管理员
+        if(user.getUserName().equals("bcgly")){
+            mv.setViewName("/real_control_v2/sch_manage/sch_imitate.html");
+            return mv;
+        }
+
+        try{
+            //闵行运管所，直接打开地图页面
+            if(user.getRoles().size() == 1){
+                for(Role role : user.getRoles()){
+                    if(role.getCodeName().equals("MH_YGS")){
+                        // 直接重定向
+                        response.sendRedirect("/pages/mapmonitor/alone/wrap.html");
+                        return null;
+                    }
+                }
+            }
+        }catch (Exception e){
+            logger.error("", e);
+        }
+
+
+        if(type.equals("v2_mobile")){
+            mv.setViewName("/real_control_v2_mobile/main.html");
+        }else{
+            //正常线调主页
+            mv.setViewName("/real_control_v2/main.html");
+        }
+
+        return mv;
     }
 }
 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;
+	}
 }
 package com.bsth.controller.schedule.core;
+import com.bsth.common.Constants;
 import com.bsth.common.ResponseCode;
 import com.bsth.controller.schedule.BController;
 import com.bsth.entity.schedule.CarConfigInfo;
+import com.bsth.entity.sys.CompanyAuthority;
 import com.bsth.repository.schedule.CarConfigInfoRepository;
 import com.bsth.service.schedule.CarConfigInfoService;
 import com.bsth.service.schedule.exception.ScheduleException;
@@ -12,6 +14,8 @@ 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.HttpServletRequest;
+import javax.servlet.http.HttpSession;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -58,4 +62,84 @@ 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();
+        List<CompanyAuthority> cmyAuths = (List<CompanyAuthority>) session.getAttribute(Constants.COMPANY_AUTHORITYS);
+
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            CarConfigInfo carConfigInfo = new CarConfigInfo(
+                    null,
+                    param.get("xl.id_eq"),
+                    param.get("xl.name_eq"),
+                    param.get("cl.id_eq")
+            );
+            carConfigInfoService.validate_cars_gs(carConfigInfo, cmyAuths);
+            rtn.put("status", ResponseCode.SUCCESS);
+        } catch (ScheduleException exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+
+        return rtn;
+    }
+
+    @RequestMapping(value = "/validate_cars_fgs", method = RequestMethod.GET)
+    public Map<String, Object> validate_cars_fgs(HttpServletRequest request, @RequestParam Map<String, Object> param) {
+        HttpSession session = request.getSession();
+        List<CompanyAuthority> cmyAuths = (List<CompanyAuthority>) session.getAttribute(Constants.COMPANY_AUTHORITYS);
+
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            CarConfigInfo carConfigInfo = new CarConfigInfo(
+                    null,
+                    param.get("xl.id_eq"),
+                    param.get("xl.name_eq"),
+                    param.get("cl.id_eq")
+            );
+            carConfigInfoService.validate_cars_fgs(carConfigInfo, cmyAuths);
+            rtn.put("status", ResponseCode.SUCCESS);
+        } catch (ScheduleException exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+
+        return rtn;
+    }
+
+    @RequestMapping(value = "/validate_cars_config", method = RequestMethod.GET)
+    public Map<String, Object> validate_cars_config(@RequestParam Map<String, Object> param) {
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            CarConfigInfo carConfigInfo = new CarConfigInfo(
+                    null,
+                    param.get("xl.id_eq"),
+                    param.get("xl.name_eq"),
+                    param.get("cl.id_eq")
+            );
+            carConfigInfoService.validate_cars_config(carConfigInfo);
+            rtn.put("status", ResponseCode.SUCCESS);
+        } catch (ScheduleException exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+
+        return rtn;
+    }
 }
 package com.bsth.controller.schedule.core;
+import com.bsth.common.Constants;
 import com.bsth.common.ResponseCode;
 import com.bsth.controller.schedule.BController;
 import com.bsth.entity.schedule.EmployeeConfigInfo;
+import com.bsth.entity.sys.CompanyAuthority;
 import com.bsth.repository.schedule.EmployeeConfigInfoRepository;
 import com.bsth.service.schedule.EmployeeConfigInfoService;
 import com.bsth.service.schedule.exception.ScheduleException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -91,6 +95,54 @@ public class EmployeeConfigInfoController extends BController&lt;EmployeeConfigInfo
         return rtn;
     }
+    @RequestMapping(value = "/validate_jsy_gs", method = RequestMethod.GET)
+    public Map<String, Object> validate_jsy_gs(HttpServletRequest request, @RequestParam Map<String, Object> param) {
+        HttpSession session = request.getSession();
+        List<CompanyAuthority> cmyAuths = (List<CompanyAuthority>) session.getAttribute(Constants.COMPANY_AUTHORITYS);
+
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            EmployeeConfigInfo employeeConfigInfo = new EmployeeConfigInfo(
+                    null,
+                    param.get("xl.id_eq"),
+                    param.get("xl.name_eq"),
+                    param.get("jsy.id_eq"),
+                    null
+            );
+            employeeConfigInfoService.validate_jsy_gs(employeeConfigInfo, cmyAuths);
+            rtn.put("status", ResponseCode.SUCCESS);
+        } catch (ScheduleException exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+
+        return rtn;
+    }
+
+    @RequestMapping(value = "/validate_jsy_fgs", method = RequestMethod.GET)
+    public Map<String, Object> validate_jsy_fgs(HttpServletRequest request, @RequestParam Map<String, Object> param) {
+        HttpSession session = request.getSession();
+        List<CompanyAuthority> cmyAuths = (List<CompanyAuthority>) session.getAttribute(Constants.COMPANY_AUTHORITYS);
+
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            EmployeeConfigInfo employeeConfigInfo = new EmployeeConfigInfo(
+                    null,
+                    param.get("xl.id_eq"),
+                    param.get("xl.name_eq"),
+                    param.get("jsy.id_eq"),
+                    null
+            );
+            employeeConfigInfoService.validate_jsy_fgs(employeeConfigInfo, cmyAuths);
+            rtn.put("status", ResponseCode.SUCCESS);
+        } catch (ScheduleException exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+
+        return rtn;
+    }
+
     @RequestMapping(value = "/validate_spy", method = RequestMethod.GET)
     public Map<String, Object> validate_spy(@RequestParam Map<String, Object> param) {
         Map<String, Object> rtn = new HashMap<>();
@@ -130,4 +182,50 @@ public class EmployeeConfigInfoController extends BController&lt;EmployeeConfigInfo
         }
         return rtn;
     }
+
+    @RequestMapping(value = "/validate_spy_gs", method = RequestMethod.GET)
+    public Map<String, Object> validate_spy_gs(HttpServletRequest request, @RequestParam Map<String, Object> param) {
+        HttpSession session = request.getSession();
+        List<CompanyAuthority> cmyAuths = (List<CompanyAuthority>) session.getAttribute(Constants.COMPANY_AUTHORITYS);
+
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            EmployeeConfigInfo employeeConfigInfo = new EmployeeConfigInfo(
+                    null,
+                    param.get("xl.id_eq"),
+                    param.get("xl.name_eq"),
+                    null,
+                    param.get("spy.id_eq")
+            );
+            employeeConfigInfoService.validate_spy_gs(employeeConfigInfo, cmyAuths);
+            rtn.put("status", ResponseCode.SUCCESS);
+        } catch (ScheduleException exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+        return rtn;
+    }
+
+    @RequestMapping(value = "/validate_spy_fgs", method = RequestMethod.GET)
+    public Map<String, Object> validate_spy_fgs(HttpServletRequest request, @RequestParam Map<String, Object> param) {
+        HttpSession session = request.getSession();
+        List<CompanyAuthority> cmyAuths = (List<CompanyAuthority>) session.getAttribute(Constants.COMPANY_AUTHORITYS);
+
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            EmployeeConfigInfo employeeConfigInfo = new EmployeeConfigInfo(
+                    null,
+                    param.get("xl.id_eq"),
+                    param.get("xl.name_eq"),
+                    null,
+                    param.get("spy.id_eq")
+            );
+            employeeConfigInfoService.validate_spy_fgs(employeeConfigInfo, cmyAuths);
+            rtn.put("status", ResponseCode.SUCCESS);
+        } catch (ScheduleException exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+        return rtn;
+    }
 }
@@ -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;
+    }
+
 }
@@ -81,6 +81,7 @@ public class InStationProcess {
      * @param prev
      */
     private void inStation(GpsEntity gps, GpsEntity prev) {
+    	logger.info("进站记录(到达时间:" + gps.getArrTime() + " 进出站状态:" + gps.getInstation() + " 站点编号:" + gps.getStopNo() + " deviceId:" + gps.getDeviceId() + " nbbm:" + gps.getNbbm() + ")");
         ScheduleRealInfo sch = dayOfSchedule.executeCurr(gps.getNbbm());
         boolean flow = true;
         //要经过2个中途站才能进
@@ -120,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,6 +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() + ")");
         ScheduleRealInfo sch = dayOfSchedule.executeCurr(gps.getNbbm());
         //起点发车
@@ -397,5 +397,9 @@ public class GeoUtils {
             return true;
         }
     }
+    
+    public static void main(String args[]) {
+    	System.out.println(getDistance(new Point(121.52079, 31.189495), new Point(121.519981, 31.189695)));
+    }
 }
@@ -84,7 +84,7 @@ public class GpsDataRecovery implements ApplicationContextAware {
         Calendar calendar = Calendar.getInstance();
         int dayOfYear = calendar.get(Calendar.DAY_OF_YEAR);
-        String sql = "select DEVICE_ID,LAT,LON,TS,SPEED_GPS,LINE_ID,SERVICE_STATE,SERVER_TS from bsth_c_gps_info where days_year=39"; //+ dayOfYear;
+        String sql = "select DEVICE_ID,LAT,LON,TS,SPEED_GPS,LINE_ID,SERVICE_STATE,SERVER_TS from bsth_c_gps_info"; //+ dayOfYear;
         JdbcTemplate jdbcTemplate = new JdbcTemplate(DBUtils_MS.getDataSource());
         List<GpsEntity> list =
@@ -108,6 +108,7 @@ public class LateAdjustHandle implements ApplicationContextAware {
         try {
             if (gps.getInstation() <= 0 || null == sch)
                 return;
+            logger.info("carArrive id: " + sch.getId());
             if (!lateSchMap.containsKey(sch.getId())) {
                 //班次是否误点（可能处于误点线程扫描的空隙，所以再判定一次）
@@ -2,13 +2,10 @@ package com.bsth.data.schedule.thread;
 import com.bsth.data.directive.DayOfDirectives;
 import com.bsth.data.gpsdata_v2.handlers.overspeed.OverspeedProcess;
-import com.bsth.data.gpsdata_v2.thread.GpsDataLoaderThread;
 import com.bsth.service.calc.CalcWaybillService;
 import com.bsth.service.oil.DlbService;
-import com.bsth.data.safe_driv.SafeDrivCenter;
 import com.bsth.service.oil.YlbService;
 import com.bsth.service.report.SheetService;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -60,7 +57,7 @@ public class CalcOilThread extends Thread{
         //清除指令数据
         dayOfDirectives.clearAll();
         //清除安全驾驶数据
-        SafeDrivCenter.clear();
+        //SafeDrivCenter.clear();
         //清除超速缓存数据
         OverspeedProcess.clear();
@@ -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) {
@@ -17,7 +17,7 @@ public abstract class BaseFilter implements Filter {
 	 * 白名单
 	 */
 	private String[] whiteListURLs = { Constants.LOGIN_PAGE,Constants.CAPTCHA, Constants.SERVICE_INTERFACE,
-			Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.METRONIC_URL, Constants.LOGIN, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES, Constants.XD_REAL_GPS, Constants.UP_RFID_URL, Constants.STATION_AND_SECTION_COUNT };
+			Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.METRONIC_URL, Constants.LOGIN, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES, Constants.XD_REAL_GPS, Constants.UP_RFID_URL, Constants.STATION_AND_SECTION_COUNT,Constants.XIANDIAO_LOGIN ,Constants.IPAD_IMG_URL};
 	@Override
 	public void destroy() {
@@ -15,4 +15,10 @@ import org.springframework.stereotype.Repository;
 public interface CarDeviceRepository extends BaseRepository<CarDevice, Long> {
 	@Query(value="select s from CarDevice s where s.newDeviceNo=?1 and s.qyrq<=?2 ")
 	List<CarDevice> findCarDevice(String device,Date date );
+	
+	@Query(value="select s from CarDevice s where s.oldDeviceNo=?1 and s.qyrq>=?2 ")
+	List<CarDevice> findCarOldDevice(String device,Date date );
+	
+	@Query(value="select s from CarDevice s where s.clZbh=?1 and s.qyrq>=?2 ")
+	List<CarDevice> findCarCode(String code,Date date );
 }
@@ -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);
+
 }
@@ -10,5 +10,5 @@ import com.bsth.repository.BaseRepository;
 @Repository
 public interface ResourceRepository extends BaseRepository<Resource, Integer> {
-    List<Resource> findByRolesId(Integer roleId);
+	List<Resource> findByRolesId(Integer roleId);
 }
@@ -33,7 +33,7 @@ public class LoginInterceptor implements Filter {
 	 * 相比于 BaseFilter，此处对线调GPS请求进行了拦截验证
 	 */
 	private String[] whiteListURLs = { Constants.LOGIN_PAGE,Constants.CAPTCHA, Constants.SERVICE_INTERFACE,
-			Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.METRONIC_URL, Constants.LOGIN, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES, Constants.UP_RFID_URL,Constants.STATION_AND_SECTION_COUNT };
+			Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.METRONIC_URL, Constants.LOGIN, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES, Constants.UP_RFID_URL,Constants.STATION_AND_SECTION_COUNT,Constants.XIANDIAO_LOGIN,Constants.IPAD_IMG_URL };
 	@Override
@@ -115,7 +115,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
             //待发应到时间
             String dfsj = fmtHHmm.print(sch.getDfsjT() + (sch.getBcsj() * 60 * 1000));
             String text = "您已完成" + finish + "个班次，下一发车时间" + fmtHHmm_CN.print(sch.getDfsjT()) + "，由"
-                    + sch.getQdzName() + "发往" + sch.getZdzName() + ";应到 " + dfsj;
+                    + sch.getQdzName() + "发往" + sch.getZdzName() + ";原计划到达时间 " + dfsj;
             if(sch.getBcType().equals("venting")){
                 text += " (直放)";
@@ -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>>(){
@@ -945,11 +945,11 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 	 */
 	@Override
 	public String setSKB(String ids) {
-		String result = "failure";
+		String result = "上传失败，";
 		StringBuffer sBuffer = new StringBuffer();
 		DecimalFormat df = new DecimalFormat("######0.000");
-		Map<String,String> lsStationCode2NameMap;
-		Map<String, Integer> lsStationName2YgcNumber;
+		Map<String,String> lsStationCode2NameMap = null;
+		Map<String, Integer> lsStationName2YgcNumber = null;
 		try {
 			String[] idArray = ids.split(",");
 			StringBuffer sBufferA ,sBufferB ,sBufferC ;
@@ -965,14 +965,21 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 			sBuffer.append("<SKBs>");
 			HashMap<String,String> paramMap;
 			HashMap<String,String> otherMap = new HashMap<>();
+			// 线路编码、周几执行、发车站点名称、发车站点序号、到达站点名称、到达站点序号
+			String xlbm,zjzx,fczdmc,zdxh,ddzdmc,ddxh;
+			// 得到时刻表版本号
+			int lineVersion;
+			long ttinfoId;
+			// 是否输出站点信息
+			boolean isLogStation;
 			for (int i = 0; i < idArray.length; i++) {
-				long ttinfoId = Long.valueOf(idArray[i]);
+				ttinfoId = Long.valueOf(idArray[i]);
 				ttInfo = ttInfoRepository.findOne(ttinfoId);
 				if(ttInfo == null)
 					continue;
 				ttinfoList.add(ttInfo); // 保存时刻表
 				// 得到时刻表版本号
-				int lineVersion = ttInfo.getLineVersion();
+				lineVersion = ttInfo.getLineVersion();
 				// 查询历史站点路由
 				lsStationCode2NameMap = getLsStationCode(ttInfo.getXl().getLineCode(),lineVersion);
 				// 查询历史站点路由
@@ -988,16 +995,35 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 				param = new HashMap();
 				param.put("line.id_eq", ttInfo.getXl().getId());
 				lineInformation = lineInformationRepository.findOne(new CustomerSpecs<LineInformation>(param));
+				// 初始化
+				isLogStation = true;
 				if(ttInfoDetailIterator.hasNext()){
+					// 得到线路信息
+					Line line = lineRepository.findOne(ttInfo.getXl().getId());
+					if(line == null){
+						result += "未找到相应的线路信息，请设置线路信息后再上传";
+						return result;
+					}
+					// 得到上海市线路编码
+					xlbm = line.getShanghaiLinecode();
+					if("".equals(xlbm) || "null".equals(xlbm)){
+						result += "线路编码为空，请设置线路编码后再上传";
+						return result;
+					}
+					// 拿到周几执行
+					zjzx = changeRuleDay(ttInfo.getRule_days());
+					if("".equals(zjzx) || "null".equals(zjzx)){
+						result += "时刻表执行时间为空，请设置执行时间后再上传";
+						return result;
+					}
 					sBuffer.append("<SKB>");
-					sBuffer.append("<XLBM>").append(BasicData.lineId2ShangHaiCodeMap.get(ttInfo.getXl().getId()))
-							.append("</XLBM>");
+					sBuffer.append("<XLBM>").append(xlbm).append("</XLBM>");
 					sBufferB = new StringBuffer();
 					sBufferC = new StringBuffer();
 					sBufferB.append("<KSRQ>").append(sdfnyr.format(ttInfo.getQyrq())).append("</KSRQ>");
 					// 结束日期暂时不要，节假日的班次表才需要，如春节的班次表
 					sBufferB.append("<JSRQ>").append("").append("</JSRQ>");
-					sBufferB.append("<ZJZX>").append(changeRuleDay(ttInfo.getRule_days())).append("</ZJZX>");
+					sBufferB.append("<ZJZX>").append(zjzx).append("</ZJZX>");
 					sBufferB.append("<TBYY>").append("").append("</TBYY>");
 					sBufferB.append("<UPDT>").append(sdfnyrsfm.format(new Date())).append("</UPDT>");
 					sBufferB.append("<BCList>");
@@ -1021,22 +1047,51 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 						if(changeTimeFormat(ttInfoDetail) == null){
 							continue;
 						}
+						// 发生站点名称
+						fczdmc = lsStationCode2NameMap.get(ttInfoDetail.getXl().getLineCode()+"_"+ttInfoDetail.getXlDir()+"_"+ttInfoDetail.getQdzCode());
+						if("".equals(fczdmc) || "null".equals(fczdmc)){
+							result += "发车站点名称为空，请根据时刻表当前的版本号设置好历史站点路由再上传";
+							return result;
+						}
 						sBufferC.append("<BC>");
 						sBufferC.append("<LPBH>").append(ttInfoDetail.getLp().getLpNo()).append("</LPBH>");
 						sBufferC.append("<SXX>").append(sxx).append("</SXX>");
-						sBufferC.append("<FCZDMC>").append(lsStationCode2NameMap.get(ttInfoDetail.getXl().getLineCode()+"_"+ttInfoDetail.getXlDir()
-								+"_"+ttInfoDetail.getQdzCode())).append("</FCZDMC>");
+						sBufferC.append("<FCZDMC>").append(fczdmc).append("</FCZDMC>");
 						// 起点站的参数
 						otherMap.put("stationMark","B");
 						paramMap = packageYgcStationNumParam(ttInfoDetail,otherMap);
-						sBufferC.append("<ZDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap,lsStationName2YgcNumber)).append("</ZDXH>");
+						if(isLogStation){// 输出起点站信息
+							logger.info("setSKB:"+"起点站信息："+paramMap);
+						}
+						// 发车站点序号
+						zdxh = String.valueOf(getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap,lsStationName2YgcNumber));
+						if("".equals(zdxh) || "null".equals(zdxh) || "0".equals(zdxh)){
+							result += "发车站点序号为空，请根据时刻表当前的版本号设置好历史站点路由再上传";
+							return result;
+						}
+						// 到达站点名称
+						ddzdmc = lsStationCode2NameMap.get(ttInfoDetail.getXl().getLineCode()+"_"+ttInfoDetail.getXlDir()+"_"+ttInfoDetail.getZdzCode());
+						if("".equals(ddzdmc) || "null".equals(ddzdmc)){
+							result += "到达站点名称为空，请根据时刻表当前的版本号设置好历史站点路由再上传";
+							return result;
+						}
+						sBufferC.append("<ZDXH>").append(zdxh).append("</ZDXH>");
 						sBufferC.append("<JHFCSJ>").append(changeTimeFormat(ttInfoDetail)).append("</JHFCSJ>");
-						sBufferC.append("<DDZDMC>").append(lsStationCode2NameMap.get(ttInfoDetail.getXl().getLineCode()+"_"+ttInfoDetail.getXlDir()
-								+"_"+ttInfoDetail.getZdzCode())).append("</DDZDMC>");
-						// 起点站的参数
+						sBufferC.append("<DDZDMC>").append(ddzdmc).append("</DDZDMC>");
+						// 终点站的参数
 						otherMap.put("stationMark","E");
 						paramMap = packageYgcStationNumParam(ttInfoDetail,otherMap);
-						sBufferC.append("<DDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap,lsStationName2YgcNumber)).append("</DDXH>");
+						if(isLogStation){// 输出终点站信息
+							logger.info("setSKB:"+"终点站信息："+paramMap);
+						}
+						// 到达站点序号
+						ddxh = String.valueOf(getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap,lsStationName2YgcNumber));
+						if("".equals(ddxh) || "null".equals(ddxh) || "0".equals(ddxh)){
+							result += "到达站点序号为空，请根据时刻表当前的版本号设置好历史站点路由再上传";
+							return result;
+						}
+						isLogStation = false; // 一条线路只输出一次，后面的不输出了
+						sBufferC.append("<DDXH>").append(ddxh).append("</DDXH>");
 						sBufferC.append("<JHDDSJ>").append(calcDdsj(ttInfoDetail.getFcsj(),ttInfoDetail.getBcsj())).append("</JHDDSJ>");
 						sBufferC.append("</BC>");
 						// 0：上行；1：下行
@@ -1055,10 +1110,11 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 					sBufferA.append("<JHYYLC>").append(df.format(yylc)).append("</JHYYLC>");
 					sBuffer.append(sBufferA).append(sBufferB).append(sBufferC);
 				}
+				logger.info("setSKB:"+"ttinfoId:"+ttinfoId+";当前站点版本号："+lineVersion+"；查询历史站点路由:"+lsStationCode2NameMap+";查询历史站点编号:"+lsStationName2YgcNumber);
 			}
 			sBuffer.append("</SKBs>");
 			if(ssop.setSKB(userNameOther, passwordOther, sBuffer.toString()).isSuccess()){
-				result = "success";
+				result = "上传成功";
 				SKBUploadLogger skbUploadLogger ;
 				SysUser user = SecurityUtils.getCurrentUser();
 				// 保存时刻表上传记录
@@ -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);
@@ -1210,34 +1218,73 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         }
         String device = "";
+        String device2 ="";
+        long qyrqTime=0l;
         if (!code.equals("")) {
-            device = BasicData.deviceId2NbbmMap.inverse().get(code);
+        	try {
+				List<CarDevice> deviceList=carDeviceRepository.findCarCode(code, sdf.parse(date+ " 00:00:00"));
+				if(deviceList.size()>0){
+					device=deviceList.get(0).getOldDeviceNo();
+					Date qyrq=deviceList.get(0).getQyrq();
+					qyrqTime=qyrq.getTime();
+					if(qyrqTime<t){
+						device2=deviceList.get(0).getNewDeviceNo();
+					}
+				}else{
+		            device = BasicData.deviceId2NbbmMap.inverse().get(code);
+				}
+			} catch (ParseException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
         }
-        List<Object[]> list = scheduleRealInfoRepository.historyMessage(line, d, t, device);
-        for (Object[] obj : list) {
+        List<Object[]> list=new ArrayList<Object[]>();
+        
+        List<Object[]> list0 =scheduleRealInfoRepository.historyMessage(line, d, t, device);
+        for (Object[] obj : list0) {
             if (obj != null) {
-
-                if (BasicData.deviceId2NbbmMap.get(obj[0].toString()) == null) {
-                    List<CarDevice> carDeviceList = new ArrayList<CarDevice>();
-                    try {
-                        carDeviceList = carDeviceRepository.findCarDevice(obj[0].toString(), new Date(Long.parseLong(obj[3].toString())));
-                    } catch (Exception e) {
-                        // TODO Auto-generated catch block
-                        e.printStackTrace();
-                    }
-                    if (carDeviceList.size() > 0) {
-                        obj[0] = carDeviceList.get(0).getClZbh();
+            	if(code.equals("")){
+            		if (BasicData.deviceId2NbbmMap.get(obj[0].toString()) == null) {
+                        List<CarDevice> carDeviceList = new ArrayList<CarDevice>();
+                        try {
+                                carDeviceList = carDeviceRepository.findCarDevice(obj[0].toString(), new Date(Long.parseLong(obj[3].toString())));
+                                //启用日期大于营运日期 还是根据旧设备号查询
+                                if(carDeviceList.size()==0){
+                                   carDeviceList = carDeviceRepository.findCarOldDevice(obj[0].toString(), new Date(Long.parseLong(obj[3].toString())));
+                                }
+                        } catch (Exception e) {
+                            // TODO Auto-generated catch block
+                            e.printStackTrace();
+                        }
+                        if (carDeviceList.size() > 0) {
+                            obj[0] = carDeviceList.get(0).getClZbh();
+                        } else {
+                            obj[0] = BasicData.deviceId2NbbmMap.get(obj[0].toString());
+                        }
                     } else {
                         obj[0] = BasicData.deviceId2NbbmMap.get(obj[0].toString());
                     }
-                } else {
-                    obj[0] = BasicData.deviceId2NbbmMap.get(obj[0].toString());
-                }
+            	}else{
+            		obj[0]=code;
+            	}
+                
                 obj[3] = sdf.format(new Date(Long.parseLong(obj[3].toString())));
                 obj[4] = BasicData.lineCode2NameMap.get(line);
             }
         }
-
+        list.addAll(list0);
+        if(!device2.equals("")){
+        	List<Object[]> list1 =scheduleRealInfoRepository.historyMessage(line, d, t, device2);
+            for (Object[] obj : list1) {
+                if (obj != null) {
+                	obj[0] =code;
+                    obj[3] = sdf.format(new Date(Long.parseLong(obj[3].toString())));
+                    obj[4] = BasicData.lineCode2NameMap.get(line);
+                }
+            }
+            list.addAll(list1);
+        }
+        
         if (type != null && type.length() != 0 && type.equals("export")) {
             String lineName = BasicData.lineCode2NameMap.get(line);
             SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
@@ -3213,6 +3260,63 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         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);
+        }
+        List<ScheduleRealInfo> listInfo2=new ArrayList<ScheduleRealInfo>();
+        listInfo2.addAll(listInfo);
+        Collections.sort(listInfo, new compareLpFcsjType());
+        System.out.println(listInfo);
+        Collections.sort(listInfo2,new compareDirLpFcsjType());
         for (int i = 0; i < listInfo.size(); i++) {
             ScheduleRealInfo t = listInfo.get(i);
             if (!lpName.equals(t.getLpName())) {
@@ -3231,8 +3335,44 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             lpName = t.getLpName();
             list.add(t);
         }
-
+/*
         List<ScheduleRealInfo> listInfo2 = scheduleRealInfoRepository.scheduleDdrb2(line, date);
+        for (int i = 0; i < listInfo2.size(); i++) {
+        	 ScheduleRealInfo s = listInfo2.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);
+		}*/
         List<ScheduleRealInfo> xList = new ArrayList<ScheduleRealInfo>();
         List<ScheduleRealInfo> yList = new ArrayList<ScheduleRealInfo>();
         List<ScheduleRealInfo> zList = new ArrayList<ScheduleRealInfo>();
@@ -3301,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";
@@ -4658,13 +4987,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"));
@@ -4792,7 +5126,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() : "";
@@ -4819,7 +5153,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++;
@@ -5631,6 +5965,23 @@ class AccountXlbm implements Comparator&lt;Map&lt;String, Object&gt;&gt; {
     }
 }
+class compareLpFcsjType implements Comparator<ScheduleRealInfo> {
+    @Override
+    public int compare(ScheduleRealInfo o1, ScheduleRealInfo o2) {
+        // TODO Auto-generated method stub
+        return (o1.getLpName()+o1.getFcsjT() + o1.getRemark()).compareTo(o2.getLpName()+o2.getFcsjT() + o2.getRemark());
+    }
+
+}
+
+class compareDirLpFcsjType implements Comparator<ScheduleRealInfo> {
+    @Override
+    public int compare(ScheduleRealInfo o1, ScheduleRealInfo o2) {
+        // TODO Auto-generated method stub
+        return (o1.getXlDir()+o1.getFcsjT() + o1.getRemark()+o1.getLpName()).compareTo(o2.getXlDir()+o2.getFcsjT() + o2.getRemark()+o2.getLpName());
+    }
+
+}
 class compareFcsjType implements Comparator<ScheduleRealInfo> {
     @Override
     public int compare(ScheduleRealInfo o1, ScheduleRealInfo o2) {
@@ -863,6 +863,8 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
             if (sch.isSflj())
                 continue;
             cts = sch.getcTasks();
+           if(isInOut(sch))
+                continue;
             //有子任务
             if (cts != null && cts.size() > 0) {
                 for(ChildTaskPlan c : cts){
@@ -881,8 +883,7 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
                 	}
                 }
             }
-            else if(isInOut(sch))
-                continue;
+           
             //主任务烂班
             else if(sch.getStatus() == -1 && !sch.isCcService()){
                 if(sch.getAdjustExps().equals(item) ||
@@ -1825,7 +1825,7 @@ public class ReportServiceImpl implements ReportService{
 					newMap.put("dz", scheduleRealInfo.getQdzName());
 					newMap.put("sj", scheduleRealInfo.getFcsj());
 					newMap.put("ljlc", scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc());
-					newMap.put("jyqp", scheduleRealInfo.getRealMileage()==null?"":scheduleRealInfo.getRealMileage());
+					newMap.put("jyqp", scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks());
 					list.add(newMap);
 				}
 //				}else{
 package com.bsth.service.schedule;
 import com.bsth.entity.schedule.CarConfigInfo;
+import com.bsth.entity.sys.CompanyAuthority;
 import com.bsth.service.schedule.exception.ScheduleException;
+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;
+    // 判定车辆所属公司和当前用户的所属公司
+    void validate_cars_gs(CarConfigInfo carConfigInfo, List<CompanyAuthority> companyAuthorityList) throws ScheduleException;
+    // 判定车辆所属分公司和当前用户的所属分公司
+    void validate_cars_fgs(CarConfigInfo carConfigInfo, List<CompanyAuthority> companyAuthorityList) throws ScheduleException;
     void toggleCancel(Long id) throws ScheduleException;
+
+
 }
 package com.bsth.service.schedule;
 import com.bsth.entity.schedule.EmployeeConfigInfo;
+import com.bsth.entity.sys.CompanyAuthority;
 import com.bsth.service.schedule.exception.ScheduleException;
+import java.util.List;
+
 /**
  * Created by xu on 16/5/10.
  */
@@ -13,8 +16,17 @@ public interface EmployeeConfigInfoService extends BService&lt;EmployeeConfigInfo, 
     void validate_spy(EmployeeConfigInfo employeeConfigInfo) throws ScheduleException;
     // 验证驾驶员是否配置在指定线路
     void validate_jsy_config(EmployeeConfigInfo employeeConfigInfo) throws ScheduleException;
+    // 判定驾驶员所属公司和当前用户的所属公司
+    void validate_jsy_gs(EmployeeConfigInfo employeeConfigInfo, List<CompanyAuthority> companyAuthorityList) throws ScheduleException;
+    // 判定驾驶员所属分公司和当前用户的所属分公司
+    void validate_jsy_fgs(EmployeeConfigInfo employeeConfigInfo, List<CompanyAuthority> companyAuthorityList) throws ScheduleException;
     // 验证售票员是否配置在指定线路
     void validate_spy_config(EmployeeConfigInfo employeeConfigInfo) throws ScheduleException;
+    // 判定驾驶员所属公司和当前用户的所属公司
+    void validate_spy_gs(EmployeeConfigInfo employeeConfigInfo, List<CompanyAuthority> companyAuthorityList) throws ScheduleException;
+    // 判定驾驶员所属分公司和当前用户的所属分公司
+    void validate_spy_fgs(EmployeeConfigInfo employeeConfigInfo, List<CompanyAuthority> companyAuthorityList) throws ScheduleException;
+
     void toggleCancel(Long id) throws ScheduleException;
     Long getMaxDbbm(Integer xlId);
 }
 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
 package com.bsth.service.schedule.impl;
+import com.bsth.entity.Cars;
 import com.bsth.entity.schedule.CarConfigInfo;
 import com.bsth.entity.schedule.rule.ScheduleRule1Flat;
+import com.bsth.entity.sys.CompanyAuthority;
 import com.bsth.service.schedule.CarConfigInfoService;
+import com.bsth.service.schedule.CarsService;
 import com.bsth.service.schedule.ScheduleRule1FlatService;
 import com.bsth.service.schedule.exception.ScheduleException;
 import com.bsth.service.schedule.utils.DataToolsFile;
@@ -25,6 +28,8 @@ import java.util.Map;
 public class CarConfigInfoServiceImpl extends BServiceImpl<CarConfigInfo, Long> implements CarConfigInfoService {
     @Autowired
     private ScheduleRule1FlatService scheduleRule1FlatService;
+    @Autowired
+    private CarsService carsService;
     @Autowired
     @Qualifier(value = "carConfig_dataTool")
@@ -45,6 +50,57 @@ public class CarConfigInfoServiceImpl extends BServiceImpl&lt;CarConfigInfo, Long&gt; 
         return dataToolsService.exportData(params);
     }
+    @Override
+    public void validate_cars_gs(CarConfigInfo carConfigInfo, List<CompanyAuthority> companyAuthorityList) throws ScheduleException {
+        if (CollectionUtils.isEmpty(companyAuthorityList)) {
+            throw new ScheduleException("当前用户没有公司权限！");
+        }
+
+        boolean isFind = false;
+        Cars cars = carsService.findById(carConfigInfo.getCl().getId());
+        for (CompanyAuthority companyAuthority : companyAuthorityList) {
+            if (companyAuthority.getCompanyCode().equals(cars.getBusinessCode())) {
+                isFind = true;
+                break;
+            }
+        }
+        if (!isFind) {
+            throw new ScheduleException("当前车辆不在用户所属公司中！");
+        }
+    }
+
+    @Override
+    public void validate_cars_fgs(CarConfigInfo carConfigInfo, List<CompanyAuthority> companyAuthorityList) throws ScheduleException {
+        if (CollectionUtils.isEmpty(companyAuthorityList)) {
+            throw new ScheduleException("当前用户没有分公司权限！");
+        }
+
+        boolean isFind = false;
+        Cars cars = carsService.findById(carConfigInfo.getCl().getId());
+        for (CompanyAuthority companyAuthority : companyAuthorityList) {
+            if (companyAuthority.getCompanyCode().equals(cars.getBusinessCode())) {
+                isFind = true;
+                break;
+            }
+        }
+        if (!isFind) {
+            // 如果没有公司权限，验证通过
+            return;
+        }
+
+        isFind = false;
+        for (CompanyAuthority companyAuthority : companyAuthorityList) {
+            if (companyAuthority.getCompanyCode().equals(cars.getBusinessCode()) &&
+                    companyAuthority.getSubCompanyCode().equals(cars.getBrancheCompanyCode())) {
+                isFind = true;
+                break;
+            }
+        }
+        if (!isFind) {
+            throw new ScheduleException("当前车辆不在用户所属分公司中！");
+        }
+    }
+
     @Transactional
     public void validate_cars(CarConfigInfo carConfigInfo) throws ScheduleException {
         // 相同车辆不能同时配置
@@ -73,6 +129,29 @@ 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());
+        param.put("cl.id_eq", carConfigInfo.getCl().getId());
+        List<CarConfigInfo> carConfigInfos = list(param);
+        if (CollectionUtils.isEmpty(carConfigInfos)) {
+            throw new ScheduleException("当前车辆没有配置在当前线路中，不属于当前线路！");
+        }
+    }
+
     @Transactional
     @Override
     public void delete(Long aLong) throws ScheduleException {
@@ -12,6 +12,7 @@ import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -29,6 +30,8 @@ public class CarDeviceServiceImpl extends BServiceImpl&lt;CarDevice, Long&gt; implemen
         // 查找对应的车辆基础信息，更新设备编号数据
         Cars cars = carsService.findById(carDevice.getCl());
         cars.setEquipmentCode(carDevice.getNewDeviceNo());
+        // 设备启用日期使用后台日期
+        carDevice.setQyrq(new Date());
         return super.save(carDevice);
     }
 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.Personnel;
 import com.bsth.entity.schedule.EmployeeConfigInfo;
 import com.bsth.entity.schedule.rule.ScheduleRule1Flat;
+import com.bsth.entity.sys.CompanyAuthority;
 import com.bsth.service.schedule.EmployeeConfigInfoService;
+import com.bsth.service.schedule.EmployeeService;
 import com.bsth.service.schedule.ScheduleRule1FlatService;
 import com.bsth.service.schedule.exception.ScheduleException;
 import com.bsth.service.schedule.utils.DataToolsFile;
@@ -28,6 +31,8 @@ import java.util.*;
 public class EmployeeConfigInfoServiceImpl extends BServiceImpl<EmployeeConfigInfo, Long> implements EmployeeConfigInfoService {
     @Autowired
     private ScheduleRule1FlatService scheduleRule1FlatService;
+    @Autowired
+    private EmployeeService employeeService;
     @Autowired
     @Qualifier(value = "employeeConfig_dataTool")
@@ -110,6 +115,57 @@ public class EmployeeConfigInfoServiceImpl extends BServiceImpl&lt;EmployeeConfigIn
         }
     }
+    @Override
+    public void validate_jsy_gs(EmployeeConfigInfo employeeConfigInfo, List<CompanyAuthority> companyAuthorityList) throws ScheduleException {
+        if (CollectionUtils.isEmpty(companyAuthorityList)) {
+            throw new ScheduleException("当前用户没有公司权限！");
+        }
+
+        boolean isFind = false;
+        Personnel personnel = employeeService.findById(employeeConfigInfo.getJsy().getId());
+        for (CompanyAuthority companyAuthority : companyAuthorityList) {
+            if (companyAuthority.getCompanyCode().equals(personnel.getCompanyCode())) {
+                isFind = true;
+                break;
+            }
+        }
+        if (!isFind) {
+            throw new ScheduleException("当前驾驶员不在用户所属公司中！");
+        }
+    }
+
+    @Override
+    public void validate_jsy_fgs(EmployeeConfigInfo employeeConfigInfo, List<CompanyAuthority> companyAuthorityList) throws ScheduleException {
+        if (CollectionUtils.isEmpty(companyAuthorityList)) {
+            throw new ScheduleException("当前用户没有分公司权限！");
+        }
+
+        boolean isFind = false;
+        Personnel personnel = employeeService.findById(employeeConfigInfo.getJsy().getId());
+        for (CompanyAuthority companyAuthority : companyAuthorityList) {
+            if (companyAuthority.getCompanyCode().equals(personnel.getCompanyCode())) {
+                isFind = true;
+                break;
+            }
+        }
+        if (!isFind) {
+            // 如果没有公司权限，验证通过
+            return;
+        }
+
+        isFind = false;
+        for (CompanyAuthority companyAuthority : companyAuthorityList) {
+            if (companyAuthority.getCompanyCode().equals(personnel.getCompanyCode()) &&
+                    companyAuthority.getSubCompanyCode().equals(personnel.getBrancheCompanyCode())) {
+                isFind = true;
+                break;
+            }
+        }
+        if (!isFind) {
+            throw new ScheduleException("当前驾驶员不在用户所属分公司中！");
+        }
+    }
+
     @Transactional
     @Override
     public void validate_spy(EmployeeConfigInfo employeeConfigInfo) throws ScheduleException {
@@ -137,6 +193,57 @@ public class EmployeeConfigInfoServiceImpl extends BServiceImpl&lt;EmployeeConfigIn
         }
     }
+    @Override
+    public void validate_spy_gs(EmployeeConfigInfo employeeConfigInfo, List<CompanyAuthority> companyAuthorityList) throws ScheduleException {
+        if (CollectionUtils.isEmpty(companyAuthorityList)) {
+            throw new ScheduleException("当前用户没有公司权限！");
+        }
+
+        boolean isFind = false;
+        Personnel personnel = employeeService.findById(employeeConfigInfo.getSpy().getId());
+        for (CompanyAuthority companyAuthority : companyAuthorityList) {
+            if (companyAuthority.getCompanyCode().equals(personnel.getCompanyCode())) {
+                isFind = true;
+                break;
+            }
+        }
+        if (!isFind) {
+            throw new ScheduleException("当前售票员不在用户所属公司中！");
+        }
+    }
+
+    @Override
+    public void validate_spy_fgs(EmployeeConfigInfo employeeConfigInfo, List<CompanyAuthority> companyAuthorityList) throws ScheduleException {
+        if (CollectionUtils.isEmpty(companyAuthorityList)) {
+            throw new ScheduleException("当前用户没有分公司权限！");
+        }
+
+        boolean isFind = false;
+        Personnel personnel = employeeService.findById(employeeConfigInfo.getSpy().getId());
+        for (CompanyAuthority companyAuthority : companyAuthorityList) {
+            if (companyAuthority.getCompanyCode().equals(personnel.getCompanyCode())) {
+                isFind = true;
+                break;
+            }
+        }
+        if (!isFind) {
+            // 如果没有公司权限，验证通过
+            return;
+        }
+
+        isFind = false;
+        for (CompanyAuthority companyAuthority : companyAuthorityList) {
+            if (companyAuthority.getCompanyCode().equals(personnel.getCompanyCode()) &&
+                    companyAuthority.getSubCompanyCode().equals(personnel.getBrancheCompanyCode())) {
+                isFind = true;
+                break;
+            }
+        }
+        if (!isFind) {
+            throw new ScheduleException("当前售票员不在用户所属分公司中！");
+        }
+    }
+
     @Transactional
     @Override
     public void validate_spy_config(EmployeeConfigInfo employeeConfigInfo) throws ScheduleException {
 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;
-
-import com.bsth.entity.schedule.SchedulePlanInfo;
-import com.bsth.service.schedule.rules.ttinfo.LpInfoResult_output;
-import org.kie.api.runtime.rule.AccumulateFunction;
-
-import java.io.*;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-/**
- * 计算缺少路牌错误。
- * 同一天，如果有时刻表路牌没有执行到，统计。
- * 注意：使用这个函数时，要一天计算一次，多天计算无意义。
- */
-public class ValidWantLpFunction implements AccumulateFunction {
-    @Override
-    public void writeExternal(ObjectOutput out) throws IOException {
-    }
-
-    @Override
-    public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
-
-    }
-
-    protected static class WantLpInfo implements Externalizable {
-        /** 错误描述 */
-        public List<ValidateResults_output.ValidInfo> validInfoList = new ArrayList<>();
-        /** 每天的路牌班次数量 */
-        public Map<String, Integer> lpBcCount = new HashMap<>();
-        /** 每天的路牌名字对应 */
-        public Map<String, String> lpNamesMap = new HashMap<>();
-        /** 排班日期 */
-        public Date scheduleDate;
-
-        public WantLpInfo() {
-
-        }
-
-        @Override
-        public void writeExternal(ObjectOutput out) throws IOException {
-            out.writeObject(validInfoList);
-        }
-
-        @Override
-        public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
-            validInfoList = (List<ValidateResults_output.ValidInfo>) in.readObject();
-        }
-    }
-
-    @Override
-    public Serializable createContext() {
-        return new WantLpInfo();
-    }
-
-    @Override
-    public void init(Serializable serializable) throws Exception {
-        // TODO：
-//        System.out.println("init");
-    }
-
-    @Override
-    public void accumulate(Serializable context, Object o) {
-        WantLpInfo wantLpInfo = (WantLpInfo) context;
-        ValidateResource validateResource = (ValidateResource) o;
-
-        SchedulePlanInfo spi = validateResource.getSpi();
-        List<LpInfoResult_output> lpiList = validateResource.getLpiList();
-
-        // 获取当天所有路牌信息，每个验证对象都带当天所有路牌信息，只需判定一次
-        if (wantLpInfo.lpNamesMap.isEmpty()) {
-            for (LpInfoResult_output lpInfoResult_output: lpiList) {
-                wantLpInfo.lpNamesMap.put(lpInfoResult_output.getLpId(), lpInfoResult_output.getLpName());
-                wantLpInfo.lpBcCount.put(lpInfoResult_output.getLpId(), 0);
-            }
-        }
-        if (wantLpInfo.scheduleDate == null) {
-            wantLpInfo.scheduleDate = spi.getScheduleDate();
-        }
-
-        // 累计记录每个排班班次出现次数
-        String lpId_spi = spi.getLp().toString();
-        wantLpInfo.lpBcCount.put(lpId_spi, wantLpInfo.lpBcCount.get(lpId_spi) + 1);
-
-    }
-
-    @Override
-    public boolean supportsReverse() {
-        return true;
-    }
-
-    @Override
-    public void reverse(Serializable context, Object o) throws Exception {
-        WantLpInfo wantLpInfo = (WantLpInfo) context;
-
-        // 清空数据，下一天继续迭代
-        wantLpInfo.lpBcCount.clear();
-        wantLpInfo.lpNamesMap.clear();
-        wantLpInfo.scheduleDate = null;
-        wantLpInfo.validInfoList.clear();
-
-//        System.out.println("reverse");
-
-    }
-
-    @Override
-    public Class<?> getResultType() {
-        return List.class;
-    }
-
-    @Override
-    public Object getResult(Serializable context) throws Exception {
-        WantLpInfo wantLpInfo = (WantLpInfo) context;
-
-        SimpleDateFormat sf = new SimpleDateFormat("yyyy年MM月dd日");
-        String infoFormat = "日期(%s),路牌(%s),没有排班班次";
-
-        for (String lpId : wantLpInfo.lpBcCount.keySet()) {
-            if (wantLpInfo.lpBcCount.get(lpId) == 0) {
-                // 排班没有班次
-                ValidateResults_output.ValidInfo validInfo = new ValidateResults_output.ValidInfo();
-                validInfo.setSd(wantLpInfo.scheduleDate);
-                validInfo.setDesc(String.format(
-                        infoFormat,
-                        sf.format(wantLpInfo.scheduleDate),
-                        wantLpInfo.lpNamesMap.get(lpId))
-                );
-                wantLpInfo.validInfoList.add(validInfo);
-            }
-        }
-
-        System.out.println("ValidWantLpFunction==>" + wantLpInfo.lpBcCount);
-
-        return wantLpInfo.validInfoList;
-    }
-
-}
-
-
-
-
-
-
-
-
+package com.bsth.service.schedule.impl.plan.kBase1.core.validate;
+
+import com.bsth.entity.schedule.SchedulePlanInfo;
+import com.bsth.service.schedule.impl.plan.kBase1.core.ttinfo.LpInfoResult_output;
+import org.kie.api.runtime.rule.AccumulateFunction;
+
+import java.io.*;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+/**
+ * 计算缺少路牌错误。
+ * 同一天，如果有时刻表路牌没有执行到，统计。
+ * 注意：使用这个函数时，要一天计算一次，多天计算无意义。
+ */
+public class ValidWantLpFunction implements AccumulateFunction {
+    @Override
+    public void writeExternal(ObjectOutput out) throws IOException {
+    }
+
+    @Override
+    public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+
+    }
+
+    protected static class WantLpInfo implements Externalizable {
+        /** 错误描述 */
+        public List<ValidateResults_output.ValidInfo> validInfoList = new ArrayList<>();
+        /** 每天的路牌班次数量 */
+        public Map<String, Integer> lpBcCount = new HashMap<>();
+        /** 每天的路牌名字对应 */
+        public Map<String, String> lpNamesMap = new HashMap<>();
+        /** 排班日期 */
+        public Date scheduleDate;
+
+        public WantLpInfo() {
+
+        }
+
+        @Override
+        public void writeExternal(ObjectOutput out) throws IOException {
+            out.writeObject(validInfoList);
+        }
+
+        @Override
+        public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+            validInfoList = (List<ValidateResults_output.ValidInfo>) in.readObject();
+        }
+    }
+
+    @Override
+    public Serializable createContext() {
+        return new WantLpInfo();
+    }
+
+    @Override
+    public void init(Serializable serializable) throws Exception {
+        // TODO：
+//        System.out.println("init");
+    }
+
+    @Override
+    public void accumulate(Serializable context, Object o) {
+        WantLpInfo wantLpInfo = (WantLpInfo) context;
+        ValidateResource validateResource = (ValidateResource) o;
+
+        SchedulePlanInfo spi = validateResource.getSpi();
+        List<LpInfoResult_output> lpiList = validateResource.getLpiList();
+
+        // 获取当天所有路牌信息，每个验证对象都带当天所有路牌信息，只需判定一次
+        if (wantLpInfo.lpNamesMap.isEmpty()) {
+            for (LpInfoResult_output lpInfoResult_output: lpiList) {
+                wantLpInfo.lpNamesMap.put(lpInfoResult_output.getLpId(), lpInfoResult_output.getLpName());
+                wantLpInfo.lpBcCount.put(lpInfoResult_output.getLpId(), 0);
+            }
+        }
+        if (wantLpInfo.scheduleDate == null) {
+            wantLpInfo.scheduleDate = spi.getScheduleDate();
+        }
+
+        // 累计记录每个排班班次出现次数
+        String lpId_spi = spi.getLp().toString();
+        wantLpInfo.lpBcCount.put(lpId_spi, wantLpInfo.lpBcCount.get(lpId_spi) + 1);
+
+    }
+
+    @Override
+    public boolean supportsReverse() {
+        return true;
+    }
+
+    @Override
+    public void reverse(Serializable context, Object o) throws Exception {
+        WantLpInfo wantLpInfo = (WantLpInfo) context;
+
+        // 清空数据，下一天继续迭代
+        wantLpInfo.lpBcCount.clear();
+        wantLpInfo.lpNamesMap.clear();
+        wantLpInfo.scheduleDate = null;
+        wantLpInfo.validInfoList.clear();
+
+//        System.out.println("reverse");
+
+    }
+
+    @Override
+    public Class<?> getResultType() {
+        return List.class;
+    }
+
+    @Override
+    public Object getResult(Serializable context) throws Exception {
+        WantLpInfo wantLpInfo = (WantLpInfo) context;
+
+        SimpleDateFormat sf = new SimpleDateFormat("yyyy年MM月dd日");
+        String infoFormat = "日期(%s),路牌(%s),没有排班班次";
+
+        for (String lpId : wantLpInfo.lpBcCount.keySet()) {
+            if (wantLpInfo.lpBcCount.get(lpId) == 0) {
+                // 排班没有班次
+                ValidateResults_output.ValidInfo validInfo = new ValidateResults_output.ValidInfo();
+                validInfo.setSd(wantLpInfo.scheduleDate);
+                validInfo.setDesc(String.format(
+                        infoFormat,
+                        sf.format(wantLpInfo.scheduleDate),
+                        wantLpInfo.lpNamesMap.get(lpId))
+                );
+                wantLpInfo.validInfoList.add(validInfo);
+            }
+        }
+
+        System.out.println("ValidWantLpFunction==>" + wantLpInfo.lpBcCount);
+
+        return wantLpInfo.validInfoList;
+    }
+
+}
+
+
+
+
+
+
+
+
-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;
-
-import com.bsth.entity.schedule.SchedulePlanInfo;
-import com.bsth.service.schedule.rules.ttinfo.LpInfoResult_output;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * 验证操作dsl类。
- */
-public class ValidateResource {
-    /** 具体日期 */
-    private Date sd;
-    /** 当天排班计划 */
-    private SchedulePlanInfo spi;
-    /** 当天所有路牌信息 */
-    private List<LpInfoResult_output> lpiList;
-
-    public Date getSd() {
-        return sd;
-    }
-
-    public void setSd(Date sd) {
-        this.sd = sd;
-    }
-
-    public SchedulePlanInfo getSpi() {
-        return spi;
-    }
-
-    public void setSpi(SchedulePlanInfo spi) {
-        this.spi = spi;
-    }
-
-    public List<LpInfoResult_output> getLpiList() {
-        return lpiList;
-    }
-
-    public void setLpiList(List<LpInfoResult_output> lpiList) {
-        this.lpiList = lpiList;
-    }
-}
+package com.bsth.service.schedule.impl.plan.kBase1.core.validate;
+
+import com.bsth.entity.schedule.SchedulePlanInfo;
+import com.bsth.service.schedule.impl.plan.kBase1.core.ttinfo.LpInfoResult_output;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 验证操作dsl类。
+ */
+public class ValidateResource {
+    /** 具体日期 */
+    private Date sd;
+    /** 当天排班计划 */
+    private SchedulePlanInfo spi;
+    /** 当天所有路牌信息 */
+    private List<LpInfoResult_output> lpiList;
+
+    public Date getSd() {
+        return sd;
+    }
+
+    public void setSd(Date sd) {
+        this.sd = sd;
+    }
+
+    public SchedulePlanInfo getSpi() {
+        return spi;
+    }
+
+    public void setSpi(SchedulePlanInfo spi) {
+        this.spi = spi;
+    }
+
+    public List<LpInfoResult_output> getLpiList() {
+        return lpiList;
+    }
+
+    public void setLpiList(List<LpInfoResult_output> lpiList) {
+        this.lpiList = lpiList;
+    }
+}
-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;
+        }
     }
 }
@@ -8,6 +8,6 @@ import com.bsth.service.BaseService;
 public interface RoleService extends BaseService<Role, Integer>{
 	Map<String, Object> settRoleModules(Integer roleId, String mIds);
-
+	
 	Map<String, Object> roleInfo(Integer id);
 }
@@ -33,7 +33,7 @@ public class RoleServiceImpl extends BaseServiceImpl&lt;Role, Integer&gt; implements
 	@Autowired
 	ModuleRepository moduleRepository;
-
+	
 	SimpleDateFormat sdfMinute = new SimpleDateFormat("yyyy-MM-dd HH:mm");
 	@Override
@@ -26,4 +26,4 @@ spring.datasource.validation-query=select 1
 ## gateway real data
 http.gps.real.url= http://192.168.40.82:8080/transport_server/rtgps/
 ## gateway send directive
-http.send.directive = http://192.168.40.82:8080/transport_server/message/
 \ No newline at end of file
+http.send.directive = http://192.168.40.82:8080/transport_server/message/
@@ -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
@@ -57,7 +57,11 @@ function ajaxComplete(xhr, ts, succ){
 		successHandle(JSON.parse(xhr.responseText), succ);
 	}
 	else if(ts == 'error'){
-		layer.alert(xhr.responseText, {icon: 2, title: '操作失败'});
+		//添加自动跳转首页
+		layer.alert(xhr.responseText + '<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span id="goIndex" style="color: #ff1f08;font-weight: bold;font-size: large;">1</span> 秒后回到首页', {icon: 2, title: '操作失败'});
+		setTimeout(function(){
+            window.location.href = '/';
+		},1500)
 	}
 }
@@ -287,7 +287,7 @@
 	</div>
 	<div class="page-content-wrapper">
 		<div id="pjax-container" class="page-content"></div>
-
+		<a name="xd_position"></a>
 		<div id="route-container">
 			<div ng-app="ScheduleApp">
 				<div ng-controller="ScheduleAppController">
@@ -339,9 +339,9 @@
 </script>
 <script>
-	delete window.require;
-	delete window.exports;
-	delete window.module;
+    delete window.require;
+    delete window.exports;
+    delete window.module;
 </script>
 <!-- jQuery -->
 <script src="/metronic_v4.5.4/plugins/jquery.min.js" data-exclude=1></script>
@@ -415,145 +415,145 @@
 <!-- tipso JS -->
 <script src="/metronic_v4.5.4/plugins/tipso/js/tipso.js"></script>
 <script data-exclude=1>
-	//初始打开的片段地址
-	var initFragment = "^_^initFragment^_^";
-	//静态文件目录
-	var dir = '/pages/';
-	//片段容器
-	var pjaxContainer = '#pjax-container'
-			, angJsContainer = '#route-container';
-
-	$(document).ajaxError(function (event, jqxhr, settings, thrownError) {
-		if(jqxhr.status == 403){
-			layer.closeAll();
-			layer.alert(jqxhr.message?jqxhr.message:'访问被拒绝', {icon: 2, title: '操作失败'});
-		}
-	});
-
-	$(function () {
-		$.get('/user/currentUser', function (user) {
-			$('#indexTopUName').text(user.userName);
-		});
-
-		//带 data-pjax 的链接由pjax加载
-		$(document).pjax('a[data-pjax]', pjaxContainer);
-
-		//pjax左菜单点击事件
-		$(document).on('click', '#leftMenuSidebar a[data-pjax]', function () {
-			setTitle(this);
-
-			$('#leftMenuSidebar li.nav-item.active').removeClass('active');
-			$(this).parent().addClass('active');
-			showPjax();
-		});
-
-		//angularjs左菜单点击事件
-		$(document).on('click', '#leftMenuSidebar a[data-angularjs]', function () {
-			setTitle(this);
-
-			$('#leftMenuSidebar li.nav-item.active').removeClass('active');
-			$(this).parent().addClass('active');
-			showAngJs();
-		});
-
-		//加载左菜单栏
-		$get('/module/findByCurrentUser', null,
-				function (ms) {
-					var treeArray = createTreeData(ms);
-					treeArray.sort(function (a, b) {
-						return a.createDate - b.createDate;
-					});
-					var menuHtml = template('menu_list_temp', {list: treeArray});
-					$('#leftMenuSidebar').html(menuHtml);
-
-					//----------- 检查URL ----------------
-					var h = location.hash;
-					if (initFragment && initFragment != '') {
-						showPjax();
-						//普通片段
-						loadPage(initFragment);
-						//选中菜单
-						$.each($('#leftMenuSidebar a'), function (i, item) {
-							if (urlPattern($(item).attr('href'), initFragment)) {
-								activeLeftMenu(item);
-							}
-						});
-					} else if (h) {
-						//angularjs片段
-						showAngJs();
-						//选中菜单
-						$.each($('#leftMenuSidebar a'), function (i, item) {
-							if ($(item).attr('href') == h) {
-								activeLeftMenu(item);
-							}
-						});
-					}
-					else {
-						//加载主页
-						loadPage('/pages/home.html');
-					}
-				});
-
-		//修改密码
-		$('#changePWD').on('click', function () {
-			$.get('/pages/permission/user/changePWD.html', function (content) {
-				layer.open({
-					type: 1,
-					area: ['600px', '360px'],
-					content: content,
-					title: '修改密码',
-					shift: 5,
-					scrollbar: false,
-					success: function () {
-					}
-				});
-			});
-		});
-	});
-
-	//modal关闭时销毁dom
-	$(document).on('hidden.bs.modal', '.modal', function () {
-		$(this).remove();
-	});
-
-	//pjax加载完成事件
-	$(document).on('pjax:success', function () {
-		var dicts = $(pjaxContainer).find('.nt-dictionary');
-		dictionaryUtils.transformDom(dicts);
-	});
-
-	function loadPage(url) {
-		$.pjax({url: url, container: pjaxContainer})
-	}
-
-	function urlPattern(a, b) {
-		var r;
-		try {
-			r = a.substring(0, a.lastIndexOf('/')) == b.substring(0, b.lastIndexOf('/'));
-		} catch (e) {
-			r = false;
-		}
-		return r;
-	}
-
-	function showPjax() {
-		$(angJsContainer).removeClass('page-content active').hide();
-		$(pjaxContainer).addClass('page-content active');
-	}
-
-	function showAngJs() {
-		$(pjaxContainer).html('').removeClass('page-content active').hide();
-		$(angJsContainer).addClass('page-content active');
-	}
-
-	function activeLeftMenu(item) {
-		$(item).parent('.nav-item').addClass('active').parent('.sub-menu').show().parent().addClass('open');
-		setTitle(item);
-	}
-
-	function setTitle(menuItem){
-		document.title = $('span.title', menuItem).text();
-	}
+    //初始打开的片段地址
+    var initFragment = "^_^initFragment^_^";
+    //静态文件目录
+    var dir = '/pages/';
+    //片段容器
+    var pjaxContainer = '#pjax-container'
+        , angJsContainer = '#route-container';
+
+    $(document).ajaxError(function (event, jqxhr, settings, thrownError) {
+        if(jqxhr.status == 403){
+            layer.closeAll();
+            layer.alert(jqxhr.message?jqxhr.message:'访问被拒绝', {icon: 2, title: '操作失败'});
+        }
+    });
+
+    $(function () {
+        $.get('/user/currentUser', function (user) {
+            $('#indexTopUName').text(user.userName);
+        });
+
+        //带 data-pjax 的链接由pjax加载
+        $(document).pjax('a[data-pjax]', pjaxContainer);
+
+        //pjax左菜单点击事件
+        $(document).on('click', '#leftMenuSidebar a[data-pjax]', function () {
+            setTitle(this);
+
+            $('#leftMenuSidebar li.nav-item.active').removeClass('active');
+            $(this).parent().addClass('active');
+            showPjax();
+        });
+
+        //angularjs左菜单点击事件
+        $(document).on('click', '#leftMenuSidebar a[data-angularjs]', function () {
+            setTitle(this);
+
+            $('#leftMenuSidebar li.nav-item.active').removeClass('active');
+            $(this).parent().addClass('active');
+            showAngJs();
+        });
+
+        //加载左菜单栏
+        $get('/module/findByCurrentUser', null,
+            function (ms) {
+                var treeArray = createTreeData(ms);
+                treeArray.sort(function (a, b) {
+                    return a.createDate - b.createDate;
+                });
+                var menuHtml = template('menu_list_temp', {list: treeArray});
+                $('#leftMenuSidebar').html(menuHtml);
+
+                //----------- 检查URL ----------------
+                var h = location.hash;
+                if (initFragment && initFragment != '') {
+                    showPjax();
+                    //普通片段
+                    loadPage(initFragment);
+                    //选中菜单
+                    $.each($('#leftMenuSidebar a'), function (i, item) {
+                        if (urlPattern($(item).attr('href'), initFragment)) {
+                            activeLeftMenu(item);
+                        }
+                    });
+                } else if (h) {
+                    //angularjs片段
+                    showAngJs();
+                    //选中菜单
+                    $.each($('#leftMenuSidebar a'), function (i, item) {
+                        if ($(item).attr('href') == h) {
+                            activeLeftMenu(item);
+                        }
+                    });
+                }
+                else {
+                    //加载主页
+                    loadPage('/pages/home.html');
+                }
+            });
+
+        //修改密码
+        $('#changePWD').on('click', function () {
+            $.get('/pages/permission/user/changePWD.html', function (content) {
+                layer.open({
+                    type: 1,
+                    area: ['600px', '360px'],
+                    content: content,
+                    title: '修改密码',
+                    shift: 5,
+                    scrollbar: false,
+                    success: function () {
+                    }
+                });
+            });
+        });
+    });
+
+    //modal关闭时销毁dom
+    $(document).on('hidden.bs.modal', '.modal', function () {
+        $(this).remove();
+    });
+
+    //pjax加载完成事件
+    $(document).on('pjax:success', function () {
+        var dicts = $(pjaxContainer).find('.nt-dictionary');
+        dictionaryUtils.transformDom(dicts);
+    });
+
+    function loadPage(url) {
+        $.pjax({url: url, container: pjaxContainer})
+    }
+
+    function urlPattern(a, b) {
+        var r;
+        try {
+            r = a.substring(0, a.lastIndexOf('/')) == b.substring(0, b.lastIndexOf('/'));
+        } catch (e) {
+            r = false;
+        }
+        return r;
+    }
+
+    function showPjax() {
+        $(angJsContainer).removeClass('page-content active').hide();
+        $(pjaxContainer).addClass('page-content active');
+    }
+
+    function showAngJs() {
+        $(pjaxContainer).html('').removeClass('page-content active').hide();
+        $(angJsContainer).addClass('page-content active');
+    }
+
+    function activeLeftMenu(item) {
+        $(item).parent('.nav-item').addClass('active').parent('.sub-menu').show().parent().addClass('open');
+        setTitle(item);
+    }
+
+    function setTitle(menuItem){
+        document.title = $('span.title', menuItem).text();
+    }
 </script>
 <!-- d3 -->
@@ -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