update

潘钊
1 parent dea79286
Showing 6 changed files with 30 additions and 18 deletions
src/main/java/com/bsth/data/gpsdata/GpsRealData.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/recovery/GpsDataRecovery.java
src/main/java/com/bsth/data/gpsdata/thread/GpsDataLoaderThread.java
src/main/java/com/bsth/websocket/handler/RealControlSocketHandler.java
@@ -54,9 +54,9 @@ public class GpsRealData implements CommandLineRunner {
     @Override
     public void run(String... arg0) throws Exception {
-        logger.info("gpsDataLoader,20,5");
+        logger.info("gpsDataLoader,20,3");
         //定时从网关获取GPS数据
-        //Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 20, 5, TimeUnit.SECONDS);
+        //Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 20, 3, TimeUnit.SECONDS);
         //定时扫描掉离线
         //Application.mainServices.scheduleWithFixedDelay(offlineMonitorThread, 120, 60, TimeUnit.SECONDS);
     }
@@ -148,7 +148,7 @@ public class InOutStationSignalHandle extends SignalHandle{
             }
             //出站既出场
             outStationAndOutPark(sch);
-            logger.info("班次：" + sch.getDfsj() + "发车， 时间：" + sch.getFcsjActual());
+            logger.info("车辆：" + sch.getClZbh() + " 班次：" + sch.getDfsj() + "发车， 时间：" + sch.getFcsjActual());
         }
         else if(sch.getBcType().equals("out")){
             ScheduleRealInfo next = dayOfSchedule.nextSame(sch);
@@ -217,14 +217,6 @@ public class InOutStationSignalHandle extends SignalHandle{
             sendUtils.sendZdsj(sch, next, doneSum);
             //持久化
             dayOfSchedule.save(sch);
-            if(next != null){
-                //下发调度指令
-                directiveService.send60Dispatch(next, doneSum, "到站@系统");
-            }
-            else if(sch.getBcType().equals("in")){
-                //终班进场，切换成非营运状态
-                directiveService.send60Operation(sch.getClZbh(), 1, Integer.parseInt(sch.getXlDir()), null, "进场@系统");
-            }
             //准备执行下一个班次
             if (next != null) {
@@ -234,6 +226,13 @@ public class InOutStationSignalHandle extends SignalHandle{
                 inStationAndInPark(sch, next);
                 //将gps转换为下一个班次走向的站内信号
                 transformUpdown(gps, next);
+
+                //下发调度指令
+                directiveService.send60Dispatch(next, doneSum, "到站@系统");
+            }
+            else if(sch.getBcType().equals("in")){
+                //终班进场，切换成非营运状态
+                directiveService.send60Operation(sch.getClZbh(), 1, Integer.parseInt(sch.getXlDir()), null, "进场@系统");
             }
         }
         else {
@@ -13,8 +13,8 @@ import org.springframework.stereotype.Component;
 @Component
 public class OfflineSignalHandle extends SignalHandle{
-    //断开2分钟，标记为重连信号
-    private final static int OFFLINE_TIME = 1000 * 60 * 2;
+    //断开4分钟，标记为重连信号
+    private final static int OFFLINE_TIME = 1000 * 60 * 4;
     //断开70分钟，之前的信号不再有参考价值
     private final static int CLEAR_TIME = 1000 * 60 * 70;
@@ -148,22 +148,28 @@ public class GpsDataRecovery implements ApplicationContextAware {
             try {
                 //循环gps恢复数据
                 CircleQueue<GpsEntity> prevs;
-
+                boolean task;
                 for (GpsEntity gps : list) {
+                    //是否有任务
+
                     prevs = GeoCacheData.getGps(gps.getNbbm());
                     //掉线处理
                     offlineSignalHandle.handle(gps, prevs);
                     //状态处理
-                    if (!correctSignalHandle.handle(gps, prevs))
-                        continue;
+                    task = correctSignalHandle.handle(gps, prevs);
                     //场，站内外判断
                     stationInsideHandle.handle(gps, prevs);
+                    //异常判定（越界/超速）
+                    //abnormalStateHandle.handle(gps, prevs);
+
+                    if(!task)
+                        return; //无任务的，到这里就结束
+
                     //反向处理
                     reverseSignalHandle.handle(gps, prevs);
                     //进出站动作处理
                     inOutStationSignalHandle.handle(gps, prevs);
-
                     GeoCacheData.putGps(gps);
                 }
             } catch (Exception e) {
@@ -95,7 +95,9 @@ public class GpsDataLoaderThread extends Thread {
                     old = gpsRealData.get(gps.getDeviceId());
                     if (old != null &&
-                            old.getTimestamp() == gps.getTimestamp())
+                            old.getTimestamp() == gps.getTimestamp() &&
+                            old.getLat() == gps.getLat() &&
+                            old.getLon() == gps.getLon())
                         continue;
                     nbbm = BasicData.deviceId2NbbmMap.get(gps.getDeviceId());
 package com.bsth.websocket.handler;
 import com.alibaba.fastjson.JSONObject;
+import com.bsth.common.Constants;
 import com.bsth.data.BasicData;
 import com.google.common.base.Splitter;
 import com.google.common.collect.ArrayListMultimap;
@@ -107,6 +108,10 @@ public class RealControlSocketHandler implements WebSocketHandler {
 					user.sendMessage(message);
 				}
 			} catch (Exception e) {
+				try{
+					logger.error("error user...."+user.getAttributes().get(Constants.SESSION_USERNAME));
+				}
+				catch(Exception e2){}
 				logger.error("sendMessageToLine error ...."+msg);
 				logger.error("sendMessageToLine error ....", e);
 			}