update...

潘钊
1 parent d54b68ef
Showing 8 changed files with 77 additions and 28 deletions
src/main/java/com/bsth/data/directive/DirectiveCreator.java
src/main/java/com/bsth/data/gpsdata_v2/handlers/GpsStateProcess.java
src/main/java/com/bsth/data/gpsdata_v2/handlers/InStationProcess.java
src/main/java/com/bsth/data/gpsdata_v2/utils/GpsDataUtils.java
src/main/java/com/bsth/data/msg_queue/DirectivePushQueue.java
src/main/java/com/bsth/service/directive/DirectiveServiceImpl.java
src/main/java/com/bsth/service/gps/GpsServiceImpl.java
src/main/resources/static/real_control_v2/fragments/north/nav/all_devices.html
@@ -81,7 +81,7 @@ public class DirectiveCreator {
 	}
-	public D60 createD60_01(String nbbm, String text, int upDown, int state, Date alarmTime){
+	public D60 createD60_02(String nbbm, String text, int upDown, int state, Date alarmTime){
 		SimpleDateFormat sdfMMddHHmm = new SimpleDateFormat("MMddHHmm");
 		Long timestamp = System.currentTimeMillis();
@@ -102,7 +102,7 @@ public class DirectiveCreator {
 		directive.setMsgId(msgId);
 		// 构造数据
 		data.setDeviceId(deviceId);
-		data.setDispatchInstruct((short) 0x01);
+		data.setDispatchInstruct((short) 0x02);
 		data.setTimestamp(timestamp);
 		data.setCompanyCode(company);
 		data.setMsgId(msgId);
@@ -7,6 +7,9 @@ import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
 /**
  * GPS 状态处理
  * Created by panzhao on 2017/11/15.
@@ -20,6 +23,13 @@ public class GpsStateProcess {
     @Autowired
     GpsStatusManager gpsStatusManager;
+    /**
+     * 设置状态差异连续次数
+     */
+    private static ConcurrentMap<String, Integer> stateDiffMap = new ConcurrentHashMap<>();
+
+    private final static int CHANGE_THRESHOLD = 2;
+
     public void process(GpsEntity gps) {
         //在执行的任务
         ScheduleRealInfo sch = dayOfSchedule.executeCurr(gps.getNbbm());
@@ -29,16 +39,40 @@ public class GpsStateProcess {
         int upDown = Integer.parseInt(sch.getXlDir());
         int schState = dayOfSchedule.emptyService(sch)?1:0;
+        String device = gps.getDeviceId();
+        /**
+         * 网关在进终点的时候，会直接将当前点位状态改变
+         * 为避免出现单个点的状态跳动，设置一下切换阈值
+         */
+        if(gps.getState() != schState || gps.getUpDown() != upDown){
+            Integer count = 0;
+            if(stateDiffMap.containsKey(device))
+                count = stateDiffMap.get(device);
+
+            count ++;
-        if(gps.getState().intValue() != schState || gps.getUpDown().intValue() != upDown){
-            //下发指令纠正车载的 营运状态 和 走向
-            gpsStatusManager.changeServiceState(gps.getNbbm(), upDown, schState, "同步@系统");
+            if(count >= CHANGE_THRESHOLD){
+                //下发指令纠正车载的 营运状态 和 走向
+                gpsStatusManager.changeServiceState(gps.getNbbm(), upDown, schState, "同步@系统");
+                count = 0;
+            }
+
+            stateDiffMap.put(device, count);
+
+            //记录原始设备状态
+            gps.setOrigStateStr(gps.getUpDown() + "_" + gps.getState());
         }
+        else
+            stateDiffMap.put(device, 0);
         if (gps.getUpDown() != upDown) {
             gps.setUpDown((byte) upDown);//修正走向
         }
+        if(gps.getState() != schState){
+            gps.setState(schState);//修正营运状态
+        }
+
         if (!sch.getXlBm().equals(gps.getLineId())) {
             //切换车载的 线路编码
             gpsStatusManager.changeLine(gps.getNbbm(), sch.getXlBm(), "同步@系统");
@@ -144,6 +144,8 @@ public class InStationProcess {
             dayOfSchedule.addExecPlan(next);
             inStationAndInPark(sch, next);//进站既进场
         }
+        else
+            dayOfSchedule.removeExecPlan(nbbm);
         //路牌的下一个班次，页面显示起点实际到达时间
         ScheduleRealInfo lpNext = dayOfSchedule.nextByLp(sch);
@@ -180,10 +182,10 @@ public class InStationProcess {
         /**
          *  下一班不是全程班次的时候，下发运营指令
          *  全程班次时，由网关根据进出起终点，自动切换走向
-         */
+
         if(null != next && !next.getBcType().equals("normal"))
             DirectivePushQueue.put6003(next, "到站@系统");
-
+         */
         //下发调度指令
         DirectivePushQueue.put6002(next, doneSum, "到站@系统", "");
     }
@@ -15,6 +15,8 @@ public class GpsDataUtils {
     static Logger logger = LoggerFactory.getLogger(GpsDataUtils.class);
+    private final static long MAX_DIFF = 1000 * 60 * 60 * 24;
+
     /**
      * 过滤无效的gps点位
      *
@@ -24,9 +26,16 @@ public class GpsDataUtils {
     public static List<GpsEntity> clearInvalid(List<GpsEntity> list) {
         List<GpsEntity> rs = new ArrayList<>();
+        long t = System.currentTimeMillis();
         try {
             GpsEntity prev;
             for (GpsEntity gps : list) {
+                if(Math.abs(gps.getTimestamp() - t) > MAX_DIFF){
+                    //尝试校准GPS时间
+                    gps.setTimestamp(t + 1);
+                    gps.setAbnormalStatus("timeError");
+                }
+
                 prev = GpsRealData.get(gps.getDeviceId());
                 //不接收过期数据
@@ -48,7 +57,7 @@ public class GpsDataUtils {
             if (rs.size() < list.size())
                 logger.info("过滤无效的点位 : " + (list.size() - rs.size()));
         } catch (Exception e) {
-            logger.error("", e);
+            logger.error("过滤GPS出现异常", e);
             rs = list;
         }
         return rs;
@@ -24,7 +24,7 @@ public class DirectivePushQueue implements ApplicationContextAware {
     static ConcurrentLinkedQueue<QueueData_Directive> linkedList;
     static DataPushThread thread;
     static DirectiveService directiveService;
-    static long t;
+    static long threadT;
     /**
      * 下发运营指令6003的最小间隔时间
@@ -34,11 +34,11 @@ public class DirectivePushQueue implements ApplicationContextAware {
     /**
      * 车辆 ——> 上次下发6003的时间
      */
-    static ConcurrentMap<String, Long> lastSend6003Map;
+    static ConcurrentMap<String, Long> lastSend60TimeMap;
     static {
         linkedList = new ConcurrentLinkedQueue<>();
-        lastSend6003Map = new ConcurrentHashMap<>();
+        lastSend60TimeMap = new ConcurrentHashMap<>();
     }
     public static void put6002(ScheduleRealInfo sch, int finish, String sender, String txtPrefix){
@@ -52,12 +52,13 @@ public class DirectivePushQueue implements ApplicationContextAware {
         qd6002.setTxtPrefix(txtPrefix);
         linkedList.add(qd6002);
+        lastSend60TimeMap.put(sch.getClZbh(), System.currentTimeMillis());
     }
     public static void put6003(String nbbm, int state, int upDown, String sender){
         long t = System.currentTimeMillis();
-        if(lastSend6003Map.containsKey(nbbm)
-                && t - lastSend6003Map.get(nbbm) < MIN_SEND6003_SPACE)
+        if(lastSend60TimeMap.containsKey(nbbm)
+                && t - lastSend60TimeMap.get(nbbm) < MIN_SEND6003_SPACE)
             return; //最短下发间隔
         QueueData_Directive qd6003 = new QueueData_Directive();
@@ -68,7 +69,7 @@ public class DirectivePushQueue implements ApplicationContextAware {
         qd6003.setCode("60_03");
         linkedList.add(qd6003);
-        lastSend6003Map.put(nbbm, t);
+        lastSend60TimeMap.put(nbbm, t);
     }
     public static void put6003(ScheduleRealInfo sch, String sender){
@@ -146,7 +147,7 @@ public class DirectivePushQueue implements ApplicationContextAware {
                             sleepFlag = true;
                         }
                     }
-                    t = System.currentTimeMillis();
+                    threadT = System.currentTimeMillis();
                 }
                 catch(InterruptedException e){
                     log.error("", e);
@@ -128,7 +128,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
                 text += " (放站到"+sch.getMajorStationName()+"带客)";
             }
-            //下发0x01指令  调度指令(闹钟有效)
+            //下发0x02指令  调度指令(闹钟有效)
             long t = System.currentTimeMillis() + 1000 * 30,
                     alarmTime = sch.getDfsjT() < t?t:sch.getDfsjT();
@@ -139,7 +139,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
             int state = 0;//营运状态
             if(dayOfSchedule.emptyService(sch))
                 state = 1;
-            d60 = new DirectiveCreator().createD60_01(sch.getClZbh(), text, Integer.parseInt(sch.getXlDir())
+            d60 = new DirectiveCreator().createD60_02(sch.getClZbh(), text, Integer.parseInt(sch.getXlDir())
                     , state, new Date(alarmTime));
             d60.setLineCode(sch.getXlBm());
@@ -5,6 +5,7 @@ import com.bsth.data.BasicData;
 import com.bsth.data.forecast.entity.ArrivalEntity;
 import com.bsth.data.gpsdata_v2.GpsRealData;
 import com.bsth.data.gpsdata_v2.cache.GeoCacheData;
+import com.bsth.data.gpsdata_v2.cache.GpsCacheData;
 import com.bsth.data.gpsdata_v2.entity.GpsEntity;
 import com.bsth.data.gpsdata_v2.utils.GeoUtils;
 import com.bsth.data.pilot80.PilotReport;
@@ -492,6 +493,7 @@ public class GpsServiceImpl implements GpsService {
         try {
             gpsRealData.remove(device);
+            GpsCacheData.remove(BasicData.deviceId2NbbmMap.get(device));
             rs.put("status", ResponseCode.SUCCESS);
         } catch (Exception e) {
             rs.put("status", ResponseCode.ERROR);
@@ -36,6 +36,7 @@
                     <div class="uk-autocomplete uk-form " >
                         <select name="abnormalStatus">
                             <option value="">全部</option>
+                            <option value="timeError">时间戳异常</option>
                             <option value="outBounds">越界</option>
                             <option value="overspeed">超速</option>
                             <option value="offline">离线</option>
@@ -58,11 +59,11 @@
                     <th style="width: 14%;">站点</th>
                     <th style="width: 11%;">车辆</th>
                     <th style="width: 11%;">设备号</th>
-                    <th style="width: 9%;">走向/营运</th>
+                    <th style="width: 12%;">走向/营运</th>
                     <th style="width: 9%;">程序版本</th>
                     <th>最后GPS时间</th>
-                    <th style="width: 9%;">状态</th>
-                    <th style="width: 8%;">来源</th>
+                    <th style="width: 8%;">状态</th>
+                    <th style="width: 6%;">源</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -81,7 +82,11 @@
             <td>{{gps.stationName}}</td>
             <td>{{gps.nbbm}}</td>
             <td>{{gps.deviceId}}</td>
-            <td>{{gps.upDown}}/{{gps.state}}</td>
+            <td>{{gps.upDown}}/{{gps.state}}
+                {{if gps.origStateStr!=null}}
+                    （<span style="color: #fe6262;">{{gps.origStateStr}}</span>）
+                {{/if}}
+            </td>
             <td>{{gps.version}}</td>
             <td>{{gps.timeStr}}</td>
             <td>
@@ -95,18 +100,14 @@
                     <span class="sm-red">GPS (0,0)</span>
                 {{else if gps.abnormalStatus=='offline'}}
                     <span>离线</span>
+                {{else if gps.abnormalStatus=='timeError'}}
+                    <span class="sm-red" title="设备时间戳异常，尝试以服务器时间修正">time_ex</span>
                 {{else}}
                     ...
                 {{/if}}
             </td>
             <td>
-                {{if gps.source==1}}
-                    <span style="color: #1e1ef5;" title="已切换至新网关">网关</span>
-                {{else if gps.source==0}}
-                    <span style="color: #8e8e8e;" title="转接的数据，无法下发指令">转发</span>
-                {{else}}
-                    <span class="sm-grey">未知</span>
-                {{/if}}
+                <span class="sm-grey">{{gps.source}}</span>
             </td>
         </tr>
         {{/each}}