Commit a0dabf824457bbdc87a12f9bb6514d67b3d43b23
1 parent
ee5cd56f
update...
Showing
1 changed file
with
4 additions
and
4 deletions
src/main/java/com/bsth/data/gpsdata/arrival/handlers/CorrectSignalHandle.java
| @@ -53,15 +53,15 @@ public class CorrectSignalHandle extends SignalHandle { | @@ -53,15 +53,15 @@ public class CorrectSignalHandle extends SignalHandle { | ||
| 53 | 53 | ||
| 54 | //（转发的数据不管） | 54 | //（转发的数据不管） |
| 55 | if(gps.getSource() != 0){ | 55 | if(gps.getSource() != 0){ |
| 56 | - //gps=非营运 && 班次=非空驶 ;切换到营运状态 | ||
| 57 | - if(!gps.isService() && | 56 | + //gps=非营运 或走向不对 && 班次=非空驶 ;切换到营运状态 |
| 57 | + if((!gps.isService() || gps.getUpDown() != updown) && | ||
| 58 | !dayOfSchedule.emptyService(task)){ | 58 | !dayOfSchedule.emptyService(task)){ |
| 59 | - gpsStatusManager.changeServiceState(gps.getNbbm(), updown, 0, null); | 59 | + gpsStatusManager.changeServiceState(gps.getNbbm(), updown, 0, "系统@同步"); |
| 60 | } | 60 | } |
| 61 | 61 | ||
| 62 | //需要切换线路 | 62 | //需要切换线路 |
| 63 | if(!task.getXlBm().equals(gps.getLineId())){ | 63 | if(!task.getXlBm().equals(gps.getLineId())){ |
| 64 | - gpsStatusManager.changeLine(gps.getNbbm(), task.getXlBm(), null); | 64 | + gpsStatusManager.changeLine(gps.getNbbm(), task.getXlBm(), "系统@同步"); |
| 65 | } | 65 | } |
| 66 | } | 66 | } |
| 67 | 67 |