update...

panzhaov5
1 parent d7e44dc6
Showing 10 changed files with 101 additions and 14 deletions
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/controller/realcontrol/ServiceDataInterface.java
src/main/java/com/bsth/data/gpsdata_v2/handlers/InStationProcess.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/data/schedule/late_adjust/LateAdjustHandle.java
src/main/java/com/bsth/data/schedule/thread/ScheduleRefreshThread.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/sub_task_v2/main.html
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/temp_sch/main.html
src/main/resources/static/real_control_v2/js/line_schedule/context_menu.js
@@ -635,6 +635,9 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 		}
 		int code = dayOfSchedule.reloadSch(lineCode);
+
+		//重新按公司编码索引数据
+		dayOfSchedule.groupByGsbm();
 		rs.put("status", code==0? ResponseCode.SUCCESS: ResponseCode.ERROR);
 		return rs;
 	}
@@ -103,7 +103,7 @@ public class ServiceDataInterface {
         if (StringUtils.isEmpty(secretKey) || !secretKey.equals(SECRE_KEY))
             return null;
-        List<ScheduleRealInfo> all = new ArrayList<>(dayOfSchedule.findAll()), rs = new ArrayList<>();
+        List<ScheduleRealInfo> all = new ArrayList<>(dayOfSchedule.findByGsbm(companyId)), rs = new ArrayList<>();
         for (ScheduleRealInfo sch : all) {
             if (sch.getGsBm() != null
                     && sch.getGsBm().equals(companyId)
@@ -132,8 +132,6 @@ public class InStationProcess {
         sch.setZdsjActualAll(rsT);
         sch.setSiginCompate(2);
-        //通知误点停靠程序，有车辆到站
-        LateAdjustHandle.carArrive(gps);
         //持久化
         dayOfSchedule.save(sch);
@@ -147,6 +145,10 @@ public class InStationProcess {
         else
             dayOfSchedule.removeExecPlan(nbbm);
+        //通知误点停靠程序，有车辆到站
+        //LateAdjustHandle.carArrive(gps, next);
+        LateAdjustHandle.carArrive(gps);
+
         //路牌的下一个班次，页面显示起点实际到达时间
         ScheduleRealInfo lpNext = dayOfSchedule.nextByLp(sch);
         if (lpNext != null) {
@@ -56,13 +56,16 @@ public class DayOfSchedule {
     //按线路分组的 “原始计划” 排班数据
     public static Map<String, List<SchedulePlanInfo>> schedulePlanMap;
-    // 按车辆分组的班次数据
+    // 按车辆索引的班次数据
     private static ListMultimap<String, ScheduleRealInfo> nbbmScheduleMap;
-    //按线路分组计划用车
+    // 按营运公司索引的班次数据
+    private static ListMultimap<String, ScheduleRealInfo> gsBmScheduleMap;
+
+    //按线路索引计划用车
     private static HashMultimap<String, String> lineNbbmsMap;
-    //按路牌分组的班次数据 线路编码_路牌名称 ——> 班次list
+    //按路牌索引班次数据 线路编码_路牌名称 ——> 班次list
     private static ArrayListMultimap<String, ScheduleRealInfo> lpScheduleMap;
     // 班次主键映射
@@ -108,6 +111,7 @@ public class DayOfSchedule {
         nbbmScheduleMap = ArrayListMultimap.create();
         nbbmScheduleMap = Multimaps.synchronizedListMultimap(nbbmScheduleMap);
+        gsBmScheduleMap = ArrayListMultimap.create();
         lpScheduleMap = ArrayListMultimap.create();
         lineNbbmsMap = HashMultimap.create();
@@ -1135,4 +1139,26 @@ public class DayOfSchedule {
     public String sizeString(){
         return id2SchedulMap.size() + "/" + nbbmScheduleMap.size();
     }
+
+
+    /**
+     * 按公司编码分组数据
+     */
+    public void groupByGsbm(){
+        Collection<ScheduleRealInfo> all = findAll();
+        ListMultimap<String, ScheduleRealInfo> gsBmMaps = ArrayListMultimap.create();
+
+        for(ScheduleRealInfo sch : all){
+            gsBmMaps.put(sch.getGsBm(), sch);
+        }
+
+        if(gsBmMaps.size() > 0){
+            gsBmScheduleMap = null;
+            gsBmScheduleMap = gsBmMaps;
+        }
+    }
+
+    public Collection<ScheduleRealInfo> findByGsbm(String gsbm){
+        return gsBmScheduleMap.get(gsbm);
+    }
 }
 \ No newline at end of file
@@ -70,7 +70,7 @@ public class LateAdjustHandle implements ApplicationContextAware {
                 //班次被压入
                 if (lateSchMaps.containsEntry(sch.getClZbh(), sch)) {
-                    logger.info("【应发未到 -多个(" + lateSchMaps.get(sch.getClZbh()).size() + ")】班次 " + sch.getClZbh() + " -" + sch.getDfsj() + " -id: " + sch.getId() + " -加入误点调整！");
+                    logger.info("21【应发未到 -多个(" + lateSchMaps.get(sch.getClZbh()).size() + ")】班次 " + sch.getClZbh() + " -" + sch.getDfsj() + " -id: " + sch.getId() + " -加入误点调整！");
                     //通知客户端
                     sch.setLate2(true);
                     sendUtils.sendAutoWdtz(sch, old);
@@ -170,8 +170,7 @@ public class LateAdjustHandle implements ApplicationContextAware {
                 return;
-            String key = gps.getLineId() + "_" + gps.getUpDown() + "_" + gps.getStopNo()
-                    , name1 = BasicData.stationCode2NameMap.get(key)//站点名称
+            String key = gps.getLineId() + "_" + gps.getUpDown() + "_" + gps.getStopNo(), name1 = BasicData.stationCode2NameMap.get(key)//站点名称
                     , name2 = null;
             if (StringUtils.isNotEmpty(gps.getCarparkNo())) {
                 name2 = BasicData.stationCode2NameMap.get(gps.getCarparkNo());
@@ -196,7 +195,8 @@ public class LateAdjustHandle implements ApplicationContextAware {
             }
             if (gps.getStationName().equals(sch.getQdzName())
-                    || gps.getStopNo().equals(sch.getQdzCode())) {
+                    || gps.getStopNo().equals(sch.getQdzCode())
+                    || sch.getQdzName().equals(name2)) {
                 //自动调整待发 到达时间 + 停靠时间
                 long dt = Arith.addLong(gps.getTimestamp(), (sch.getLateMinute() * 60 * 1000));
@@ -215,6 +215,48 @@ public class LateAdjustHandle implements ApplicationContextAware {
         }
     }
+
+    /**
+     * 车辆到站， 进站 进 的哪个班次，就调该车辆的下一个班次
+     *
+     * @param gps
+     * @param sch public static void carArrive(GpsEntity gps, ScheduleRealInfo sch) {
+     *            try {
+     *            if (gps.getInstation() <= 0 || null == sch) {
+     *            return;
+     *            }
+     *            <p>
+     *            List<ScheduleRealInfo> list = lateSchMaps.get(gps.getNbbm());
+     *            <p>
+     *            if (null == list || list.size() == 0 || !list.contains(sch)) {
+     *            return;
+     *            }
+     *            <p>
+     *            //可能是延迟信号，gps时间没有误点
+     *            if (gps.getTimestamp() <= sch.getDfsjT()) {
+     *            sch.setLate2(false);
+     *            lateSchMaps.remove(sch.getClZbh(), sch);
+     *            return;
+     *            }
+     *            <p>
+     *            <p>
+     *            //自动调整待发 到达时间 + 停靠时间
+     *            long dt = Arith.addLong(gps.getTimestamp(), (sch.getLateMinute() * 60 * 1000));
+     *            <p>
+     *            sch.setDfsjAll(dt);
+     *            sch.setDfAuto(true);
+     *            //取消应发未到标记
+     *            sch.setLate2(false);
+     *            <p>
+     *            lateSchMaps.remove(sch.getClZbh(), sch);
+     *            logger.info("【应发未到】车辆到站 " + sch.getClZbh() + " -" + sch.getDfsj() + " -到站时间：" + gps.getTimestamp() + " -停靠时间：" + sch.getLateMinute() + " -自动设置的待发时间：" + dt);
+     *            } catch (Exception e) {
+     *            e.printStackTrace();
+     *            logger.error("late2 car arrive", e);
+     *            }
+     *            }
+     */
+
     @Override
     public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
         lineConfigData = applicationContext.getBean(LineConfigData.class);
@@ -77,6 +77,9 @@ public class ScheduleRefreshThread extends Thread{
 				}
 			}
+			//按公司编码索引数据
+			dayOfSchedule.groupByGsbm();
+
 			//首末班入库（给网关用的数据）
 			FirstAndLastHandler.saveAll();
 		} catch (Exception e) {
@@ -5146,6 +5146,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             List<String> leftList = Splitter.on(",").splitToList(leftIdx);
             List<String> rightList = Splitter.on(",").splitToList(rightIdx);
             Set<String> lpSet = new HashSet<>();
+            Set<String> carSet = new HashSet<>();
             List<ScheduleRealInfo> largeList, smallList;
             if (leftList.size() > rightList.size()) {
@@ -5176,6 +5177,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 lpSet.add(leftSch.getXlBm() + "_" + leftSch.getLpName());
                 lpSet.add(rightSch.getXlBm() + "_" + rightSch.getLpName());
+
+                carSet.add(leftSch.getClZbh());
+                carSet.add(rightSch.getClZbh());
             }
             //重新计算路牌的起点应到时间
@@ -5183,6 +5187,12 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 ts.addAll(dayOfSchedule.updateQdzTimePlan(lpName));
             }
+            //重新就算车辆当前执行班次
+            for(String nbbm : carSet){
+                dayOfSchedule.reCalcExecPlan(nbbm);
+            }
+
+
             for (ScheduleRealInfo sch : ts) {
                 dayOfSchedule.save(sch);
             }
@@ -659,9 +659,10 @@
                     else if(ai==-1 && bi!=-1)
                         return 1;
                     else
-                        return a.name.localeCompare(b.name);
+                        return $.trim(a.name).localeCompare($.trim(b.name), 'zh-CN');
                 });
+                /**
                 /*var rs = {};
                 $.each(array, function () {
                     rs[this.code]=this.name;
@@ -300,7 +300,7 @@
                     else if(ai==-1 && bi!=-1)
                         return 1;
                     else
-                        return a.name.localeCompare(b.name);
+                        return $.trim(a.name).localeCompare($.trim(b.name), 'zh-CN');
                 });
                 return array;
             }
@@ -144,7 +144,7 @@ var gb_schedule_context_menu = (function () {
         jgtz: function (schArray) {
             //忽略进出场班次
             schArray =  schArray.filter(function (sch) {
-                return sch.bcType != 'in' && sch.bcType != 'out';
+                return sch.bcType != 'in' && sch.bcType != 'out' && sch.status!=-1;
             });
             var idArr = [], qdz = schArray[0].qdzCode;
@@ -153,7 +153,7 @@ var gb_schedule_context_menu = (function () {
                     idArr.push(this.id);
             });
-            var ps = '<div class="ps-help-panel"><small>1、忽略进出场班次</small><small>2、与选中的第一个班次起点站不同的也将被忽略</small></div>';
+            var ps = '<div class="ps-help-panel"><small>1、忽略进出场班次</small><small>2、与选中的第一个班次起点站不同的也将被忽略</small><small>3、忽略烂班</small></div>';
             var elem = UIkit.modal.prompt('请输入间隔（分钟）' + ps, 0, function (newValue) {
                 if (!isNaN(newValue) && newValue > 0) {
                     gb_common.$post_arr('/realSchedule/spaceAdjust', {ids: idArr, space: newValue}, function (rs) {