update

潘钊
1 parent 8c1b17f9
Showing 24 changed files with 492 additions and 136 deletions
src/main/java/com/bsth/data/BasicData.java
src/main/java/com/bsth/data/gpsdata/GpsRealData.java
src/main/java/com/bsth/data/gpsdata/SignalStateData.java
src/main/java/com/bsth/data/gpsdata/arrival/GeoCacheData.java
src/main/java/com/bsth/data/gpsdata/arrival/SignalHandle.java
src/main/java/com/bsth/data/gpsdata/arrival/entity/RouteReverse.java
src/main/java/com/bsth/data/gpsdata/arrival/entity/SignalState.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/gpsdata/arrival/handlers/ReverseSignalHandle.java
src/main/java/com/bsth/data/gpsdata/arrival/utils/CircleQueue.java
src/main/java/com/bsth/data/gpsdata/arrival/utils/ScheduleSignalState.java
src/main/java/com/bsth/data/gpsdata/arrival/utils/SignalSchPlanMatcher.java
src/main/java/com/bsth/data/gpsdata/recovery/GpsDataRecovery.java
src/main/java/com/bsth/data/schedule/SchAttrCalculator.java
src/main/java/com/bsth/websocket/handler/SendUtils.java
src/main/resources/static/real_control_v2/css/line_schedule.css
src/main/resources/static/real_control_v2/fragments/line_schedule/sch_table.html
src/main/resources/static/real_control_v2/fragments/north/nav/signal_state_config.html
src/main/resources/static/real_control_v2/js/data/json/north_toolbar.json
@@ -45,7 +45,7 @@ public class BasicData implements CommandLineRunner {
     public static Map<String, String> stationCode2NameMap;
     //线路起终点对照（线路编码_上下行_起终点）  1024_0_B (1024上行起点)
-    public static Map<String, String> lineSEPointMap;
+    //public static Map<String, String> lineSEPointMap;
     //车辆和线路对照
     public static Map<String, Line> nbbm2LineMap;
@@ -66,7 +66,7 @@ public class GpsRealData implements CommandLineRunner {
     @Override
     public void run(String... arg0) throws Exception {
         logger.info("gpsDataLoader,20,5");
-        //Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 20, 5, TimeUnit.SECONDS);
+        //Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 20, 6, TimeUnit.SECONDS);
     }
     public void put(GpsEntity gps) {
 package com.bsth.data.gpsdata;
 import com.bsth.data.gpsdata.arrival.entity.SignalState;
+import com.bsth.websocket.handler.SendUtils;
 import com.google.common.base.Splitter;
 import com.google.common.collect.ArrayListMultimap;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import java.util.ArrayList;
@@ -15,11 +17,15 @@ import java.util.List;
 @Component
 public class SignalStateData {
+    @Autowired
+    SendUtils sendUtils;
+
     private static ArrayListMultimap<String, SignalState> listMultimap = ArrayListMultimap.create();
     public void put(SignalState state){
         listMultimap.put(state.getLineCode(), state);
         //推送到客户端
+        sendUtils.sendSignalState(state);
     }
     public List<SignalState> get(String idx){
@@ -29,8 +29,8 @@ public class GeoCacheData {
     static Logger logger = LoggerFactory.getLogger(GeoCacheData.class);
-    //每辆车缓存最后500条gps
-    private static final int CACHE_SIZE = 500;
+    //每辆车缓存最后1000条gps
+    private static final int CACHE_SIZE = 1000;
     private static Map<String, CircleQueue<GpsEntity>> gpsCacheMap = new HashMap<>();
     //线路路段走向
@@ -206,4 +206,16 @@ public class GeoCacheData {
         }
         return cds;
     }
+
+    /**
+     * 是不是终点站
+     * @param lineId
+     * @param upDown
+     * @param stationCode
+     * @return
+     */
+    public static boolean isEndStation(String lineId, Integer upDown, String stationCode) {
+        StationRoute station = routeCodeMap.get(lineId + "_" + upDown + "_" + stationCode);
+        return station != null && station.getMark().equals("E");
+    }
 }
 \ No newline at end of file
@@ -19,43 +19,44 @@ public abstract class SignalHandle {
         return prevs != null && prevs.size() > 0 && prevs.getTail() != null;
     }
+    protected boolean isDriftSignal(GpsEntity gps) {
+        return gps.getLat() == 0 || gps.getLon() == 0;
+    }
+
     /**
      * 是不是异常信号
      *
      * @param gps
-     * @return
-     */
-    protected boolean isAbnormal(GpsEntity gps) {
-        return gps.getLat() == 0 || gps.getLon() == 0;
-    }
+     * @return protected boolean isAbnormal(GpsEntity gps) {
+    return gps.getLat() == 0 || gps.getLon() == 0;
+    }*/
     /**
      * 连续异常信号个数统计
      *
      * @param prevs
-     * @return
+     * @return protected int abnormalCount(CircleQueue<GpsEntity> prevs) {
+     * int count = 0;
+     * <p>
+     * if (!isNotEmpty(prevs))
+     * return count;
+     * <p>
+     * GpsEntity[] array = (GpsEntity[]) prevs.getQueue();
+     * GpsEntity gps;
+     * for (int i = array.length - 1; i > 0; i--) {
+     * gps = array[i];
+     * <p>
+     * if (isAbnormal(gps))
+     * count++;
+     * else
+     * break;
+     * }
+     * <p>
+     * return count;
+     * }
      */
-    protected int abnormalCount(CircleQueue<GpsEntity> prevs) {
-        int count = 0;
-
-        if (!isNotEmpty(prevs))
-            return count;
-
-        GpsEntity[] array = (GpsEntity[]) prevs.getQueue();
-        GpsEntity gps;
-        for (int i = array.length - 1; i > 0; i--) {
-            gps = array[i];
-            if (isAbnormal(gps))
-                count++;
-            else
-                break;
-        }
-
-        return count;
-    }
-
-    protected void transformUpdown(GpsEntity gps, ScheduleRealInfo sch){
+    protected void transformUpdown(GpsEntity gps, ScheduleRealInfo sch) {
         int updown = Integer.parseInt(sch.getXlDir());
         List<StationRoute> srs = GeoCacheData.getStationRoute(sch.getXlBm(), updown);
         StationRoute station = GeoUtils.gpsInStation(gps, srs);
@@ -64,4 +65,25 @@ public abstract class SignalHandle {
             gps.setStopNo(station.getCode());
         }
     }
+
+    /**
+     * 是否是从异常状态恢复的第一个信号
+     *
+     * @param gps
+     * @param prevs
+     * @return
+     */
+    protected boolean abnormalRecovery(GpsEntity gps, CircleQueue<GpsEntity> prevs) {
+        if (prevs == null || prevs.size() == 0)
+            return false;
+
+        GpsEntity prev = prevs.getTail();
+        //从漂移状态恢复
+        if (isDriftSignal(prev)
+                && !isDriftSignal(gps)) {
+            return true;
+        }
+
+        return false;
+    }
 }
 \ No newline at end of file
@@ -24,6 +24,9 @@ public class RouteReverse {
     //是否闭合
     private boolean close;
+    //信号不明确
+    private boolean vague;
+
     public int getCount() {
         return count;
     }
@@ -79,4 +82,12 @@ public class RouteReverse {
     public void setNbbm(String nbbm) {
         this.nbbm = nbbm;
     }
+
+    public boolean isVague() {
+        return vague;
+    }
+
+    public void setVague(boolean vague) {
+        this.vague = vague;
+    }
 }
 \ No newline at end of file
@@ -15,7 +15,7 @@ public class SignalState {
     private Long st;
-    private Long checkTime;
+    //private Long checkTime;
     private Long schId;
@@ -37,10 +37,13 @@ public class SignalState {
      * @return
      */
     public static SignalState reverseSignalSTate(ScheduleRealInfo sch, RouteReverse reverse) {
+        if(reverse.isVague())
+            return null;
+
         SignalState state = new SignalState();
         state.setSchId(sch.getId());
         state.setType("route_reverse");
-        state.setCheckTime(System.currentTimeMillis());
+        //state.setCheckTime(System.currentTimeMillis());
         String stationName = BasicData.stationCode2NameMap.get(sch.getXlBm() + "_" + sch.getXlDir() + "_" + reverse.getTurned());
         state.setText(fmtHHmm.print(reverse.getZt()) + " 从 " + stationName + " 站掉头");
@@ -50,26 +53,19 @@ public class SignalState {
         return state;
     }
-    public static SignalState abnormalSignalSTate(ScheduleRealInfo sch, SignalAbnormal signalAbnormal){
+    public static SignalState abnormalSignalSTate(ScheduleRealInfo sch, SignalAbnormal signalAbnormal) {
         SignalState state = new SignalState();
         state.setSchId(sch.getId());
         state.setType("abnormal_signal");
-        state.setCheckTime(signalAbnormal.getCt());
+        //state.setCheckTime(signalAbnormal.getCt());
         state.setLineCode(sch.getXlBm());
-        String text = "信号";
+        String text = (fmtHHmm.print(signalAbnormal.getSt()) + " ~ " + fmtHHmm.print(signalAbnormal.getEt()));
         String abnormType = signalAbnormal.getAbnormalType();
-        if(abnormType.equals("drift"))
-            text += "漂移";
-        else if(abnormType.equals("reconnection"))
-            text += "掉线";
-
-        text += ("至" + fmtHHmm.print(signalAbnormal.getEt()) + "恢复正常");
-
-        if(signalAbnormal.getOutOrIn() == 0)
-            text += "约在 00:00 分左右发车";
-        else if(signalAbnormal.getOutOrIn() == 1)
-            text += "约在 00:00 分左右到达终点";
+        if (abnormType.equals("drift"))
+            text += "（GPS无效）";
+        else if (abnormType.equals("reconnection"))
+            text += "（信号丢失）";
         state.setText(text);
         state.setSignalAbnormal(signalAbnormal);
@@ -84,15 +80,6 @@ public class SignalState {
         this.type = type;
     }
-    public long getCheckTime() {
-        return checkTime;
-    }
-
-    public void setCheckTime(long checkTime) {
-        this.checkTime = checkTime;
-    }
-
-
     public long getSchId() {
         return schId;
     }
@@ -5,11 +5,13 @@ import com.bsth.data.gpsdata.GpsEntity;
 import com.bsth.data.gpsdata.arrival.SignalHandle;
 import com.bsth.data.gpsdata.arrival.utils.CircleQueue;
 import com.bsth.data.gpsdata.arrival.utils.ScheduleSignalState;
+import com.bsth.data.gpsdata.arrival.utils.SignalSchPlanMatcher;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.realcontrol.LineConfig;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.service.directive.DirectiveService;
 import com.bsth.websocket.handler.SendUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -39,8 +41,22 @@ public class InOutStationSignalHandle extends SignalHandle{
     @Autowired
     ScheduleSignalState scheduleSignalState;
+    @Autowired
+    SignalSchPlanMatcher signalSchPlanMatcher;
+
+    private final static int MAX_BEFORE_TIME = 1000 * 60 * 72;
+
     @Override
     public boolean handle(GpsEntity gps, CircleQueue<GpsEntity> prevs) {
+        //忽略漂移信号
+        if(isDriftSignal(gps))
+            return false;
+
+        //从异常状态恢复的第一个信号
+        if(abnormalRecovery(gps, prevs)){
+            //回溯一下之前的轨迹
+            scheduleSignalState.signalRetrospect(gps);
+        }
         if(isNotEmpty(prevs)){
             GpsEntity prev = prevs.getTail();
@@ -90,11 +106,23 @@ public class InOutStationSignalHandle extends SignalHandle{
         ScheduleRealInfo sch = dayOfSchedule.executeCurr(gps.getNbbm());
         String qdzCode = sch.getQdzCode();
+        //首班出场最多提前1.2小时
+        if(dayOfSchedule.isFirstOut(sch) && sch.getDfsjT() - gps.getTimestamp() > MAX_BEFORE_TIME)
+            return;
         //起点发车
         if(qdzCode != null && prev.getStopNo().equals(qdzCode)
                 && !willDepart(gps, prev, sch)){
+            //发车班次匹配
+            signalSchPlanMatcher.outMatch(gps, sch);
+            sch = dayOfSchedule.executeCurr(gps.getNbbm());
+
+            //实发时间不覆盖
+            if(StringUtils.isNotEmpty(sch.getFcsjActual()))
+                return;
+
+            //实发时间
             sch.setFcsjActualAll(gps.getTimestamp());
             //通知客户端
             sendUtils.sendFcsj(sch);
@@ -106,7 +134,7 @@ public class InOutStationSignalHandle extends SignalHandle{
             logger.info("班次：" + sch.getDfsj() + "发车， 时间：" + sch.getFcsjActual());
         }
         else if(sch.getBcType().equals("out")){
-            ScheduleRealInfo next = dayOfSchedule.next(sch);
+            ScheduleRealInfo next = dayOfSchedule.nextSame(sch);
             if(prev.getStopNo().equals(next.getQdzCode())){
                 //发下一个班次
                 dayOfSchedule.addExecPlan(next);
@@ -115,14 +143,15 @@ public class InOutStationSignalHandle extends SignalHandle{
         }
     }
+
     private void outStationAndOutPark(ScheduleRealInfo sch){
         LineConfig config = lineConfigData.get(sch.getXlBm());
         if (config != null && config.getOutConfig() == 2) {
             //出站既出场
             ScheduleRealInfo schPrev = dayOfSchedule.prev(sch);
             if (schPrev != null && schPrev.getBcType().equals("out")) {
-                schPrev.setFcsjActualAll(sch.getFcsjActual());
-                schPrev.setZdsjActualAll(sch.getFcsjActual());
+                schPrev.setFcsjActualAll(sch.getFcsjActualTime());
+                schPrev.setZdsjActualAll(sch.getFcsjActualTime());
                 sendUtils.refreshSch(schPrev);
             }
@@ -139,6 +168,10 @@ public class InOutStationSignalHandle extends SignalHandle{
         if(gps.getStopNo().equals(sch.getZdzCode())){
+            //实达时间不覆盖
+            if(StringUtils.isNotEmpty(sch.getZdsjActual()))
+                return;
+
             sch.setZdsjActualAll(gps.getTimestamp());
             //已完成班次数
             int doneSum = dayOfSchedule.doneSum(sch.getClZbh());
@@ -148,7 +181,7 @@ public class InOutStationSignalHandle extends SignalHandle{
             //持久化
             dayOfSchedule.save(sch);
             //下发调度指令
-            //directiveService.send60Dispatch(next, doneSum, "到站@系统");
+            directiveService.send60Dispatch(next, doneSum, "到站@系统");
             //准备执行下一个班次
             if (next != null) {
@@ -174,8 +207,8 @@ public class InOutStationSignalHandle extends SignalHandle{
         LineConfig config = lineConfigData.get(sch.getXlBm());
         if (next.getBcType().equals("in") &&
                 config != null && config.getOutConfig() == 2) {
-            next.setFcsjActualAll(sch.getZdsjActual());
-            next.setZdsjActualAll(sch.getZdsjActual());
+            next.setFcsjActualAll(sch.getZdsjActualTime());
+            next.setZdsjActualAll(sch.getZdsjActualTime());
             sendUtils.refreshSch(next);
         }
@@ -22,7 +22,7 @@ public class OfflineSignalHandle extends SignalHandle{
     @Override
     public boolean handle(GpsEntity gps, CircleQueue<GpsEntity> prevs) {
         //漂移信号不管
-        if(gps.getLat() == 0 || gps.getLon() == 0){
+        if(isDriftSignal(gps)){
             gps.setSignalState("drift");
             return true;
         }
@@ -38,7 +38,9 @@ public class ReverseSignalHandle extends SignalHandle {
         if (isReverse(gps, prev)) {
             RouteReverse reverse = reverseSearch(prevs, gps);
-            if (reverse.getCount() >= 4) {
+            if (reverse.getCount() >= 4
+                    && reverse.isClose()
+                    && !GeoCacheData.isEndStation(gps.getLineId(), gps.getUpDown(), reverse.getTurned())) {
                 scheduleSignalState.reverseAnalyse(reverse);
             }
         }
@@ -57,6 +59,7 @@ public class ReverseSignalHandle extends SignalHandle {
         int count = 0;
         String path = "";
         long zt = 0L;
+        boolean half = false;
         //当前站点
         StationRoute curr = GeoCacheData.getRouteCode(gps), sr;
@@ -73,13 +76,17 @@ public class ReverseSignalHandle extends SignalHandle {
                 sr = GeoCacheData.getRouteCode(prev);
                 if (sr.getRouteSort() > curr.getRouteSort()) {
+                    if(half){
+                        routeReverse.setVague(true);
+                    }
+
                     path += (curr.getCode() + ",");
                     count++;
                     zt = prev.getTimestamp();
-                }
-                else if (sr.getRouteSort() < curr.getRouteSort()) {
-                    if(routeReverse.getTurned() == null){
+                } else if (sr.getRouteSort() < curr.getRouteSort()) {
+                    if (routeReverse.getTurned() == null) {
                         routeReverse.setTurned(curr.getCode());
+                        half = true;
                     }
                     path += (curr.getCode() + ",");
@@ -105,8 +105,8 @@ public class CircleQueue&lt;T&gt; {
                 }
             }
         } else {
-            elementDataSort = new Object[tail];
-            for (int i = 0; i < tail; i++) {
+            elementDataSort = new Object[tail + 1];
+            for (int i = 0; i <= tail; i++) {
                 elementDataSort[i] = elementDataCopy[i];
             }
         }
@@ -104,8 +104,12 @@ public class ScheduleSignalState {
         }
     }
+    public void signalRetrospect(GpsEntity gps) {
+        signalRetrospect(gps, dayOfSchedule.executeCurr(gps.getNbbm()));
+    }
+
     /**
-     * 有到离站无发车时信号追溯
+     * 信号追溯
      *
      * @param gps
      * @param sch
@@ -113,15 +117,15 @@ public class ScheduleSignalState {
     public void signalRetrospect(GpsEntity gps, ScheduleRealInfo sch) {
         //回放数据，是否有掉线或者漂移
         CircleQueue<GpsEntity> queue = GeoCacheData.getGps(gps.getNbbm());
-        if (queue == null || queue.size() == 0 || gps.getInstation() == 0)
+        if (queue == null || queue.size() == 0 /*|| gps.getInstation() == 0*/)
             return;
         //起始时间点
         long st = 0;
         ScheduleRealInfo prev = dayOfSchedule.prev(sch);
-        if(prev != null){
-            if(prev.getZdsjActual() != null)
+        if (prev != null) {
+            if (prev.getZdsjActual() != null)
                 st = prev.getZdsjActualTime();
             else
                 st = (GeoCacheData.midwayStation(gps.getLineId(), gps.getUpDown(), sch.getQdzCode(), gps.getStopNo()).size() + 1) * (1000 * 60 * 5);
@@ -136,34 +140,112 @@ public class ScheduleSignalState {
         String gpsState = "";
         GpsEntity tempGps, nearGps = null;
-        for (int i = len - 1; i > 0; i--) {
+        int i = len - 1;
+        for (; i >= 0; i--) {
             tempGps = (GpsEntity) array[i];
             gpsState = tempGps.getSignalState();
-            if(gpsState.equals("drift")){
+            if (gpsState.equals("truncation"))
+                break;
+            else if (gpsState.equals("drift")) {
                 nearGps = (GpsEntity) array[i + 1];
                 break;
-            }
-            else if(gpsState.equals("reconnection")){
+            } else if (gpsState.equals("reconnection")) {
                 nearGps = tempGps;
                 break;
             }
-            if(tempGps.getTimestamp() < st)
+            if (tempGps.getTimestamp() < st)
                 break;
         }
-        if(nearGps != null){
-            SignalAbnormal signalAbnormal = new SignalAbnormal();
-            signalAbnormal.setCt(gps.getTimestamp());
-            signalAbnormal.setEt(nearGps.getTimestamp());
-            signalAbnormal.setAbnormalType(gpsState);
-            signalAbnormal.setDestCode(sch.getQdzCode());
-            signalAbnormal.setOutOrIn(0);
+        if (nearGps != null && i > 0) {
+            createSignalAbnormal(gpsState, nearGps, i, array, sch);
+        }
+    }
-            //记录信号状态
-            SignalState signalState = SignalState.abnormalSignalSTate(sch, signalAbnormal);
-            signalStateData.put(signalState);
+    private void createSignalAbnormal(String gpsState, GpsEntity nearGps, int i, Object[] array, ScheduleRealInfo sch) {
+        switch (gpsState) {
+            case "drift":
+                driftSignalAbnormal(nearGps, i, array, sch);
+                break;
+            case "reconnection":
+                offlineSignalAbnormal(nearGps, ((GpsEntity) array[i - 1]), sch);
+                break;
         }
     }
+
+    /**
+     * 掉线异常状态记录
+     *
+     * @param e
+     * @param s
+     */
+    private void offlineSignalAbnormal(GpsEntity e, GpsEntity s, ScheduleRealInfo sch) {
+        long st = s.getTimestamp(), et = e.getTimestamp();
+
+        //掉线超过10分钟才记录
+        if (et - st < (1000 * 60 * 10))
+            return;
+
+        SignalAbnormal signalAbnormal = new SignalAbnormal();
+        signalAbnormal.setSt(st);
+        signalAbnormal.setEt(et);
+        signalAbnormal.setAbnormalType("reconnection");
+        signalAbnormal.setDestCode(sch.getQdzCode());
+        signalAbnormal.setOutOrIn(0);
+
+        //截断GPS
+        e.setSignalState("truncation");
+
+        //记录信号状态
+        SignalState signalState = SignalState.abnormalSignalSTate(sch, signalAbnormal);
+        signalStateData.put(signalState);
+    }
+
+    /**
+     * 漂移异常状态记录
+     *
+     * @param nearGps
+     * @param i
+     * @param array
+     */
+    private void driftSignalAbnormal(GpsEntity nearGps, int i, Object[] array, ScheduleRealInfo sch) {
+        GpsEntity gps, s = null;
+        //找到漂移开始时间
+        for (; i >= 0; i--) {
+            gps = (GpsEntity) array[i];
+
+            if (!gps.getSignalState().equals("drift") || i == 0
+                    || gps.getSignalState().equals("truncation")) {
+                s = gps;
+                break;
+            }
+        }
+
+        long st = s.getTimestamp(), et = nearGps.getTimestamp();
+        if (et - st < (1000 * 60 * 3))
+            return;
+        /*if (s != null){
+            st = s.getTimestamp();
+            //漂移小于3分钟
+            if(et - st < (1000 * 60 * 3))
+                return;
+        }*/
+
+
+        SignalAbnormal signalAbnormal = new SignalAbnormal();
+        signalAbnormal.setSt(st);
+        signalAbnormal.setEt(et);
+        signalAbnormal.setAbnormalType("drift");
+        signalAbnormal.setDestCode(sch.getQdzCode());
+        signalAbnormal.setOutOrIn(0);
+
+        //截断GPS
+        nearGps.setSignalState("truncation");
+
+        //记录信号状态
+        SignalState signalState = SignalState.abnormalSignalSTate(sch, signalAbnormal);
+        signalStateData.put(signalState);
+    }
 }
+package com.bsth.data.gpsdata.arrival.utils;
+
+import com.bsth.data.gpsdata.GpsEntity;
+import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 班次匹配器
+ * Created by panzhao on 2016/12/31.
+ */
+@Component
+public class SignalSchPlanMatcher {
+
+    @Autowired
+    DayOfSchedule dayOfSchedule;
+
+    /**
+     * 发车信号匹配
+     * @param outSigal
+     * @param sch
+     * @return
+     */
+    public void outMatch(GpsEntity outSigal, ScheduleRealInfo sch){
+        long t = outSigal.getTimestamp();
+        if(t < sch.getDfsjT())
+            return;
+
+        //下一个相同走向的班次
+        ScheduleRealInfo next = dayOfSchedule.nextSame(sch);
+        if(next == null || !next.getQdzCode().equals(sch.getQdzCode()))
+            return;
+
+        //晚于班次间隔百分之70，跳下一个班次
+        double s = (int) (next.getDfsjT() - sch.getDfsjT());
+        double r = (int) (t - sch.getDfsjT());
+        if(r / s > 0.7){
+            dayOfSchedule.addExecPlan(next);
+            outMatch(outSigal, next);
+        }
+    }
+}
@@ -60,7 +60,7 @@ public class GpsDataRecovery implements ApplicationContextAware {
         for (String nbbm : keys) {
             Collections.sort(listMap.get(nbbm), comp);
             threadPool.execute(new RecoveryThread(listMap.get(nbbm), count));
-            /*if(nbbm.equals("SXC-YD009"))
+            /*if(nbbm.equals("YT-CD008"))
                 new RecoveryThread(listMap.get(nbbm), count).run();*/
         }
@@ -150,8 +150,6 @@ public class GpsDataRecovery implements ApplicationContextAware {
                 CircleQueue<GpsEntity> prevs;
                 for (GpsEntity gps : list) {
-                   /* if(gps.getTimestamp() == 1483081260000L)
-                        System.out.println("aaa");*/
                     prevs = GeoCacheData.getGps(gps.getNbbm());
                     //掉线处理
@@ -166,6 +164,8 @@ public class GpsDataRecovery implements ApplicationContextAware {
                     //进出站动作处理
                     inOutStationSignalHandle.handle(gps, prevs);
                     GeoCacheData.putGps(gps);
+
+                    //Thread.sleep(50);
                 }
             } catch (Exception e) {
                 logger.error("", e);
@@ -62,13 +62,13 @@ public class SchAttrCalculator {
 				sch.setDfsjAll(fmtyyyyMMddHHmm.parseMillis(sch.getScheduleDateStr()+sch.getDfsj()));
 			//實發時間
-			if(sch.getFcsjActual() != null &&
+			if(StringUtils.isNotEmpty(sch.getFcsjActual()) &&
 					sch.getFcsjActual().compareTo(conf.getStartOpt()) < 0){
 				sch.setFcsjActualAll(fmtyyyyMMddHHmm.parseMillis(sch.getScheduleDateStr()+sch.getFcsjActual()) + DAY_TIME);
 			}
 			//實際終點時間
-			if(sch.getZdsjActual() != null &&
+			if(StringUtils.isNotEmpty(sch.getZdsjActual()) &&
 					sch.getZdsjActual().compareTo(conf.getStartOpt()) < 0){
 				sch.setZdsjActualAll(fmtyyyyMMddHHmm.parseMillis(sch.getScheduleDateStr()+sch.getZdsjActual()) + DAY_TIME);
 			}
@@ -3,7 +3,7 @@ package com.bsth.websocket.handler;
 import com.alibaba.fastjson.JSONObject;
 import com.bsth.data.BasicData;
 import com.bsth.data.LineConfigData;
-import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.data.gpsdata.arrival.entity.SignalState;
 import com.bsth.entity.directive.D80;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -98,12 +98,30 @@ public class SendUtils{
 			logger.error("", e);
 		}
 	}
+
+	/**
+	 * 推送班次信号状态
+	 * @param state
+	 */
+	public void sendSignalState(SignalState state){
+		Map<String, Object> map = new HashMap<>();
+		map.put("fn", "signal_state");
+		map.put("data", state);
+
+		ObjectMapper mapper = new ObjectMapper();
+
+		try {
+			socketHandler.sendMessageToLine(state.getLineCode(), mapper.writeValueAsString(map));
+		} catch (Exception e) {
+			logger.error("", e);
+		}
+	}
 	/**
 	 * 
 	 * @Title: shiftSchedule 
 	 * @Description: TODO(线路翻班通知) 
-	 */
+
 	public void shiftSchedule(String lineCode){
 		Map<String, Object> map = new HashMap<>();
 		map.put("fn", "systemNotice");
@@ -119,7 +137,7 @@ public class SendUtils{
 			logger.error("", e);
 		}
 	}
-	
+	 */
 	/**
 	 * 
 	 * @Title: sendDirectiveToPage 
@@ -528,6 +528,7 @@ div.drop-rail[data-type=&quot;car&quot;]:before {
 dl.relevance-active dd:nth-child(n+2) {
     background: #f1efef !important;
+    color: #333;
 }
 dl.relevance-active.intimity dd:nth-child(n+2) {
@@ -1032,14 +1033,17 @@ i.signal_state_icon{
     position: absolute;
     right: 5px;
     top: 7px;
-    color: #e85252 !important;
     box-shadow: 0px 0px 11px 0 rgba(0, 0, 0, 0.2), -1px 3px 8px 0 rgba(0, 0, 0, 0.19);
     text-indent: 0;
     border-radius: 15px;
     cursor: pointer;
 }
+i.signal_state_icon.uk-icon-question-circle{
+    color: #e85252 !important;
+}
+
 i.signal_state_icon.uk-icon-reply{
-    color: #4134e3;
+    color: #4134e3 !important;
     box-shadow: none;
 }
 \ No newline at end of file
@@ -130,7 +130,7 @@
     </script>
     <script id="line-schedule-sfsj-temp" type="text/html">
-        <dd class="
+        <dd data-uk-observe class="
     {{if status==-1}}
       tl-qrlb
     {{else if status==2}}
+<div class="uk-modal ct-form-modal" id="signal_state_config-modal">
+    <div class="uk-modal-dialog" style="width: 530px;">
+        <a href="" class="uk-modal-close uk-close"></a>
+        <div class="uk-modal-header">
+            <h2>信号标记设置</h2></div>
+
+        <p style="border-bottom: 1px solid #efefef;color: grey;padding-bottom: 9px;">
+            <small>
+                <i class="uk-icon-question-circle"> </i>
+                设置项将会保存在本地客户端，清理缓存和更换电脑会重置.</small>
+        </p>
+        <form class="uk-form uk-form-horizontal">
+            <div class="uk-grid">
+                <div class="uk-width-2-3 uk-container-center">
+                    <div class="uk-form-row">
+                        <label class="uk-form-label">是否启用</label>
+                        <div class="uk-form-controls">
+                            <select name="enable">
+                                <option value="1">启用</option>
+                                <option value="0">禁用</option>
+                            </select>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <div class="uk-modal-footer uk-text-right" style="margin-bottom: -20px;">
+                <button type="button" class="uk-button uk-modal-close">取消</button>
+                <button type="submit" class="uk-button uk-button-primary"><i class="uk-icon-check"></i> &nbsp;保存</button>
+            </div>
+        </form>
+    </div>
+
+    <script>
+        (function() {
+            var modal = '#signal_state_config-modal';
+            var f = $('form', modal);
+
+            $(modal).on('init', function(e, data) {
+                var val = gb_signal_state.isEnable()?1:0;
+                $('[name=enable]', f).val(val);
+            });
+
+            f.formValidation(gb_form_validation_opts);
+            f.on('success.form.fv', function(e) {
+                e.preventDefault();
+                var data = $(this).serializeJSON();
+
+                if(data.enable=='1')
+                    gb_signal_state.enable();
+                else
+                    gb_signal_state.disable();
+
+                UIkit.modal(modal).hide();
+            });
+
+        })();
+    </script>
+</div>
 \ No newline at end of file
@@ -93,6 +93,11 @@
         "id": 3.1,
         "text": "TTS",
         "event": "tts_config"
+      },
+      {
+        "id": 3.2,
+        "text": "信号标记",
+        "event": "signal_state"
       }
     ]
   }
@@ -236,6 +236,8 @@ var gb_schedule_table = (function () {
         else
             $(dds[8]).html('');
+        //信号状态标记
+        gb_signal_state.marker_sch(sch);
         //班次是车辆的最后一班
         if(dl.hasClass('dl-last-sch'))
             markerLastSch([sch]);
@@ -71,6 +71,9 @@ var gb_northToolbar = (function() {
     },
     gps_play_back: function () {
       gb_map_play_back.initParams();
+    },
+    signal_state: function () {
+      open_modal('/real_control_v2/fragments/north/nav/signal_state_config.html', {}, modal_opts);
     }
   }
 })();
@@ -3,41 +3,97 @@
  * @type {{}}
  */
 var gb_signal_state = (function () {
+    var storage = window.localStorage;
     $(document).on('click', 'i.signal_state_icon', function (e) {
         e.stopPropagation();
     });
     var signal_state_data = {};
+    var enable = true;
+    //读取本地状态
+    var locStatus = storage.getItem("signal_state_enable");
+    if (locStatus && locStatus=='0')
+        enable = false;
     var init = function () {
         $.get('/signalState/multi', {idx: gb_data_basic.line_idx}, function (rs) {
             //按班次ID分组
             signal_state_data = gb_common.groupBy(rs, 'schId');
-            console.log('信号数据', signal_state_data);
-            $.each(rs, function () {
-                renderIcon(this);
-            });
-            //for(var schId)
+            for (var schId in signal_state_data) {
+                multi_render(signal_state_data[schId]);
+            }
         });
     };
-    var renderIcon = function (sState) {
-        var sch = gb_schedule_table.findScheduleByLine(sState.lineCode)[sState.schId];
+    var multi_render = function (list) {
+        if (!enable)
+            return;
+
+        if (!list || list.length == 0)
+            return;
+        var line = list[0].lineCode
+            , schId = list[0].schId;
+
+        var sch = gb_schedule_table.findScheduleByLine(line)[schId];
         var dl = gb_schedule_table.getDl(sch);
+        var icon = 'question-circle';
+        var t = '';
+        $.each(list, function () {
+            t += (this.text + '<br>');
+        });
+
+        if (list.length == 1 && list[0].type == 'route_reverse')
+            icon = 'reply';
         var dd = $('dd.fcsjActualCell', dl);
-        $('i.signal_state_icon', dd).remove();
-        var icon='question-circle';
+        var se = $('i.signal_state_icon', dd);
+        if (se && se.length > 0)
+            se.remove();
-        if(sState.type=='route_reverse')
-            icon = 'reply';
+        dd.append('<i data-uk-tooltip title="' + t + '" class="uk-icon-' + icon + ' signal_state_icon"></i>');
+    };
-        dd.append('<i data-uk-tooltip title="'+sState.text+'" class="uk-icon-'+icon+' signal_state_icon"></i>');
+    var put = function (obj) {
+        if (!signal_state_data[obj.schId]) {
+            signal_state_data[obj.schId] = [];
+        }
+
+        signal_state_data[obj.schId].push(obj);
+        multi_render(signal_state_data[obj.schId]);
+    };
+
+    var marker_sch = function (sch) {
+        var list = signal_state_data[sch.id];
+        if (list) {
+            multi_render(list);
+        }
+    };
+
+    var clearAll = function () {
+        $('.signal_state_icon').remove();
     };
     return {
-        init: init
+        init: init,
+        put: put,
+        marker_sch: marker_sch,
+        isEnable: function () {
+            return enable;
+        },
+        disable: function () {
+            enable = false;
+            storage.setItem("signal_state_enable", 0);
+
+            clearAll();
+        },
+        enable: function () {
+            enable = true;
+            storage.setItem("signal_state_enable", 1);
+            for (var schId in signal_state_data) {
+                multi_render(signal_state_data[schId]);
+            }
+        }
     };
 })();
 \ No newline at end of file
@@ -26,7 +26,7 @@ var gb_sch_websocket = (function () {
         var data = {
             operCode: 'register_line',
             idx: gb_data_basic.line_idx
-        }
+        };
         schSock.send(JSON.stringify(data));
         console.log('regListen....', data);
     }
@@ -45,21 +45,21 @@ var gb_sch_websocket = (function () {
     var calcUntreated = function (lineCode) {
         var size = $('li.line_schedule[data-id=' + lineCode + '] .sys-mailbox .sys-mail-item').length;
         $('#badge_untreated_num_' + lineCode).text(size);
-    }
+    };
     var calcUntreatedAll = function () {
         $('#main-tab-content li.line_schedule').each(function () {
             calcUntreated($(this).data('id'));
         });
-    }
+    };
     //80协议上报
     var report80 = function (msg) {
         msg.dateStr = moment(msg.timestamp).format('HH:mm');
         msg.text = gb_common.reqCode80[msg.data.requestCode];
-        if(!msg.text)
-            msg.text='（未知的请求码 '+msg.data.requestCode+'）';
+        if (!msg.text)
+            msg.text = '（未知的请求码 ' + msg.data.requestCode + '）';
         var $item = $(temps['sys-note-80-temp'](msg));
         findMailBox(msg.data.lineId).prepend($item);
@@ -68,7 +68,7 @@ var gb_sch_websocket = (function () {
         gb_tts.speak(ttsMsg, msg.data.lineId);
         calcUntreated(msg.data.lineId);
-    }
+    };
     var waitRemoves = [];
     //车辆发出
@@ -89,7 +89,7 @@ var gb_sch_websocket = (function () {
         gb_schedule_table.calc_yfwf_num(msg.t.xlBm);
         calcUntreated(msg.t.xlBm);
-    }
+    };
     //到达终点
     var zhongDian = function (msg) {
@@ -107,20 +107,20 @@ var gb_sch_websocket = (function () {
         gb_tts.speak(ttsMsg, msg.t.xlBm);
         calcUntreated(msg.t.xlBm);
-    }
+    };
     //服务器通知刷新班次
     var refreshSch = function (msg) {
         gb_schedule_table.updateSchedule(msg.ts);
         /*//重新计算应发未发
-        var idx={};
-        $.each(msg.ts, function(i, t){
-            if(idx[t.xlBm])
-                return true;
-            gb_schedule_table.calc_yfwf_num(t.xlBm);
-            idx[t.xlBm]=1;
-        });*/
-    }
+         var idx={};
+         $.each(msg.ts, function(i, t){
+         if(idx[t.xlBm])
+         return true;
+         gb_schedule_table.calc_yfwf_num(t.xlBm);
+         idx[t.xlBm]=1;
+         });*/
+    };
     //80消息确认
     var d80Confirm = function (msg) {
@@ -129,12 +129,17 @@ var gb_sch_websocket = (function () {
         calcUntreated(msg.lineId);
         //重新计算应发未发
         gb_schedule_table.calc_yfwf_num(msg.lineId);
-    }
+    };
     //指令状态改变
-    var directiveStatus = function(msg){
+    var directiveStatus = function (msg) {
         gb_schedule_table.updateSchedule(msg.t);
-    }
+    };
+
+    //班次信号状态
+    var signalState = function (msg) {
+        gb_signal_state.put(msg.data);
+    };
     var msgHandle = {
         report80: report80,
@@ -142,8 +147,9 @@ var gb_sch_websocket = (function () {
         zhongDian: zhongDian,
         refreshSch: refreshSch,
         d80Confirm: d80Confirm,
-        directive: directiveStatus
-    }
+        directive: directiveStatus,
+        signal_state: signalState
+    };
     function currentSecond() {
         return Date.parse(new Date()) / 1000;
@@ -167,15 +173,15 @@ var gb_sch_websocket = (function () {
         $(this).parents('.sys-note-42').remove();
         var size = $(this).parents('.sys-mailbox').find('.sys-mail-item').length
-            ,lineCode = $(this).parents('li.line_schedule').data('id');
+            , lineCode = $(this).parents('li.line_schedule').data('id');
         $('#badge_untreated_num_' + lineCode).text(size);
     });
     //42消息点击
     $(document).on('click', '.sys-mailbox .sys-note-42', function () {
-        var lineCode=$(this).parents('li.line_schedule').data('id')
-            ,id=$(this).data('id');
+        var lineCode = $(this).parents('li.line_schedule').data('id')
+            , id = $(this).data('id');
         var sch = gb_schedule_table.findScheduleByLine(lineCode)[id];
         var dl = gb_schedule_table.scroToDl(sch);
         //高亮
@@ -205,7 +211,7 @@ var gb_sch_websocket = (function () {
                 notify_succ(rs.msg);
             cb && cb();
         });
-    }
+    };
     //定时到离站信使清理掉