update...

潘钊
1 parent a54badcc
Showing 3 changed files with 16 additions and 6 deletions
src/main/java/com/bsth/data/BasicData.java
src/main/java/com/bsth/data/LineConfigData.java
src/main/java/com/bsth/data/gpsdata/arrival/handlers/InOutStationSignalHandle.java
@@ -169,8 +169,6 @@ public class BasicData implements CommandLineRunner {
                 geoCacheData.loadData();
                 station2ParkBuffer.saveAll();
                 logger.info("加载基础数据成功！，");
-                //人员拼音转换
-                persionPinYinBuffer.refresh();
             } catch (Exception e) {
                 logger.error("加载基础数据时出现异常，", e);
             }
@@ -355,6 +353,9 @@ public class BasicData implements CommandLineRunner {
             //spyMap = spyTempMap;
             allPerson = allPersonMap;
             perMap = perTempMap;
+
+            //人员拼音转换
+            persionPinYinBuffer.refresh();
         }
     }
 }
@@ -64,7 +64,7 @@ public class LineConfigData implements CommandLineRunner {
      */
     public long applyOut(ScheduleRealInfo sch, Long timestamp) {
         LineConfig config = lineConfMap.get(sch.getXlBm());
-        int diff = sch.getXlDir()=="0"?config.getUpOutDiff():config.getDownOutDiff();
+        int diff = sch.getXlDir().equals("0")?config.getUpOutDiff():config.getDownOutDiff();
         return timestamp - (diff * 1000);
     }
  
@@ -76,7 +76,7 @@ public class LineConfigData implements CommandLineRunner {
      */
     public long applyIn(ScheduleRealInfo sch, Long timestamp){
         LineConfig config = lineConfMap.get(sch.getXlBm());
-        int diff = sch.getXlDir()=="0"?config.getUpInDiff():config.getDownInDiff();
+        int diff = sch.getXlDir().equals("0")?config.getUpInDiff():config.getDownInDiff();
         return timestamp - (diff * 1000);
     }
  
@@ -2,6 +2,7 @@ package com.bsth.data.gpsdata.arrival.handlers;
  
 import com.bsth.data.LineConfigData;
 import com.bsth.data.gpsdata.GpsEntity;
+import com.bsth.data.gpsdata.arrival.GeoCacheData;
 import com.bsth.data.gpsdata.arrival.SignalHandle;
 import com.bsth.data.gpsdata.arrival.utils.CircleQueue;
 import com.bsth.data.gpsdata.arrival.utils.ScheduleSignalState;
@@ -178,7 +179,7 @@ public class InOutStationSignalHandle extends SignalHandle{
             outStationAndOutPark(sch);
             logger.info("车辆：" + sch.getClZbh() + " 班次：" + sch.getDfsj() + "发车， 时间：" + sch.getFcsjActual());
         }
-        else if(sch.getBcType().equals("out")){
+        else if(isOutSch(sch)){
             //有出场动作（起点站覆盖停车场时，并且不设置出站既出场，逻辑可能会走到这里）
             try{
                 if(isOutPark(gps, prev)){
@@ -364,7 +365,7 @@ public class InOutStationSignalHandle extends SignalHandle{
             }
 */
             //被起点站覆盖的情况下进场，没有设置出站既是出场，逻辑会走到这里（模拟进站信号）
-            if(sch.getBcType().equals("in")){
+            if(isInSch(sch)){
                 try{
                     if(isInPark(gps, prev)){
                         if(gps.getCarparkNo().equals(sch.getZdzCode())){
@@ -505,4 +506,12 @@ public class InOutStationSignalHandle extends SignalHandle{
             return true;
         return false;
     }
+
+    private boolean isOutSch(ScheduleRealInfo sch){
+        return sch.getBcType().equals("out") || GeoCacheData.tccMap.keySet().contains(sch.getQdzCode());
+    }
+
+    private boolean isInSch(ScheduleRealInfo sch){
+        return sch.getBcType().equals("in") || GeoCacheData.tccMap.keySet().contains(sch.getZdzCode());
+    }
 }
 \ No newline at end of file