update...

潘钊
1 parent 1a04eeea
Showing 3 changed files with 9 additions and 5 deletions
src/main/java/com/bsth/XDApplication.java
src/main/java/com/bsth/data/gpsdata_v2/handlers/InStationProcess.java
src/main/java/com/bsth/websocket/entity/WsScheduleRealInfo.java
@@ -146,7 +146,7 @@ public class XDApplication implements CommandLineRunner {
         sexec.scheduleWithFixedDelay(schedulePstThread, 120, 10, TimeUnit.SECONDS);//班次延迟入库线程
         sexec.scheduleWithFixedDelay(seiPstThread, 160, 60, TimeUnit.SECONDS);//班次修正日志入库
         sexec.scheduleWithFixedDelay(directivesPstThread, 180, 120, TimeUnit.SECONDS);//调度指令延迟入库
-        sexec.scheduleWithFixedDelay(threadMonotor, 240, 60, TimeUnit.SECONDS);//线程监听（防止重要的线程阻塞、异常结束。以及部分主备切换工作）
+        //sexec.scheduleWithFixedDelay(threadMonotor, 240, 60, TimeUnit.SECONDS);//线程监听（防止重要的线程阻塞、异常结束。以及部分主备切换工作）
         sexec.scheduleWithFixedDelay(sampleTimeDataLoader, 140, 120 * 60, TimeUnit.SECONDS);//到离站预测需要的站点间耗时数据
         sexec.scheduleWithFixedDelay(basicDataLoader, 2, 2, TimeUnit.HOURS);//基础数据更新
         sexec.scheduleWithFixedDelay(autoExecScanThread, 160, 50, TimeUnit.SECONDS);//班次自动执行
@@ -159,10 +159,12 @@ public class InStationProcess {
             gpsStatusManager.changeLine(next.getClZbh(), next.getXlBm(), "套跑@系统");
         }
  
-        if (null == next && gps.isService())
-            nonService(sch, "结束@系统");//班次结束
-        else if (dayOfSchedule.emptyService(next))
-            nonService(sch, "空驶@系统");//下一班非营运
+        if(null == next){
+            if (gps.isService())
+                nonService(sch, "结束@系统");//班次结束
+            else if (dayOfSchedule.emptyService(next))
+                nonService(sch, "空驶@系统");//下一班非营运
+        }
     }
  
     /**
@@ -19,6 +19,8 @@ import java.util.Set;
 public class WsScheduleRealInfo {
  
     public static WsScheduleRealInfo getInstance(ScheduleRealInfo sch){
+        if(null == sch)
+            return null;
         WsScheduleRealInfo wss = new WsScheduleRealInfo();
         wss.id = sch.getId();
         wss.scheduleDateStr = sch.getScheduleDateStr();