末二班车、到站时间大于发车时间页面和js,退出线调判断方式、撤销实发的时候撤销实到

ljq
1 parent cad8712b
Showing 11 changed files with 270 additions and 39 deletions
src/main/java/com/bsth/XDApplication.java
src/main/java/com/bsth/data/zndd/AutomaticSch.java
src/main/java/com/bsth/data/zndd/OutEntrance.java
src/main/java/com/bsth/data/zndd/ZnddMessage.java
src/main/java/com/bsth/data/zndd/ZnddTwoThread.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/service/zndd/impl/LoggerZnddServiceImpl.java
src/main/resources/static/real_control_v2/fragments/line_schedule/layout.html
src/main/resources/static/real_control_v2/fragments/line_schedule/sch_table.html
src/main/resources/static/real_control_v2/js/line_schedule/sch_table.js
src/main/resources/static/real_control_v2/js/zndd/data_zndd.js
@@ -275,7 +275,7 @@ public class XDApplication implements CommandLineRunner {
         //sexec.scheduleWithFixedDelay(fcxxUpdateThread, 160, 30, TimeUnit.SECONDS);//发车信息（发车屏、信息发布）
         //线路首末班数据（网关用，班次更新时写入）
         //com.bsth.data.schedule.f_a_l.FirstAndLastHandler
-        sexec.scheduleWithFixedDelay(schSiginUpdateDBThread, 160, 60 * 30, TimeUnit.SECONDS);//无法自动完成的班次信息（网关用，补信号）
+        //sexec.scheduleWithFixedDelay(schSiginUpdateDBThread, 160, 60 * 30, TimeUnit.SECONDS);//无法自动完成的班次信息（网关用，补信号）
         //运管处静态数据提交
         //log.info(timeDiff / 1000 / 60 + "分钟之后提交到运管处");
@@ -429,14 +429,14 @@ public class AutomaticSch {
     /**
      *每辆车倒数第二个班次执行之前3分钟提示
      */
-    public void TowdescSch(){
+    public void TowdescSch(int snt){ //snt开关用于控制执行方法 0末二班车 1发车时间小于到站时间
         logger.warn("末二班车执行方法开始");
         try {
             //获取所有线路
             Map<String, String> lineMap = BasicData.lineCode2NameMap;
             //findByNbbm车辆索引获取的班次
             Map<String, List<ScheduleRealInfo>> groupedByCity = new HashMap<>();
-            if(System.currentTimeMillis() < DateUtils.getTimestamp() + (1000 * 60 * 60 * 20)){
+            if(snt == 0 && System.currentTimeMillis() < DateUtils.getTimestamp() + (1000 * 60 * 60 * 20)){
                 logger.info("未到晚上8点----"+(DateUtils.getTimestamp() + (1000 * 60 * 60 * 20)));
                 return;
             }
@@ -462,19 +462,37 @@ public class AutomaticSch {
                 //判断倒数第二个班次是否快要发车
                 for (String key : mapType.keySet()) {
                     List<ScheduleRealInfo> carList = mapType.get(key);
-                    Collections.sort(carList, new ScheduleComparator.FCSJ());
-                    //倒数第二个班次保证数量超过两条
-                    ScheduleRealInfo scht = carList.size() >= 2 ? carList.get(carList.size() - 2) : null;
-                    if (scht == null)
-                        continue;
-
-                    if (scht.getDfsjT() > DateUtils.getTimestamp() + (1000 * 60 * 60 * 20) &&
-                            scht.getDfsjT() - System.currentTimeMillis() < (1000* 60 * 4) &&
-                            scht.getDfsjT() - System.currentTimeMillis() >= (1000* 60 *3)) {
-                        //推送一下
-                        ts(addStationPeople(scht,"DESCTWO",0l));
-
-                        LogerWait("末二班车推送",scht);
+                    if (snt == 1) {
+                        for (int i = 0; i < carList.size(); i++) {
+                            ScheduleRealInfo sr = carList.get(i);
+                            //2.到达时间大于发车时间
+                            if (i < carList.size() - 1) {
+                                ScheduleRealInfo src = carList.get(i + 1);
+                                if (sr.getZdsjActual() != null && src.getFcsjActual() != null && sr.getStatus() != -1 && src.getStatus() != -1) {
+                                    if (src.getFcsjActualTime() < sr.getZdsjActualTime()) {
+                                        ts(addStationPeople(src, "FCSJXZD", 0l));
+                                        LogerWait("班次发车时间小于到站时间", src);
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    if (snt == 0) {
+                        //倒数第二班方法
+                        Collections.sort(carList, new ScheduleComparator.FCSJ());
+                        //倒数第二个班次保证数量超过两条
+                        ScheduleRealInfo scht = carList.size() >= 2 ? carList.get(carList.size() - 2) : null;
+                        if (scht == null)
+                            continue;
+
+                        if (scht.getDfsjT() > DateUtils.getTimestamp() + (1000 * 60 * 60 * 20) &&
+                                scht.getDfsjT() - System.currentTimeMillis() < (1000 * 60 * 4) &&
+                                scht.getDfsjT() - System.currentTimeMillis() >= (1000 * 60 * 3)) {
+                            //推送一下
+                            ts(addStationPeople(scht, "DESCTWO", 0l));
+
+                            LogerWait("末二班车推送", scht);
+                        }
                     }
                 }
             }
@@ -484,6 +502,47 @@ public class AutomaticSch {
         }
     }
+    //班次发车时间小于到站时间
+    public void FCSJXZD(){
+       /* logger.warn("到达时间大于发车时间方法开始");
+        //获取所有线路
+
+        //findByNbbm车辆索引获取的
+        try {
+            //两种检测  1、当前班次的实发 小于 实到  2.下一班次的实发 小于 上一班次的实到
+
+            for (Map.Entry<String, String> t : lineMap.entrySet()) {
+                List<ScheduleRealInfo> srList = dayOfSchedule.findByLineCode(t.getKey());
+                for (int i = 0; i < srList.size(); i++) {
+                    ScheduleRealInfo sr = srList.get(i);
+                  *//*  //1.当前班次的实发 小于 实到
+                    if (sr.getFcsjActual() != null && sr.getZdsjActual() != null && sr.getStatus() != -1) {
+                        //提示
+                        if (sr.getFcsjActualTime() > sr.getZdsjActualTime()) {
+                            ts(addStationPeople(sr, "FCSJXZD", 0l));
+
+                            LogerWait("班次发车时间小于到站时间", sr);
+                        }
+
+                    }*//*
+                //2.到达时间大于发车时间
+                    if (i < srList.size() -1){
+                        ScheduleRealInfo src = srList.get(i + 1);
+                        if (sr.getZdsjActual() != null && src.getFcsjActual() != null && sr.getStatus() != -1 && src.getStatus() != -1){
+                            if (src.getFcsjActualTime() < sr.getZdsjActualTime()){
+                                ts(addStationPeople(sr, "FCSJXZD", 0l));
+                                LogerWait("班次发车时间小于到站时间", sr);
+                            }
+                        }
+                    }
+                }
+            }
+        }catch (Exception e){
+            logger.error("班次发车时间小于到站时间执行方法出错"+ e);
+        }*/
+
+    }
+
     public void ts(Map m) throws ParseException {
@@ -80,6 +80,9 @@ public class OutEntrance {
     @Autowired
     BasicData basicData;
+    @Autowired
+    ZnddMessage znddMessage;
+
      //调度屏小程序接口。
      @RequestMapping(value = "/OutCar", method = RequestMethod.POST)
      public Map OutCarOutCar(@RequestParam Map m,@RequestBody StationSignsLogger ssLogger) {
@@ -320,14 +323,14 @@ public class OutEntrance {
         return rtn;
     }
-/*
+
     //大客流消息测试接口
     @RequestMapping(value="/znMeeage",method = RequestMethod.GET)
     public Map znddMessagejk(@RequestParam Map m){
         Map rtn = new HashMap<>();
         try {
             List<ScheduleRealInfo> sr = dayOfSchedule.findByBcType(m.get("nbbm").toString(),"normal");
-            ZnddMessage.saveSch(sr.get(Integer.parseInt(m.get("num").toString())));
+            znddMessage.saveSch(sr.get(Integer.parseInt(m.get("num").toString())));
             rtn.put("status",ResponseCode.SUCCESS);
         } catch (Exception e) {
             rtn.put("err",ResponseCode.ERROR);
@@ -335,7 +338,7 @@ public class OutEntrance {
         }
         return rtn;
     }
-*/
+
+package com.bsth.data.zndd;
+
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+@RestController
+@RequestMapping("/znddmessage")
+public class ZnddMessage {
+
+    static   List<Map> LISTMAPALL= new ArrayList<>(); //返回给前台的班次情况
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+
+    public  void saveSch(ScheduleRealInfo sch){
+        Map m = new HashMap();
+        m.put("sch",sch);
+        //防止重复的
+        for (Map mm : LISTMAPALL){
+            ScheduleRealInfo sr = (ScheduleRealInfo) mm.get("sch");
+            if (sr.getClZbh().equals(sch.getClZbh())){
+                return;
+            }
+        }
+        LISTMAPALL.add(m);
+        handleAll();
+    }
+
+    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+
+     @RequestMapping(value="/messagelist",method = RequestMethod.GET)
+     public List<Map> listAll(){
+
+         handleAll();
+         return LISTMAPALL;
+     }
+
+     //新的请求处理一下
+     public void handleAll(){
+         for (Map m : LISTMAPALL){
+             ScheduleRealInfo sr = (ScheduleRealInfo) m.get("sch");
+             //1.离线 2.实发时间为空 3.已过待发时间还没发车的
+             long time = System.currentTimeMillis();//正常大客流添加班次也是在上下5分钟浮动，实际时间+10分钟
+             //超过待发时间  实发时间还是null的
+             // if (sr.getFcsjT() + (1000 * 60 * 10) < time && sr.getFcsjT() + (1000 * 60 * 10) > time) {   //实际使用  //测试注释
+             MessageStatus(sr, m);
+             m.put("sch", sr);
+             if (m.get("uuid") == null)
+                 m.put("uuid",AutomaticSch.UUID());
+             //   }
+
+             if (sr.getMessageDKL() ==  10){
+                 LISTMAPALL.remove(m);
+                 return;
+             }
+         }
+     }
+
+
+     public void MessageStatus(ScheduleRealInfo sch, Map map){
+
+        switch (sch.getMessageDKL()) {
+            case 0:
+                jsy(sch,map);
+                break;
+            case 1:
+                ts_car(sch,map);
+                break;
+            case 2:
+
+                break;
+            case 3:
+
+                break;
+            case 4:
+
+                break;
+
+        }
+     }
+
+
+     //下发驾驶员
+     public void jsy(ScheduleRealInfo sch, Map map){
+        try {
+            //暂无
+            sch.setMessageDKL(sch.getMessageDKL()+1);
+            if (map.get("j_sj") == null)
+                map.put("j_sj",sdf.format(new Date()));
+
+            MessageStatus(sch, map);//继续下一项
+        }catch (Exception e){
+            logger.info("下发驾驶员异常---",e);
+        }finally {
+            logger.info("驾驶员下发成功");
+        }
+     }
+
+     //下发车辆
+    public void ts_car(ScheduleRealInfo sch, Map map){
+        try {
+            //暂无
+            sch.setMessageDKL(sch.getMessageDKL()+1);
+            if (map.get("car_sj") == null)
+                map.put("car_sj",sdf.format(new Date()));
+
+            MessageStatus(sch, map);//继续下一项
+        }catch (Exception e){
+            logger.info("下发车辆异常---",e);
+        }finally {
+            logger.info("下发车辆成功");
+        }
+    }
+
+}
@@ -97,12 +97,19 @@ public class ZnddTwoThread extends Thread{
                         new Thread() {
                             @Override
                             public void run() {
-                                automaticSch.TowdescSch();
+                                automaticSch.TowdescSch(0);
                                 logger.info("末二班车执行完毕");
                             }
                         }.start();//启动线程
-
-
+                    }
+                    if (zs.getType().equals("fcsjxzd")) {
+                        new Thread() {
+                            @Override
+                            public void run() {
+                                automaticSch.TowdescSch(1);
+                                logger.info("到达时间大于发车时间执行完毕");
+                            }
+                        }.start();//启动线程
                     }
                 }
             }
@@ -1750,6 +1750,18 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             } else {
                 //日志记录
                 ScheduleModifyLogger.cxsf(sch);
+                //环线有可能把实到补上，实到存在的情况下 把实到也撤销掉
+                if (!sch.getZdsjActual().isEmpty()) {
+                    sch.clearZdsjActual();
+                    //清除路牌下一班起点到达时间
+                    ScheduleRealInfo next = dayOfSchedule.nextByLp(sch);
+                    if (null != next) {
+                        next.setQdzArrDatesj(null);
+                        ts.add(next);
+                    }
+                    //重新计算车辆执行班次
+                    dayOfSchedule.reCalcExecPlan(sch.getClZbh());
+                }
                 sch.clearFcsjActual();
                 rs.put("status", ResponseCode.SUCCESS);
@@ -250,8 +250,7 @@ public class LoggerZnddServiceImpl extends BaseServiceImpl&lt;LoggerZndd, Integer&gt; 
         return sch;
     }
-
-
+    //退出线调提示
     public String LineUserAll(@RequestParam Integer userId){
         String xlNames ="";
         RealControAuthority rcay = realControAuthorityService.findByUserId(userId);
@@ -260,7 +259,8 @@ public class LoggerZnddServiceImpl extends BaseServiceImpl&lt;LoggerZndd, Integer&gt; 
         for(String line : lineArray){
             List<ScheduleRealInfo>  schList = dayOfSchedule.findByLineCode(line);
             for(ScheduleRealInfo sc : schList){
-                if (sc.getStatus() == 0 || sc.getStatus() == 1){
+                //去除烂班、发车时间和实到时间都为null的时候
+                if (sc.getStatus() != -1 && (sc.getFcsjActual() == null || sc.getZdsjActual() == null)){
                     xlNames += sc.getXlName()+",";
                     break;
                 }
@@ -40,6 +40,7 @@
                 <span class="tl-xxsd">消息收到</span>
                 <span class="tl-xxrd">消息阅读</span>
                 <span class="tl-wfyd">无发有到</span>
+                <span class="tl-wd" style="width:  125px">实到-实发大于实到</span>
             </div>
             <div class="ct_title">
                 图例(RFID)
@@ -156,6 +156,14 @@
         </dd>
     </script>
+    <script id="line-schedule-dzsj-temp" type="text/html">
+        <dd class="{{if ddtype== 0}}>
+                  tl-wd
+            {{/if}}">
+            {{qdzArrDatesj ? qdzArrDatesj : ''}}
+        </dd>
+    </script>
+
     <script id="line-schedule-sfsj-temp" type="text/html">
         <dd data-uk-observe class="
     {{if status==-1}}
@@ -374,7 +374,8 @@ var gb_schedule_table = (function () {
         //车辆双击
         gb_schedule_table_dbclick.carCellClick($newDds3);
         $(dds[4]).text(sch.qdzArrDatejh ? sch.qdzArrDatejh : '');
-        $(dds[5]).text(sch.qdzArrDatesj ? sch.qdzArrDatesj : '');
+        var dzsjDd = $(temps['line-schedule-dzsj-temp'](sch));
+        $(dds[5]).replaceWith(dzsjDd);
         //计发时间
         var d5html = temps['line-schedule-fcsj-temp'](sch);
@@ -23,12 +23,12 @@ var gb_dataZndd = (function (){
         //时间格式化
         data.types = codes[data.type];
-      /*  if (data.type == 'SFTZ_1' && sf_tz(data.lineCode) == false){
+        if (data.type == 'SFTZ_1' && sf_tz(data.lineCode) == false){
             return
         }
-*/
-       if ((data.type == 'WD' || data.type == 'MZ' || data.type == 'FCJG' || data.type == 'DJG') && ycsf_sx(data.lineCode) == false){
+
+       if ((data.type == 'WD' || data.type == 'FCJG' || data.type == 'DJG') && ycsf_sx(data.lineCode) == false){
             return
         }
@@ -42,11 +42,18 @@ var gb_dataZndd = (function (){
             configureDkl();
             return;
         }
-
-        if (data.type == 'DESCTWO'){
+        //末二班车
+        if (data.type == 'DESCTWO' && mo_two(data.lineCode) == false){
             configurecell();
             return;
         }
+        //到站时间大于发车时间
+        if (data.type == 'FCSJXZD' && zdsj_sx(data.lineCode) == false){
+            var sch =data.sch;
+            sch.ddtype = 0;
+            gb_schedule_table.updateSchedule(sch);
+            return;
+        }
         configure();
@@ -131,19 +138,30 @@ var gb_dataZndd = (function (){
         }
         return  false;
     }
+    //末二班车、1009路，浦东33路、1096路
+    function mo_two(){
+        var t =['60019','80302','80301'];
+        for (var lines in t){
+            if(line == t[lines])
+                return true;
+        }
+        return  false;
+    }
+    //实发时间大于到站时间
+    //定制15线、申港3路、临港7路、新临专线、中运量3号线
+    function zdsj_sx(){
+        var t =['230608','60033','210810','200828','230718'];
+        for (var lines in t){
+            if(line == t[lines])
+                return true;
+        }
+        return  false;
+    }
-  /*  //演示-----大客流
-    $(".ys_dkl").click(function (){
-        folder = '/real_control_v2/zndd/yanshi';
-        open_modal(folder + '/yanshi.html', {
-        }, {center: true, bgclose: false, modal: true});
-
-    });
-*/
     //发车信息微调
     $pop.on('click', '.fcxxwts', function () {