Commit 20b93f7dc99d2830a246f24549e3880ad127c589
1 parent
8894db4f
update...
Showing
1 changed file
with
1 additions
and
2 deletions
src/main/java/com/bsth/data/gpsdata_v2/rfid/handle/RfidSignalHandle.java
| @@ -106,7 +106,6 @@ public class RfidSignalHandle { | @@ -106,7 +106,6 @@ public class RfidSignalHandle { | ||
| 106 | ScheduleRealInfo next = dayOfSchedule.next(sch); | 106 | ScheduleRealInfo next = dayOfSchedule.next(sch); |
| 107 | if(next != null){ | 107 | if(next != null){ |
| 108 | dayOfSchedule.addExecPlan(next); | 108 | dayOfSchedule.addExecPlan(next); |
| 109 | - //inStationAndInPark(sch, next);//进站既进场 | ||
| 110 | } | 109 | } |
| 111 | 110 | ||
| 112 | //路牌的下一个班次，页面显示起点实际到达时间 | 111 | //路牌的下一个班次，页面显示起点实际到达时间 |
| @@ -133,7 +132,7 @@ public class RfidSignalHandle { | @@ -133,7 +132,7 @@ public class RfidSignalHandle { | ||
| 133 | 132 | ||
| 134 | if(null == next) | 133 | if(null == next) |
| 135 | nonService(sch, "rfid1@系统");//班次结束 | 134 | nonService(sch, "rfid1@系统");//班次结束 |
| 136 | - else if(dayOfSchedule.emptyService(next)) | 135 | + else if(null != next && dayOfSchedule.emptyService(next)) |
| 137 | nonService(sch, "rfid2@系统");//下一班非营运 | 136 | nonService(sch, "rfid2@系统");//下一班非营运 |
| 138 | } | 137 | } |
| 139 | }catch (Exception e){ | 138 | }catch (Exception e){ |