Merge branch 'minhang' of http://222.66.0.204:8090//panzhaov5/bsth_control into minhang

徐烜
2 parents 1ca919f8 96ea8d38
Showing 22 changed files with 572 additions and 455 deletions
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/controller/report/ReportController.java
src/main/java/com/bsth/data/gpsdata/arrival/SignalHandle.java
src/main/java/com/bsth/data/gpsdata/arrival/handlers/CorrectSignalHandle.java
src/main/java/com/bsth/data/gpsdata/arrival/handlers/InOutStationSignalHandle.java
src/main/java/com/bsth/data/gpsdata/arrival/handlers/OfflineSignalHandle.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/data/schedule/SchAttrCalculator.java
src/main/java/com/bsth/data/schedule/thread/ScheduleRefreshThread.java
src/main/java/com/bsth/entity/realcontrol/ScheduleRealInfo.java
src/main/java/com/bsth/service/realcontrol/ScheduleRealInfoService.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/service/schedule/PeopleCarPlanServiceImpl.java
src/main/java/com/bsth/service/schedule/rules/ScheduleRuleService.java
src/main/java/com/bsth/service/schedule/rules/ScheduleRuleServiceImpl.java
src/main/java/com/bsth/util/db/DBUtils_oldSystem.java
src/main/resources/static/pages/forms/mould/inoutstation.xls
src/main/resources/static/pages/forms/statement/peopleCarPlan.html
src/main/resources/static/real_control_v2/js/line_schedule/context_menu.js
src/main/resources/static/real_control_v2/js/line_schedule/sch_table.js
@@ -186,16 +186,6 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	/**
 	 * 
-	 * @Title: trustStatus @Description: TODO(线路托管状态) @param @param lineCodes
-	 * 线路编码 @throws
-	 */
-	@RequestMapping(value = "/trustStatus")
-	public Map<Integer, Integer> trustStatus(@RequestParam String lineCodes) {
-		return scheduleRealInfoService.trustStatus(lineCodes);
-	}
-	
-	/**
-	 * 
 	 * @Title: outgoAdjustAll 
 	 * @Description: TODO(批量待发调整) 
 	 * @param @param list
@@ -207,17 +197,6 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 		params = StringEscapeUtils.unescapeHtml4(params);
 		return scheduleRealInfoService.outgoAdjustAll(params);
 	}
-
-	/**
-	 * 
-	 * @Title: changeTrustStatus @Description: TODO(切换线路托管状态) @param @param
-	 * lineCode 线路编码 @param @param status 托管状态 @throws
-	 */
-	@RequestMapping(value = "/trustStatus/change", method = RequestMethod.POST)
-	public int changeTrustStatus(@RequestParam Integer lineCode, @RequestParam Integer status) {
-		//ScheduleBuffer.trustMap.put(lineCode, status);
-		return 200;
-	}
 	/**
 	 * 
@@ -243,12 +222,6 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 		return scheduleRealInfoService.findRouteByLine(lineCode);
 	}
-	@RequestMapping(value = "/test/getSch")
-	public int getSch(){
-		//getSchedulePlanThread.start();
-		return 1;
-	}
-	
 	/**
 	 * 
 	 * @Title: removeChildTask 
@@ -269,7 +242,6 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	 */
 	@RequestMapping(value = "/lineCode/{lineCode}")
 	public List<ScheduleRealInfo> findByLineCode(@PathVariable("lineCode") String lineCode){
-		//return ScheduleBuffer.realSchedulListMap.get(lineCode);
 		return dayOfSchedule.findByLineCode(lineCode);
 	}
@@ -447,10 +419,10 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 		return scheduleRealInfoService.changeBcType(id, bcType, remarks);
 	}
-	@RequestMapping(value="/history", method=RequestMethod.POST)
+/*	@RequestMapping(value="/history", method=RequestMethod.POST)
 	public Map<String,Object> historySave(ScheduleRealInfo sch){
 		return scheduleRealInfoService.historySave(sch);
-	}
+	}*/
 	private static DateTimeFormatter fmtyyyyMMdd = DateTimeFormat.forPattern("yyyy-MM-dd");
@@ -46,11 +46,18 @@ public class ReportController {
 		for (ArrivalInfo a:list ) {
 			Map<String, Object> m = new HashMap<String, Object>();
 			m.put("i", i);
-			m.put("mbbm", a.getNbbm());
+			m.put("nbbm", a.getNbbm());
 			m.put("stopName", a.getStopName());
 			m.put("jzsj", a.getJzsj());
 			m.put("czsj", a.getCzsj());
+			m.put("kgm", "");
 			m.put("upDown", a.getUpDown()==0?"上行":"下行");
+			m.put("kmsd", "");
+			m.put("bufa", "");
+			m.put("skcs", "");
+			m.put("skje", "");
+			m.put("mfskcs", "");
+			m.put("mfskje", "");
 			resList.add(m);
 			i++;
 		}
@@ -77,6 +84,46 @@ public class ReportController {
+	@RequestMapping(value="/exportQueryListClzd" ,method = RequestMethod.GET)
+	public List<Map<String, Object>>  exportQueryListClzd(@RequestParam String zd,@RequestParam String line,
+			@RequestParam String zdlx,@RequestParam String fcsj,@RequestParam String ddsj){
+		List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+		ReportUtils ee = new ReportUtils();
+		List<ArrivalInfo> list=service.queryListClzd(line,zd,zdlx,fcsj,ddsj);
+		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
+		int i=1;
+		for (ArrivalInfo a:list ) {
+			Map<String, Object> m = new HashMap<String, Object>();
+			m.put("i", i);
+			m.put("nbbm", a.getNbbm());
+			m.put("stopName", a.getStopName());
+			m.put("jzsj", a.getJzsj());
+			m.put("czsj", a.getCzsj());
+			m.put("kgm", "");
+			m.put("upDown", a.getUpDown()==0?"上行":"下行");
+			m.put("kmsd", "");
+			m.put("bufa", "");
+			m.put("skcs", "");
+			m.put("skje", "");
+			m.put("mfskcs", "");
+			m.put("mfskje", "");
+			resList.add(m);
+			i++;
+		}
+		
+		try {
+			Map<String, Object> map=new HashMap<String, Object>();
+			listI.add(resList.iterator());
+			String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
+			ee.excelReplace(listI, new Object[] { map }, path + "mould/inoutstation.xls",
+					path + "export/班次到离站.xls");
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return resList;
+	}
+	
+	
 	@RequestMapping(value="/jobSummaryExport" ,method = RequestMethod.GET)
 	public List<Map<String, Object>> jobSummaryExport(@RequestParam Map<String, Object> map){
 		List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
@@ -85,7 +85,7 @@ public abstract class SignalHandle {
             gps.setStopNo(station.getCode());
         }
-        logger.info(fmtHHmm.print(gps.getTimestamp()) + " 车辆 ：" + gps.getNbbm() + " 切换到走向 : " + updown);
+        logger.info(gps.getTimestamp() + " -" + fmtHHmm.print(gps.getTimestamp()) + " 车辆 ：" + gps.getNbbm() + " 切换到走向 : " + updown);
     }
     /**
@@ -48,12 +48,6 @@ public class CorrectSignalHandle extends SignalHandle {
             gps.setState(0);
         }
-        /*if(gps.getState() != 0){
-            logger.info(gps.getNbbm() + " 纠正状态到营运");
-            //切换到营运状态
-            directiveService.send60Operation(sch.getClZbh(), 0, Integer.parseInt(sch.getXlDir()), null, "纠正@系统");
-        }*/
-
         return true;
     }
 }
@@ -257,13 +257,19 @@ public class InOutStationSignalHandle extends SignalHandle{
             dayOfSchedule.save(sch);
             if(next != null){
-                next.setQdzArrDatesj(sch.getZdsjActual());
                 dayOfSchedule.addExecPlan(next);
                 //进站既进场
                 inStationAndInPark(sch, next);
             }
+
+            //该路牌的下一个班次，起点实际到达时间
+            ScheduleRealInfo lpNext = dayOfSchedule.nextByLp(sch);
+            if(lpNext != null){
+                lpNext.setQdzArrDatesj(sch.getZdsjActual());
+            }
+
             //通知客户端
-            sendUtils.sendZdsj(sch, next, doneSum);
+            sendUtils.sendZdsj(sch, lpNext, doneSum);
             //准备执行下一个班次
             if (next != null) {
@@ -30,7 +30,8 @@ public class OfflineSignalHandle extends SignalHandle{
         if(isNotEmpty(prevs)){
             GpsEntity prev = prevs.getTail();
-            int space = (int) (gps.getTimestamp() - prev.getTimestamp());
+            //间隔太大就丢弃，不管之前还是之后
+            int space = Math.abs((int) (gps.getTimestamp() - prev.getTimestamp()));
             if(space > OFFLINE_TIME)
                 gps.setSignalState("reconnection");
@@ -23,7 +23,9 @@ import com.bsth.service.schedule.SchedulePlanInfoService;
 import com.bsth.util.BatchSaveUtils;
 import com.bsth.util.DateUtils;
 import com.bsth.websocket.handler.SendUtils;
+import com.google.common.base.Predicate;
 import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.Collections2;
 import org.apache.commons.lang3.StringUtils;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
@@ -59,16 +61,16 @@ public class DayOfSchedule implements CommandLineRunner {
     // 按车辆分组的班次数据
     private static ArrayListMultimap<String, ScheduleRealInfo> nbbmScheduleMap;
+    //按路牌分组的班次数据 线路编码_路牌名称 ——> 班次list
+    private static ArrayListMultimap<String, ScheduleRealInfo> lpScheduleMap;
+
     // 班次主键映射
     private static Map<Long, ScheduleRealInfo> id2SchedulMap;
-    // 车辆和排班起终点站对照（包括进出的停车场，区间起终点）
-    //private static TreeMultimap<String, String> nbbm2SEStationMap;
-
     //车辆 ——> 当前执行班次
     private static Map<String, ScheduleRealInfo> carExecutePlanMap;
-    // 持久化缓冲区
+    // 持久化
     public static LinkedList<ScheduleRealInfo> pstBuffer;
     // 排序器
@@ -102,11 +104,12 @@ public class DayOfSchedule implements CommandLineRunner {
     static {
         nbbmScheduleMap = ArrayListMultimap.create();
+        lpScheduleMap = ArrayListMultimap.create();
+
         id2SchedulMap = new HashMap<>();
         pstBuffer = new LinkedList<>();
         schFCSJComparator = new ScheduleComparator.FCSJ();
         currSchDateMap = new HashMap<>();
-        //nbbm2SEStationMap = TreeMultimap.create();
         carExecutePlanMap = new HashMap<>();
         schedulePlanMap = new HashMap<>();
@@ -145,7 +148,7 @@ public class DayOfSchedule implements CommandLineRunner {
         //dataRecovery();
         //翻班线程
-//        Application.mainServices.scheduleWithFixedDelay(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS);
+        Application.mainServices.scheduleWithFixedDelay(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS);
         //入库
 //        Application.mainServices.scheduleWithFixedDelay(schedulePstThread, 60, 30, TimeUnit.SECONDS);
         //班次误点扫描
@@ -233,13 +236,19 @@ public class DayOfSchedule implements CommandLineRunner {
             //添加到缓存
             putAll(list);
-            Set<String> cars = searchAllCars(list);
+
+            Set<String> lps = searchAllLP(list);
+            for(String lp : lps){
+                //计算“起点站应到”时间
+                schAttrCalculator.calcQdzTimePlan(lpScheduleMap.get(lineCode + "_" + lp));
+            }
+            /*Set<String> cars = searchAllCars(list);
             for (String nbbm : cars) {
                 //计算“起点站应到”时间
                 schAttrCalculator.calcQdzTimePlan(nbbmScheduleMap.get(nbbm));
                 //车辆 ——> 要执行的班次对照
                 reCalcExecPlan(nbbm);
-            }
+            }*/
             // 页面 翻班通知
             //sendUtils.shiftSchedule(lineCode);
@@ -258,13 +267,25 @@ public class DayOfSchedule implements CommandLineRunner {
     /**
      * @Title: searchAllCars
      * @Description: TODO(搜索班次集合中的车辆)
-     */
+
     private Set<String> searchAllCars(List<ScheduleRealInfo> list) {
         Set<String> cars = new HashSet<>();
         for (ScheduleRealInfo sch : list)
             cars.add(sch.getClZbh());
         return cars;
+    }*/
+
+    /**
+     * @Title: searchAllCars
+     * @Description: TODO(搜索班次集合中的路牌)
+     */
+    private Set<String> searchAllLP(List<ScheduleRealInfo> list) {
+        Set<String> lps = new HashSet<>();
+        for (ScheduleRealInfo sch : list)
+            lps.add(sch.getLpName());
+
+        return lps;
     }
     private void putAll(List<ScheduleRealInfo> list) {
@@ -312,6 +333,13 @@ public class DayOfSchedule implements CommandLineRunner {
             }
         }
+        //清理路牌对照
+        Set<String> lps = lpScheduleMap.keySet();
+        for(String lp : lps){
+            if(lp.indexOf(lineCode + "_") != -1)
+                lpScheduleMap.removeAll(lp);
+        }
+
         logger.info(lineCode + "排班清理 " + count);
     }
@@ -496,18 +524,31 @@ public class DayOfSchedule implements CommandLineRunner {
         return id2SchedulMap.get(id);
     }
-   /* public Set<String> getSEStationList(String nbbm) {
-        return nbbm2SEStationMap.get(nbbm);
-    }*/
     /**
      * @Title: next
      * @Description: TODO(下一个班次)
      */
     public ScheduleRealInfo next(ScheduleRealInfo sch) {
+        List<ScheduleRealInfo> list = nbbmScheduleMap.get(sch.getClZbh());
+        return next(list, sch);
+    }
+    /**
+     * 下一个相同走向的班次
+     * @param sch
+     * @return
+     */
+    public ScheduleRealInfo nextSame(final ScheduleRealInfo sch){
         List<ScheduleRealInfo> list = nbbmScheduleMap.get(sch.getClZbh());
-        int outConfig = -1;
+        Collection<ScheduleRealInfo> subList = Collections2.filter(list, new Predicate<ScheduleRealInfo>(){
+
+            @Override
+            public boolean apply(ScheduleRealInfo item) {
+                return item.getXlDir().equals(sch.getXlDir());
+            }
+        });
+        /*int outConfig = -1;
         LineConfig config = lineConfigData.get(sch.getXlBm());
         if (config != null)
             outConfig = config.getOutConfig();
@@ -531,21 +572,22 @@ public class DayOfSchedule implements CommandLineRunner {
                     && (!limitPark || park.equals(temp.getQdzCode())))
                 continue;
-            if (flag) {
+            if (flag && temp.getXlDir().equals(sch.getXlDir())) {
                 next = temp;
                 break;
             }
-        }
-        return next;
+        }*/
+        return next(subList, sch);
     }
+
     /**
-     * 下一个相同走向的班次
-     * @param sch
+     * 下一个班次
+     * @param list 班次集合
+     * @param sch 当前班次
      * @return
      */
-    public ScheduleRealInfo nextSame(ScheduleRealInfo sch){
-        List<ScheduleRealInfo> list = nbbmScheduleMap.get(sch.getClZbh());
+    private ScheduleRealInfo next(Collection<ScheduleRealInfo> list , ScheduleRealInfo sch){
         int outConfig = -1;
         LineConfig config = lineConfigData.get(sch.getXlBm());
         if (config != null)
@@ -570,7 +612,7 @@ public class DayOfSchedule implements CommandLineRunner {
                     && (!limitPark || park.equals(temp.getQdzCode())))
                 continue;
-            if (flag && temp.getXlDir().equals(sch.getXlDir())) {
+            if (flag) {
                 next = temp;
                 break;
             }
@@ -626,16 +668,21 @@ public class DayOfSchedule implements CommandLineRunner {
         String nbbm = sch.getClZbh();
         nbbmScheduleMap.put(nbbm, sch);
-        //nbbm2SEStationMap.put(nbbm, sch.getQdzCode());
-        //nbbm2SEStationMap.put(nbbm, sch.getZdzCode());
         //主键索引
         id2SchedulMap.put(sch.getId(), sch);
+        //路牌对照表
+        addLPMapp(sch);
+
         //跨24点的，再save一次
         if (!sch.getRealExecDate().equals(sch.getScheduleDateStr()))
             save(sch);
     }
+    public void addLPMapp(ScheduleRealInfo sch){
+        lpScheduleMap.put(sch.getXlBm() + "_" + sch.getLpName(), sch);
+    }
+
     public void delete(ScheduleRealInfo sch) {
         //ScheduleRealInfo sch = id2SchedulMap.get(id);
         if (!sch.isSflj())
@@ -647,9 +694,15 @@ public class DayOfSchedule implements CommandLineRunner {
     }
-    public List<ScheduleRealInfo> updateQdzTimePlan(String nbbm) {
+/*    public List<ScheduleRealInfo> updateQdzTimePlan(String nbbm) {
         Collections.sort(nbbmScheduleMap.get(nbbm), schFCSJComparator);
         return schAttrCalculator.updateQdzTimePlan(nbbmScheduleMap.get(nbbm));
+    }*/
+
+    public List<ScheduleRealInfo> updateQdzTimePlan(String lpName) {
+        List<ScheduleRealInfo> list = lpScheduleMap.get(lpName);
+        Collections.sort(list, schFCSJComparator);
+        return schAttrCalculator.updateQdzTimePlan(list);
     }
     /**
@@ -810,9 +863,9 @@ public class DayOfSchedule implements CommandLineRunner {
      */
     public List<ScheduleRealInfo> changeCar(ScheduleRealInfo sch, String newClZbh) {
         List<ScheduleRealInfo> ups = new ArrayList<>();
-        String oldClzbh = sch.getClZbh();
+        /*String oldClzbh = sch.getClZbh();
         if (oldClzbh.equals(newClZbh))
-            return ups;
+            return ups;*/
         //变更相关映射信息
@@ -820,12 +873,10 @@ public class DayOfSchedule implements CommandLineRunner {
         sch.setClZbh(newClZbh);
         nbbmScheduleMap.put(newClZbh, sch);
-        //nbbm2SEStationMap.put(newClZbh, sch.getQdzCode());
-        //nbbm2SEStationMap.put(newClZbh, sch.getZdzCode());
         //重新计算班次应到时间
-        ups.addAll(updateQdzTimePlan(oldClzbh));
-        ups.addAll(updateQdzTimePlan(newClZbh));
+        //ups.addAll(updateQdzTimePlan(oldClzbh));
+        //ups.addAll(updateQdzTimePlan(newClZbh));
         //重新计算车辆当前执行班次
         reCalcExecPlan(newClZbh);
@@ -942,4 +993,15 @@ public class DayOfSchedule implements CommandLineRunner {
         //重新计算班次应到时间
         updateQdzTimePlan(nbbm);
     }
+
+    /**
+     * 获取该班次所在路牌的下一个班次
+     * @param sch
+     * @return
+     */
+    public ScheduleRealInfo nextByLp(ScheduleRealInfo sch) {
+        List<ScheduleRealInfo> list = lpScheduleMap.get(sch.getXlBm() + "_" + sch.getLpName());
+        Collections.sort(list, schFCSJComparator);
+        return next(list, sch);
+    }
 }
 \ No newline at end of file
@@ -104,7 +104,7 @@ public class SchAttrCalculator {
 	/**
 	 * 
 	 * @Title: calcQdzTimePlan 
-	 * @Description: TODO(计算班次的起点应到时间，list 必须是同一辆车的班次) 
+	 * @Description: TODO(计算班次的起点应到时间)
 	 */
 	public void calcQdzTimePlan(List<ScheduleRealInfo> list){
 		Collections.sort(list, new ScheduleComparator.FCSJ());
@@ -116,12 +116,13 @@ public class SchAttrCalculator {
 		ScheduleRealInfo prve = list.get(0), curr;
 		for(int i = 1; i < len; i ++){
 			curr = list.get(i);
-			if(prve.getZdzName().equals(curr.getQdzName())){
+
+			if(prve.getZdzName().equals(curr.getQdzName())
+					|| prve.getZdzCode().equals(curr.getQdzCode())){
 				curr.setQdzArrDateJH(prve.getZdsj());
-				if(StringUtils.isNotEmpty(prve.getZdsjActual()) && StringUtils.isEmpty(curr.getQdzArrDatesj()))
+				if(StringUtils.isNotEmpty(prve.getZdsjActual()))
 					curr.setQdzArrDatesj(prve.getZdsjActual());
 			}
-			
 			prve = curr;
 		}
 	}
@@ -129,7 +130,7 @@ public class SchAttrCalculator {
 	/**
 	 * 
 	 * @Title: updateQdzTimePlan 
-	 * @Description: TODO(更新班次的起点应到时间，list 必须是同一辆车的班次) 并返回被更新的班次 
+	 * @Description: TODO(更新班次的起点应到时间) 并返回被更新的班次
 	 */
 	public List<ScheduleRealInfo> updateQdzTimePlan(List<ScheduleRealInfo> list){
 		Collections.sort(list, new ScheduleComparator.FCSJ());
@@ -143,7 +144,8 @@ public class SchAttrCalculator {
 		for(int i = 1; i < len; i ++){
 			curr = list.get(i);
-			if(prve.getZdzName().equals(curr.getQdzName())){
+			if(prve.getZdzName().equals(curr.getQdzName())
+					|| prve.getZdzCode().equals(curr.getQdzCode())){
 				if(curr.getQdzArrDateJH() != null && prve.getZdsj().equals(curr.getQdzArrDateJH())){
 					prve = curr;
@@ -57,8 +57,6 @@ public class ScheduleRefreshThread extends Thread{
 				if(oldSchDate == null || !oldSchDate.equals(currSchDate)){
 					logger.info(lineCode + "开始翻班， " + currSchDate);
-					//清除进出站数据
-					//arrivalData.clearRAMData(lineCode);
 					//清除指令数据
 					Set<String> cars = dayOfSchedule.findCarByLineCode(lineCode);
 					for(String car : cars)
@@ -779,6 +779,8 @@ public class ScheduleRealInfo {
 	public void destroy(){
 		this.jhlc = 0.0;
+		if(this.isSflj())
+			this.jhlcOrig = 0.0;
 		this.status = -1;
 		this.clearFcsjActual();
 	}
@@ -138,7 +138,7 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
     Map<String,Object> changeBcType(Long id, String bcType, String remarks);
-    Map<String,Object> historySave(ScheduleRealInfo sch);
+    //Map<String,Object> historySave(ScheduleRealInfo sch);
     Map<String, Object> MapById(Long id) ;
@@ -3,7 +3,6 @@ package com.bsth.service.realcontrol.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.alibaba.fastjson.support.odps.udf.CodecCheck.A;
 import com.bsth.common.Constants;
 import com.bsth.common.ResponseCode;
 import com.bsth.controller.realcontrol.dto.ChangePersonCar;
@@ -158,6 +157,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     private static int BUF_SIZE = 1024;
     private static DateTimeFormatter fmtyyyyMMdd = DateTimeFormat.forPattern("yyyy-MM-dd");
+    private static DateTimeFormatter fmtHHmm = DateTimeFormat.forPattern("HH:mm");
     @Override
     public Map<String, Object> outgoAdjust(Long id, String remarks, String dfsj, String bcType) {
@@ -166,7 +166,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             ScheduleRealInfo schedule = dayOfSchedule.get(id);
-
             LineConfig config = lineConfigData.get(schedule.getXlBm());
             //小于线路开始运营时间，则默认跨过24点
             if (dfsj.compareTo(config.getStartOpt()) < 0) {
@@ -178,17 +177,11 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             schedule.setDfsjAll(dfsj);
             schedule.addRemarks(remarks);
-            //取消应发未到标记
-            if(schedule.isLate2()){
-                schedule.setLate2(false);
-                LateAdjustHandle.remove(schedule);
-            }
-
             List<ScheduleRealInfo> ts = new ArrayList<>();
             ts.add(schedule);
             //调整终点时间和下一个班次的应到时间
             schedule.calcEndTime();
-            ScheduleRealInfo nextSch = dayOfSchedule.next(schedule);
+            ScheduleRealInfo nextSch = dayOfSchedule.nextByLp(schedule);
             if (null != nextSch) {
                 nextSch.setQdzArrDateJH(schedule.getZdsj());
                 ts.add(nextSch);
@@ -201,7 +194,11 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             //重新计算是否误点
             schedule.reCalcLate();
-
+            //取消应发未到标记，不再自动调整待发
+            if(schedule.isLate2()){
+                schedule.setLate2(false);
+                LateAdjustHandle.remove(schedule);
+            }
             // 持久化到数据库
             dayOfSchedule.save(schedule);
@@ -223,7 +220,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         try {
             List<String> idList = Lists.newArrayList(Splitter.on(',').trimResults().omitEmptyStrings().split(idsStr));
-            ScheduleRealInfo schedule = null, next;
+            ScheduleRealInfo schedule = null;
             for (String id : idList) {
                 schedule = dayOfSchedule.get(Long.parseLong(id));
                 if (schedule.isDestroy()) {
@@ -238,13 +235,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 dayOfSchedule.save(schedule);
                 rsList.add(schedule);
-
-                /*//如果正在执行当前班次，跳下一个班次
-                execSch = dayOfSchedule.executeCurr(schedule.getClZbh());
-                if(execSch != null && execSch.getId().equals(schedule.getId())){
-                    next = dayOfSchedule.next(schedule);
-                    dayOfSchedule.addExecPlan(next);
-                }*/
             }
             //重新计算当前执行班次
@@ -946,23 +936,14 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 for (int i = 1; i < size; i++) {
                     st += plus;
                     sch = list.get(i);
-                    sch.setDfsjAll(st);
-                    //重新计算终点时间
-                    sch.calcEndTime();
-                    dayOfSchedule.save(sch);
-
-                    updateList.add(sch);
-                    next = dayOfSchedule.next(sch);
-                    if (next.getQdzName().equals(sch.getZdzName())) {
-                        next.setQdzArrDateJH(sch.getZdsj());
-                        updateList.add(next);
-                    }
+                    //调整待发
+                    outgoAdjust(sch.getId(), null, fmtHHmm.print(st), null);
                 }
-
                 rs.put("status", ResponseCode.SUCCESS);
-                rs.put("ts", updateList);
+                //返回最后一个班次，页面会全量刷新
+                rs.put("t", sch);
             }
         } catch (Exception e) {
@@ -980,121 +961,146 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         List<ScheduleRealInfo> ts = new ArrayList<>();
         try {
             Long id = Long.parseLong(map.get("id"));
-            //实际发车时间
-            String fcsjActual = map.get("fcsjActual");
-            //实际终点时间
-            String zdsjActual = map.get("zdsjActual");
-            //备注
-            String remarks = map.get("remarks");
             ScheduleRealInfo sch = dayOfSchedule.get(id);
-            if (null != sch) {
-
-                String clZbh = map.get("clZbh");
-                if (StringUtils.isNotEmpty(clZbh)) {
-                    //换车
-                    BiMap<String, String> clMap = BasicData.deviceId2NbbmMap.inverse();
-                    if (clMap.get(clZbh) == null) {
-                        rs.put("status", ResponseCode.ERROR);
-                        rs.put("msg", "车辆 " + clZbh + " 不存在！");
-                        return rs;
-                    } else {
-                        dayOfSchedule.changeCar(sch, clZbh);
-                    }
-                }
-                //换驾驶员
-                String jsy = map.get("jsy");
-                if (StringUtils.isNotEmpty(jsy) && jsy.indexOf("/") != -1) {
-                    persoChange(sch, jsy.split("/")[0]);
-                }
-                //换售票员
-                String spy = map.get("spy");
-                if (StringUtils.isNotEmpty(spy) && spy.indexOf("/") != -1 && !spy.equals("/")) {
-                    persoChangeSPY(sch, spy.split("/")[0]);
-                }
-                else{
-                    sch.setsGh("");
-                    sch.setsName("");
-                }
+            if(null == sch){
+                rs.put("status", ResponseCode.ERROR);
+                rs.put("msg", "不存在的班次！");
+                return rs;
+            }
-                if (StringUtils.isNotBlank(fcsjActual)) {
-                    LineConfig config = lineConfigData.get(sch.getXlBm());
-                    long t = 0L;
-                    //小于线路开始运营时间，则默认跨过24点
-                    if (fcsjActual.compareTo(config.getStartOpt()) < 0)
-                        t = fmtyyyyMMddHHmm.parseMillis(fmtyyyyMMdd.print(sch.getScheduleDate().getTime() + DAY_TIME) + fcsjActual);
-                    else
-                        t = fmtyyyyMMddHHmm.parseMillis(sch.getScheduleDateStr() + fcsjActual);
+            /**
+             * 换车
+             */
+            String clZbh = map.get("clZbh");
+            if (StringUtils.isNotEmpty(clZbh)) {
+                //换车
+                if (!BasicData.deviceId2NbbmMap.inverse().containsKey(clZbh)) {
+                    rs.put("status", ResponseCode.ERROR);
+                    rs.put("msg", "车辆 " + clZbh + " 不存在！");
+                    return rs;
+                } else {
+                    dayOfSchedule.changeCar(sch, clZbh);
+                }
+            }
-                    //调整实发
-                    if (!fcsjActual.equals(sch.getFcsjActual())){
-                        sch.setFcsjActualAll(t);
+            /**
+             * 换驾驶员
+             */
+            String jsy = map.get("jsy");
+            if (StringUtils.isNotEmpty(jsy) && jsy.indexOf("/") != -1) {
+                persoChange(sch, jsy.split("/")[0]);
+            }
-                        //取消应发未到标记
-                        if(sch.isLate2()){
-                            sch.setLate2(false);
-                            LateAdjustHandle.remove(sch);
-                        }
-                    }
-                } else {
-                    //撤销实发
-                    if (sch.getFcsjActual() != null)
-                        revokeRealOutgo(sch.getId());
+            /**
+             * 换售票员
+             */
+            String spy = map.get("spy");
+            if (StringUtils.isNotEmpty(spy) && spy.indexOf("/") != -1 && !spy.equals("/")) {
+                persoChangeSPY(sch, spy.split("/")[0]);
+            }
+            else{
+                sch.setsGh("");
+                sch.setsName("");
+            }
+
+            /**
+             * 调整实发
+             */
+            String fcsjActual = map.get("fcsjActual");
+            if (StringUtils.isNotBlank(fcsjActual)
+                    && !fcsjActual.equals(sch.getFcsjActual())) {
+
+                LineConfig config = lineConfigData.get(sch.getXlBm());
+                long t = 0L;
+                //小于线路开始运营时间，则默认跨过24点
+                if (fcsjActual.compareTo(config.getStartOpt()) < 0)
+                    t = fmtyyyyMMddHHmm.parseMillis(fmtyyyyMMdd.print(sch.getScheduleDate().getTime() + DAY_TIME) + fcsjActual);
+                else
+                    t = fmtyyyyMMddHHmm.parseMillis(sch.getScheduleDateStr() + fcsjActual);
+
+                sch.setFcsjActualAll(t);
+                //取消应发未到标记
+                if(sch.isLate2()){
+                    sch.setLate2(false);
+                    LateAdjustHandle.remove(sch);
                 }
-                //实达时间
-                if (StringUtils.isNotBlank(zdsjActual)) {
-                    if (!zdsjActual.equals(sch.getZdsjActual())) {
-                        //调整实达
-                        sch.setZdsjActualAll(zdsjActual);
-                        //下一班次起点到达时间
-                        ScheduleRealInfo next = dayOfSchedule.next(sch);
-                        if (null != next) {
-                            next.setQdzArrDateSJ(zdsjActual);
-                            next.setLate2(false);
-                            ts.add(next);
-                        }
+            } else if (sch.getFcsjActual() != null){
+                //撤销实发
+                revokeRealOutgo(sch.getId());
+            }
-                        //重新计算车辆执行班次
-                        dayOfSchedule.reCalcExecPlan(sch.getClZbh());
-                    }
-                } else {
-                    //清除实达时间
-                    sch.clearZdsjActual();
-                    //清除下一班次起点到达时间
-                    ScheduleRealInfo next = dayOfSchedule.next(sch);
-                    if (null != next) {
-                        next.setQdzArrDateSJ(null);
-                        ts.add(next);
-                    }
+            /**
+             * 调整实达
+             */
+            String zdsjActual = map.get("zdsjActual");
+            if (StringUtils.isNotBlank(zdsjActual)
+                    && !zdsjActual.equals(sch.getZdsjActual())) {
+
+                //调整实达
+                sch.setZdsjActualAll(zdsjActual);
+                //路牌下一班起点到达时间
+                ScheduleRealInfo next = dayOfSchedule.nextByLp(sch);
+                if (null != next) {
+                    next.setQdzArrDateSJ(zdsjActual);
+                    next.setLate2(false);
+                    ts.add(next);
                 }
-                sch.setRemarks(remarks);
-                try {
-                    //烂班
-                    if (map.get("status") != null
-                            && Integer.parseInt(map.get("status").toString()) == -1) {
-                        destroy(sch.getId() + "", "", map.get("adjustExps").toString());
-                    }
-                } catch (NumberFormatException e) {
-                    logger.error("", e);
+                //重新计算车辆执行班次
+                dayOfSchedule.reCalcExecPlan(sch.getClZbh());
+            } else if(StringUtils.isNotEmpty(sch.getZdsjActual())){
+                //清除实达时间
+                sch.clearZdsjActual();
+                //清除路牌下一班起点到达时间
+                ScheduleRealInfo next = dayOfSchedule.nextByLp(sch);
+                if (null != next) {
+                    next.setQdzArrDateSJ(null);
+                    ts.add(next);
                 }
+                //重新计算车辆执行班次
+                dayOfSchedule.reCalcExecPlan(sch.getClZbh());
+            }
-                //修改班次里程
-                String jhlc = map.get("jhlc");
-                if (StringUtils.isNotEmpty(jhlc)) {
-                    if(Double.parseDouble(jhlc) == 0 && sch.getJhlcOrig() != 0)
-                        destroy(sch.getId() + "", "", map.get("adjustExps").toString());
-                    else{
-                        sch.setJhlc(Double.parseDouble(jhlc));
-                    }
+            /**
+             * 备注
+             */
+            sch.setRemarks(map.get("remarks"));
+
+            /**
+             * 烂班
+             */
+            if (map.get("status") != null
+                    && Integer.parseInt(map.get("status").toString()) == -1) {
+                destroy(sch.getId() + "", "", map.get("adjustExps").toString());
+            }
+
+            /**
+             * 修改班次里程
+             */
+            String jhlc = map.get("jhlc");
+            if (StringUtils.isNotEmpty(jhlc)) {
+                double jhlcNum = Double.parseDouble(jhlc);
+                //烂班
+                if(jhlcNum == 0 && sch.getJhlcOrig() != 0)
+                    destroy(sch.getId() + "", "", map.get("adjustExps").toString());
+                else if(jhlcNum != sch.getJhlc()){
+                    sch.setJhlc(jhlcNum);
+                    //临加班次，实际计划一起改
+                    if(sch.isSflj())
+                        sch.setJhlcOrig(jhlcNum);
                 }
             }
+            /**
+             * 修改班次类型
+             */
             String bcType = map.get("bcType");
             if (StringUtils.isNotEmpty(bcType)) {
                 sch.setBcType(bcType);
             }
-            //班次状态
+
+            //重新计算班次状态
             sch.calcStatus();
             dayOfSchedule.save(sch);
             //页面需要更新的班次信息
@@ -1118,25 +1124,19 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             ScheduleRealInfo schedule = null;
             JSONObject jsonObj;
             String dfsj;
+            long id;
             for (int i = 0; i < jsonArray.size(); i++) {
                 jsonObj = jsonArray.getJSONObject(i);
                 dfsj = jsonObj.getString("t");
-                schedule = dayOfSchedule.get(jsonObj.getLong("id"));
-                //设置待发时间
-                schedule.setDfsjAll(dfsj);
-                //重新计算是否误点
-                schedule.reCalcLate();
+                id = jsonObj.getLong("id");
+                schedule = dayOfSchedule.get(id);
-                //取消应发未到标记
-                if(schedule.isLate2()){
-                    schedule.setLate2(false);
-                    LateAdjustHandle.remove(schedule);
-                }
-                dayOfSchedule.save(schedule);
+                if(schedule != null)
+                    outgoAdjust(id, null, dfsj, null);
             }
             rs.put("status", ResponseCode.SUCCESS);
-            //将更新的最后一个班次返回
+            //将更新的最后一个班次返回，页面会做全量刷新
             rs.put("t", schedule);
         } catch (Exception e) {
             logger.error("", e);
@@ -2909,29 +2909,15 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         Map<String, Object> rs = new HashMap<>(), tempMap = new HashMap<>();
         List<ScheduleRealInfo> list = new ArrayList<>();
-        ScheduleRealInfo sch, next;
         for (DfsjChange dc : dfsjcs) {
             if (StringUtils.isEmpty(dc.getOld_dfsj()) || StringUtils.isEmpty(dc.getNew_dfsj()))
                 continue;
-			
-			/*sch = dayOfSchedule.get(dc.getSchId());
-			if(sch==null)
-				continue;
-			
-			sch.setDfsjAll(dc.getNew_dfsj());
-			//重新计算终点时间
-			sch.calcEndTime();
-			list.add(sch);*/
+
             tempMap = outgoAdjust(dc.getSchId(), "", dc.getNew_dfsj(), null);
             if (tempMap.get("status").equals(ResponseCode.SUCCESS)) {
                 list.addAll((Collection<? extends ScheduleRealInfo>) tempMap.get("ts"));
             }
-            //next=dayOfSchedule.next(sch);
-			/*if(next.getQdzName().equals(sch.getZdzName())){
-				next.setQdzArrDateJH(sch.getZdsj());
-				list.add(next);
-			}*/
         }
         rs.put("status", ResponseCode.SUCCESS);
@@ -3021,7 +3007,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             if (sch != null) {
                 sch.setBcType(bcType);
                 sch.addRemarks(remarks);
-                //有时间记录一下相关变更数据
                 rs.put("status", ResponseCode.SUCCESS);
                 rs.put("t", sch);
             }
@@ -3033,7 +3018,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         return rs;
     }
-    @Override
+ /*   @Override
     public Map<String, Object> historySave(ScheduleRealInfo sch) {
         Map<String, Object> rs = new HashMap<>();
         rs.put("status", ResponseCode.ERROR);
@@ -3073,7 +3058,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         scheduleRealInfoRepository.save(oldSch);
         rs.put("status", ResponseCode.SUCCESS);
         return rs;
-    }
+    }*/
     @Autowired
     SvgAttributeRepository svgAttributeRepository;
@@ -4151,8 +4136,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 sch.clearFcsjActual();
                 sch.clearZdsjActual();
-                //清除下一个班次的起点到达时间
-                ScheduleRealInfo next = dayOfSchedule.next(sch);
+                //清除路牌下一个班的起点到达时间
+                ScheduleRealInfo next = dayOfSchedule.nextByLp(sch);
                 if (null != next) {
                     next.setQdzArrDateSJ(null);
                     ts.add(next);
@@ -4164,6 +4149,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 rs.put("ts", ts);
                 dayOfSchedule.save(sch);
+                //重新计算当前执行班次
+                dayOfSchedule.reCalcExecPlan(sch.getClZbh());
             }
         } catch (Exception e) {
@@ -141,8 +141,15 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
 		List<Map<String, Object>> mapList = new ArrayList<Map<String, Object>>();
-		String company = map.get("company").toString();
-		String subCompany = map.get("subCompany").toString();
+		/*String company = "";
+		String subCompany ="";
+		if(map.get("company")!=null){
+			 company = map.get("company").toString();
+		}
+		
+		if(map.get("subCompany")!=null){
+			subCompany=map.get("subCompany").toString();
+		}*/
 		String line = map.get("line").toString();
 		String date = map.get("date").toString();
 		String type = map.get("type").toString();
@@ -157,9 +164,9 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 			if(line.length() != 0){
 				sql += " and xl_bm = '"+line+"'";
 			}
-			if(company.length() != 0){
+			/*if(company.length() != 0){
 				sql += " and gs_bm = '"+company+"' and fgs_bm = '"+subCompany+"'";
-			}
+			}*/
 			list = jdbcTemplate.query(sql,
 					new RowMapper<SchedulePlanInfo>(){
-package com.bsth.service.schedule.rules;
-
-import com.bsth.entity.schedule.SchedulePlan;
-import com.bsth.entity.schedule.SchedulePlanInfo;
-import com.bsth.entity.schedule.temp.SchedulePlanRuleResult;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * 排班计划使用的service。
- */
-public interface ScheduleRuleService {
-
-    // TODO：之后所有排班使用的方法汇总到这里
-
-    /**
-     * 查找最近的历史排班记录
-     * @param xlid 线路id
-     * @param from 开始时间
-     * @return
-     */
-    List<SchedulePlanRuleResult> findLastByXl(String xlid, Date from);
-
-    /**
-     * 生成排班计划。
-     * @param schedulePlan 计划主表
-     * @param schedulePlanInfos 计划明细表
-     */
-    void generateSchedulePlan(SchedulePlan schedulePlan, List<SchedulePlanInfo> schedulePlanInfos);
-
-    /**
-     * 删除排班计划。
-     * @param id 排班计划id
-     */
-    void deleteSchedulePlanAll(Long id);
-
-    /**
-     * 删除指定时间范围的排班明细。
-     * @param xlid 线路id
-     * @param datefrom 开始日期
-     * @param dateto 结束日期
-     */
-    void deelteSchedulePlanInfo(Integer xlid, Date datefrom, Date dateto);
-}
-
+package com.bsth.service.schedule.rules;
+
+import com.bsth.entity.schedule.SchedulePlan;
+import com.bsth.entity.schedule.SchedulePlanInfo;
+import com.bsth.entity.schedule.temp.SchedulePlanRuleResult;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 排班计划使用的service。
+ */
+public interface ScheduleRuleService {
+
+    // TODO：之后所有排班使用的方法汇总到这里
+
+    /**
+     * 查找最近的历史排班记录
+     * @param xlid 线路id
+     * @param from 开始时间
+     * @return
+     */
+    List<SchedulePlanRuleResult> findLastByXl(String xlid, Date from);
+
+    /**
+     * 生成排班计划。
+     * @param schedulePlan 计划主表
+     * @param schedulePlanInfos 计划明细表
+     */
+    void generateSchedulePlan(SchedulePlan schedulePlan, List<SchedulePlanInfo> schedulePlanInfos);
+
+    /**
+     * 删除排班计划。
+     * @param id 排班计划id
+     */
+    void deleteSchedulePlanAll(Long id);
+
+    /**
+     * 删除指定时间范围的排班明细。
+     * @param xlid 线路id
+     * @param datefrom 开始日期
+     * @param dateto 结束日期
+     */
+    void deelteSchedulePlanInfo(Integer xlid, Date datefrom, Date dateto);
+}
+
-package com.bsth.service.schedule.rules;
-
-import com.bsth.entity.schedule.SchedulePlan;
-import com.bsth.entity.schedule.SchedulePlanInfo;
-import com.bsth.entity.schedule.temp.SchedulePlanRuleResult;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.BatchPreparedStatementSetter;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.PreparedStatementCreator;
-import org.springframework.jdbc.core.RowMapper;
-import org.springframework.jdbc.support.GeneratedKeyHolder;
-import org.springframework.jdbc.support.KeyHolder;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Isolation;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-/**
- * Created by xu on 17/4/19.
- */
-@Service
-public class ScheduleRuleServiceImpl implements ScheduleRuleService {
-    /** 日志记录器 */
-    private static final Logger logger = LoggerFactory.getLogger(ScheduleRuleServiceImpl.class);
-
-    @Autowired
-    private JdbcTemplate jdbcTemplate;
-
-    @Override
-    public List<SchedulePlanRuleResult> findLastByXl(String xlid, Date from) {
-        String sql = "select * from bsth_c_s_sp_rule_rst a " +
-                "where exists (select 1 from " +
-                "(select t.rule_id as rid, max(t.schedule_date) as sd from bsth_c_s_sp_rule_rst t " +
-                "where t.xl_id = ? and t.schedule_date < ? " +
-                "group by t.rule_id) a2 " +
-                "where a.rule_id = rid and a.schedule_date = sd) ";
-
-        return jdbcTemplate.query(sql, new Object[]{xlid, from}, new RowMapper<SchedulePlanRuleResult>() {
-            @Override
-            public SchedulePlanRuleResult mapRow(ResultSet rs, int i) throws SQLException {
-                SchedulePlanRuleResult obj = new SchedulePlanRuleResult();
-                obj.setRuleId(rs.getString("rule_id"));
-                obj.setScheduleDate(rs.getDate("schedule_date"));
-                obj.setGidindex(rs.getString("gidindex"));
-                obj.setEcindex(rs.getString("ecindex"));
-
-                // 其他字段没用
-                return obj;
-            }
-        });
-    }
-
-    @Transactional(propagation = Propagation.REQUIRED, isolation = Isolation.READ_COMMITTED)
-    public void deleteSchedulePlanAll(Long id) {
-        String sql1 = "delete from bsth_c_s_sp where id = ?";
-        String sql2 = "delete from bsth_c_s_sp_info where schedule_plan = ?";
-
-        jdbcTemplate.update(sql2, id);
-        jdbcTemplate.update(sql1, id);
-    }
-
-    @Transactional(propagation = Propagation.REQUIRED, isolation = Isolation.READ_COMMITTED)
-    public void deelteSchedulePlanInfo(Integer xlid, Date datefrom, Date dateto) {
-        String sql = "delete from bsth_c_s_sp_info where xl = ? and schedule_date >= ? and schedule_date <= ?";
-        jdbcTemplate.update(sql, xlid, datefrom, dateto);
-    }
-
-    @Transactional(propagation = Propagation.REQUIRED, isolation = Isolation.READ_COMMITTED)
-    @Override
-    public void generateSchedulePlan(final SchedulePlan schedulePlan, final List<SchedulePlanInfo> schedulePlanInfos) {
-        // 1、插入排班计划主表，并获取主键id
-        KeyHolder keyHolder = new GeneratedKeyHolder();
-        jdbcTemplate.update(new PreparedStatementCreator() {
-            @Override
-            public PreparedStatement createPreparedStatement(Connection connection) throws SQLException {
-                PreparedStatement ps = connection.prepareStatement(
-                        SchedulePlan.generateInsertSql(), new String[] {"id"});
-                schedulePlan.preparedStatementSet(ps);
-
-                return ps;
-            }
-        }, keyHolder);
-
-        SchedulePlan master = new SchedulePlan();
-        master.setId(keyHolder.getKey().longValue());
-        for (SchedulePlanInfo schedulePlanInfo : schedulePlanInfos) {
-            schedulePlanInfo.setSchedulePlan(master);
-        }
-
-        // 2、批量插入排班计划从表
-        List<List<SchedulePlanInfo>> lists = new ArrayList<>();
-        int batchSize = 2000;
-        int loopCount = schedulePlanInfos.size() / batchSize;
-        int otherCount = schedulePlanInfos.size() % batchSize;
-        for (int i = 0; i < loopCount; i++) {
-            lists.add(schedulePlanInfos.subList(i * batchSize, i * batchSize + batchSize));
-        }
-        if (otherCount > 0) {
-            lists.add(schedulePlanInfos.subList(loopCount * batchSize, loopCount * batchSize + otherCount));
-        }
-
-        for (final List<SchedulePlanInfo> list : lists) {
-            jdbcTemplate.batchUpdate(SchedulePlanInfo.generateInsertSql(), new BatchPreparedStatementSetter() {
-                @Override
-                public void setValues(PreparedStatement preparedStatement, int i) throws SQLException {
-                    SchedulePlanInfo schedulePlanInfo = list.get(i);
-                    schedulePlanInfo.preparedStatementSet(preparedStatement);
-                }
-                @Override
-                public int getBatchSize() {
-                    return list.size();
-                }
-            });
-        }
-
-    }
-}
-
+package com.bsth.service.schedule.rules;
+
+import com.bsth.entity.schedule.SchedulePlan;
+import com.bsth.entity.schedule.SchedulePlanInfo;
+import com.bsth.entity.schedule.temp.SchedulePlanRuleResult;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.BatchPreparedStatementSetter;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.PreparedStatementCreator;
+import org.springframework.jdbc.core.RowMapper;
+import org.springframework.jdbc.support.GeneratedKeyHolder;
+import org.springframework.jdbc.support.KeyHolder;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Isolation;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Created by xu on 17/4/19.
+ */
+@Service
+public class ScheduleRuleServiceImpl implements ScheduleRuleService {
+    /** 日志记录器 */
+    private static final Logger logger = LoggerFactory.getLogger(ScheduleRuleServiceImpl.class);
+
+    @Autowired
+    private JdbcTemplate jdbcTemplate;
+
+    @Override
+    public List<SchedulePlanRuleResult> findLastByXl(String xlid, Date from) {
+        String sql = "select * from bsth_c_s_sp_rule_rst a " +
+                "where exists (select 1 from " +
+                "(select t.rule_id as rid, max(t.schedule_date) as sd from bsth_c_s_sp_rule_rst t " +
+                "where t.xl_id = ? and t.schedule_date < ? " +
+                "group by t.rule_id) a2 " +
+                "where a.rule_id = rid and a.schedule_date = sd) ";
+
+        return jdbcTemplate.query(sql, new Object[]{xlid, from}, new RowMapper<SchedulePlanRuleResult>() {
+            @Override
+            public SchedulePlanRuleResult mapRow(ResultSet rs, int i) throws SQLException {
+                SchedulePlanRuleResult obj = new SchedulePlanRuleResult();
+                obj.setRuleId(rs.getString("rule_id"));
+                obj.setScheduleDate(rs.getDate("schedule_date"));
+                obj.setGidindex(rs.getString("gidindex"));
+                obj.setEcindex(rs.getString("ecindex"));
+
+                // 其他字段没用
+                return obj;
+            }
+        });
+    }
+
+    @Transactional(propagation = Propagation.REQUIRED, isolation = Isolation.READ_COMMITTED)
+    public void deleteSchedulePlanAll(Long id) {
+        String sql1 = "delete from bsth_c_s_sp where id = ?";
+        String sql2 = "delete from bsth_c_s_sp_info where schedule_plan = ?";
+
+        jdbcTemplate.update(sql2, id);
+        jdbcTemplate.update(sql1, id);
+    }
+
+    @Transactional(propagation = Propagation.REQUIRED, isolation = Isolation.READ_COMMITTED)
+    public void deelteSchedulePlanInfo(Integer xlid, Date datefrom, Date dateto) {
+        String sql = "delete from bsth_c_s_sp_info where xl = ? and schedule_date >= ? and schedule_date <= ?";
+        jdbcTemplate.update(sql, xlid, datefrom, dateto);
+    }
+
+    @Transactional(propagation = Propagation.REQUIRED, isolation = Isolation.READ_COMMITTED)
+    @Override
+    public void generateSchedulePlan(final SchedulePlan schedulePlan, final List<SchedulePlanInfo> schedulePlanInfos) {
+        // 1、插入排班计划主表，并获取主键id
+        KeyHolder keyHolder = new GeneratedKeyHolder();
+        jdbcTemplate.update(new PreparedStatementCreator() {
+            @Override
+            public PreparedStatement createPreparedStatement(Connection connection) throws SQLException {
+                PreparedStatement ps = connection.prepareStatement(
+                        SchedulePlan.generateInsertSql(), new String[] {"id"});
+                schedulePlan.preparedStatementSet(ps);
+
+                return ps;
+            }
+        }, keyHolder);
+
+        SchedulePlan master = new SchedulePlan();
+        master.setId(keyHolder.getKey().longValue());
+        for (SchedulePlanInfo schedulePlanInfo : schedulePlanInfos) {
+            schedulePlanInfo.setSchedulePlan(master);
+        }
+
+        // 2、批量插入排班计划从表
+        List<List<SchedulePlanInfo>> lists = new ArrayList<>();
+        int batchSize = 2000;
+        int loopCount = schedulePlanInfos.size() / batchSize;
+        int otherCount = schedulePlanInfos.size() % batchSize;
+        for (int i = 0; i < loopCount; i++) {
+            lists.add(schedulePlanInfos.subList(i * batchSize, i * batchSize + batchSize));
+        }
+        if (otherCount > 0) {
+            lists.add(schedulePlanInfos.subList(loopCount * batchSize, loopCount * batchSize + otherCount));
+        }
+
+        for (final List<SchedulePlanInfo> list : lists) {
+            jdbcTemplate.batchUpdate(SchedulePlanInfo.generateInsertSql(), new BatchPreparedStatementSetter() {
+                @Override
+                public void setValues(PreparedStatement preparedStatement, int i) throws SQLException {
+                    SchedulePlanInfo schedulePlanInfo = list.get(i);
+                    schedulePlanInfo.preparedStatementSet(preparedStatement);
+                }
+                @Override
+                public int getBatchSize() {
+                    return list.size();
+                }
+            });
+        }
+
+    }
+}
+
@@ -50,8 +50,8 @@ public class DBUtils_oldSystem {
 			pool_conf.put("testConnectionOnCheckout", false);
 			//异步检测连接的有效性
 			pool_conf.put("testConnectionOnCheckin", true);
-			//10分钟检测一次
-			pool_conf.put("idleConnectionTestPeriod", 60 * 10);
+			//30秒检测一次
+			pool_conf.put("idleConnectionTestPeriod", 30);
 			ds_pooled = DataSources.pooledDataSource(ds_unpooled, pool_conf);
 		}  catch (ClassNotFoundException e) {
 			logger.error(e.toString());
@@ -101,32 +101,31 @@
 			day = "0" + day;
 		$("#date").val(year + "-" + month + "-" + day);
-		$.get('/basic/lineCode2Name',function(result){
-			var data=[];
-			
-			data.push({id: " ", text: "全部线路"});
-			for(var code in result){
-				data.push({id: code, text: result[code]});
-			}
-			console.log(data);
-			initPinYinSelect2('#line',data,'');
-		});
-		
+		var fage=false;
+		var xlList;
 		var obj = [];
-		$.get('/user/companyData', function(result){
-			obj = result;
-			var options = '';
-			for(var i = 0; i < obj.length; i++){
-				options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
-			}
-			if(obj.length == 1){
-				$('#company1').hide();
-				if(obj[0].children.length == 1)
-					$('#subCompany1').hide();
-			}
-			$('#company').html(options);
-			updateCompany();
-		});
+		
+		 
+		$.get('/report/lineList',function(result){
+			xlList=result;
+			$.get('/user/companyData', function(result){
+				obj = result;
+				var options = '';
+				for(var i = 0; i < obj.length; i++){
+					options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
+				}
+				
+				if(obj.length ==0){
+					 $("#company1").css('display','none');
+				}else if(obj.length ==1){
+					 $("#company1").css('display','none');
+					if(obj[0].children.length == 1  || obj[0].children.length ==0)
+						$('#subCompany1').css('display','none');
+				}
+				$('#company').html(options);
+				updateCompany();
+			});
+		})
 		$("#company").on("change",updateCompany);
 		function updateCompany(){
 			var company = $('#company').val();
@@ -140,6 +139,42 @@
 				}
 			}
 			$('#subCompany').html(options);
+			initXl();
+		}
+
+		/* $.get('/basic/lineCode2Name',function(result){
+			var data=[];
+			
+			for(var code in result){
+				data.push({id: code, text: result[code]});
+			}
+			initPinYinSelect2('#line',data,'');
+			
+		}) */
+		
+		$("#subCompany").on("change",initXl);
+		function initXl(){
+			var data=[];
+			if(fage){
+				$("#line").select2("destroy").html('');
+			}
+			var fgs=$('#subCompany').val();
+			var gs=$('#company').val();
+			for(var i=0;i<xlList.length;i++){
+				if(gs!=""){
+					if(fgs!=""){
+						if(xlList[i]["fgsbm"]==fgs && xlList[i]["gsbm"]==gs){
+							data.push({id: xlList[i]["xlbm"], text: xlList[i]["xlname"]});
+						}
+					}else{
+						if(xlList[i]["gsbm"]==gs){
+							data.push({id: xlList[i]["xlbm"], text: xlList[i]["xlname"]});
+						}
+					}
+				}
+			}
+			initPinYinSelect2('#line',data,'');
+			fage=true;
 		}
@@ -118,7 +118,10 @@ var gb_schedule_context_menu = (function () {
                 if (!isNaN(newValue) && newValue > 0) {
                     gb_common.$post_arr('/realSchedule/spaceAdjust', {ids: idArr, space: newValue}, function (rs) {
                         //刷新数据
-                        gb_schedule_table.updateSchedule(rs.ts);
+                        if(rs.t){
+                            gb_schedule_table.reLoadAndRefresh(rs.t.xlBm);
+                        }
+                        //gb_schedule_table.updateSchedule(rs.ts);
                         notify_succ('调整间隔成功！');
                     });
                 } else
@@ -86,7 +86,7 @@ var gb_schedule_table = (function () {
                         .html(htmlStr);
                 }
-                //标记车辆最后一个班次
+                //标记路牌最后一个班次
                 markerLastByLine(lineCode);
                 //初始化图例相关，dbclick 不能代理事件
                 gb_sch_legend.init(this);
@@ -495,7 +495,7 @@ var gb_schedule_table = (function () {
     //标记终点时间 -线路
     var markerLastByLine = function (lineCode) {
-        var data = gb_common.groupBy(gb_common.get_vals(line2Schedule[lineCode]).filter(schDestroyFilter), 'clZbh');
+        var data = gb_common.groupBy(gb_common.get_vals(line2Schedule[lineCode]).filter(schDestroyFilter), 'lpName');
         var array, lastSch, dl;
         for (var nbbm in data) {
@@ -858,6 +858,7 @@
                         upDown = roadUpdown;
                     map.clearOverlays();
+                    parkPolygons = {};//清除停车场对照
                     //路段
                     drawRoadPolyline(upDown);
                     //站点
-update bsth_c_s_sp_info a
-set a.schedule_plan = (
-select sp_id from bsth_c_s_sp_r_info b where a.id = b.sp_info_id
-)
-where a.schedule_plan is null
-
-select count(*) from bsth_c_s_sp_info
+update bsth_c_s_sp_info a
+set a.schedule_plan = (
+select sp_id from bsth_c_s_sp_r_info b where a.id = b.sp_info_id
+)
+where a.schedule_plan is null
+
+select count(*) from bsth_c_s_sp_info
 where schedule_plan is null
 \ No newline at end of file