潘钊 / bsth_control · Commits

Commit 7efe8a9d7a4e72a9189b85941ab7b5efbe707248

Authored by 潘钊
1 parent 1d750e2b

update...

Inline Side-by-side
Showing 1 changed file with 7 additions and 0 deletions
src/main/java/com/bsth/data/gpsdata_v2/handlers/OutStationProcess.java
  View file @7efe8a9
@@ -4,6 +4,7 @@ import com.bsth.data.LineConfigData; @@ -4,6 +4,7 @@ import com.bsth.data.LineConfigData;
4 import com.bsth.data.gpsdata_v2.cache.GpsCacheData; 4 import com.bsth.data.gpsdata_v2.cache.GpsCacheData;
5 import com.bsth.data.gpsdata_v2.entity.GpsEntity; 5 import com.bsth.data.gpsdata_v2.entity.GpsEntity;
6 import com.bsth.data.gpsdata_v2.status_manager.GpsStatusManager; 6 import com.bsth.data.gpsdata_v2.status_manager.GpsStatusManager;
  7 +import com.bsth.data.gpsdata_v2.utils.SignalSchPlanMatcher;
7 import com.bsth.data.schedule.DayOfSchedule; 8 import com.bsth.data.schedule.DayOfSchedule;
8 import com.bsth.data.schedule.late_adjust.LateAdjustHandle; 9 import com.bsth.data.schedule.late_adjust.LateAdjustHandle;
9 import com.bsth.entity.realcontrol.LineConfig; 10 import com.bsth.entity.realcontrol.LineConfig;
@@ -34,6 +35,9 @@ public class OutStationProcess { @@ -34,6 +35,9 @@ public class OutStationProcess {
34 SendUtils sendUtils; 35 SendUtils sendUtils;
35 36
36 @Autowired 37 @Autowired
  38 + SignalSchPlanMatcher signalSchPlanMatcher;
  39 +
  40 + @Autowired
37 GpsStatusManager gpsStatusManager; 41 GpsStatusManager gpsStatusManager;
38 42
39 public void process(GpsEntity gps){ 43 public void process(GpsEntity gps){
@@ -56,6 +60,9 @@ public class OutStationProcess { @@ -56,6 +60,9 @@ public class OutStationProcess {
56 60
57 //起点发车 61 //起点发车
58 if (null != sch && sch.getQdzCode().equals(gps.getStopNo())){ 62 if (null != sch && sch.getQdzCode().equals(gps.getStopNo())){
  63 + //发车班次匹配
  64 + signalSchPlanMatcher.outMatch(gps, sch);
  65 +
59 gps.setPremiseCode(null);//清除前置围栏标记 66 gps.setPremiseCode(null);//清除前置围栏标记
60 67
61 if(StringUtils.isNotEmpty(sch.getFcsjActual()) 68 if(StringUtils.isNotEmpty(sch.getFcsjActual())