Commit 3684c9fbea0f2b310b3b0708ca615264e020ab11
1 parent
854edf24
update...
Showing
4 changed files
with
25 additions
and
3 deletions
src/main/java/com/bsth/data/gpsdata/arrival/handlers/InOutStationSignalHandle.java
| @@ -155,12 +155,32 @@ public class InOutStationSignalHandle extends SignalHandle{ | @@ -155,12 +155,32 @@ public class InOutStationSignalHandle extends SignalHandle{ | ||
| 155 | } | 155 | } |
| 156 | else if(sch.getBcType().equals("out")){ | 156 | else if(sch.getBcType().equals("out")){ |
| 157 | ScheduleRealInfo next = dayOfSchedule.nextSame(sch); | 157 | ScheduleRealInfo next = dayOfSchedule.nextSame(sch); |
| 158 | + //如果下一个班次是区间，并且是环线 | ||
| 159 | + if(next != null && next.getBcType().equals("region")){ | ||
| 160 | + next = dayOfSchedule.nextSame(next); | ||
| 161 | + if(next == null || !next.getQdzName().equals(next.getZdzName())){ | ||
| 162 | + return; | ||
| 163 | + } | ||
| 164 | + } | ||
| 158 | if(next != null && prev.getStopNo().equals(next.getQdzCode())){ | 165 | if(next != null && prev.getStopNo().equals(next.getQdzCode())){ |
| 159 | //发下一个班次 | 166 | //发下一个班次 |
| 160 | dayOfSchedule.addExecPlan(next); | 167 | dayOfSchedule.addExecPlan(next); |
| 161 | outStation(gps, prev); | 168 | outStation(gps, prev); |
| 162 | } | 169 | } |
| 163 | } | 170 | } |
| 171 | + //当前班次是区间 | ||
| 172 | + else if(sch.getBcType().equals("region")){ | ||
| 173 | + ScheduleRealInfo next = dayOfSchedule.nextSame(sch); | ||
| 174 | + if(next==null || !next.getQdzName().equals(next.getZdzName())){ | ||
| 175 | + return; | ||
| 176 | + } | ||
| 177 | + //是环线 | ||
| 178 | + if(prev.getStopNo().equals(next.getQdzCode())){ | ||
| 179 | + //发下一个班次 | ||
| 180 | + dayOfSchedule.addExecPlan(next); | ||
| 181 | + outStation(gps, prev); | ||
| 182 | + } | ||
| 183 | + } | ||
| 164 | } | 184 | } |
| 165 | 185 | ||
| 166 | 186 |
src/main/java/com/bsth/data/gpsdata/recovery/GpsDataRecovery.java
| @@ -60,7 +60,7 @@ public class GpsDataRecovery implements ApplicationContextAware { | @@ -60,7 +60,7 @@ public class GpsDataRecovery implements ApplicationContextAware { | ||
| 60 | for (String nbbm : keys) { | 60 | for (String nbbm : keys) { |
| 61 | Collections.sort(listMap.get(nbbm), comp); | 61 | Collections.sort(listMap.get(nbbm), comp); |
| 62 | threadPool.execute(new RecoveryThread(listMap.get(nbbm), count)); | 62 | threadPool.execute(new RecoveryThread(listMap.get(nbbm), count)); |
| 63 | - /*if(nbbm.equals("SXC-YD012")) | 63 | + /*if(nbbm.equals("W9G-013")) |
| 64 | new RecoveryThread(listMap.get(nbbm), count).run();*/ | 64 | new RecoveryThread(listMap.get(nbbm), count).run();*/ |
| 65 | } | 65 | } |
| 66 | 66 | ||
| @@ -150,6 +150,8 @@ public class GpsDataRecovery implements ApplicationContextAware { | @@ -150,6 +150,8 @@ public class GpsDataRecovery implements ApplicationContextAware { | ||
| 150 | CircleQueue<GpsEntity> prevs; | 150 | CircleQueue<GpsEntity> prevs; |
| 151 | boolean task; | 151 | boolean task; |
| 152 | for (GpsEntity gps : list) { | 152 | for (GpsEntity gps : list) { |
| 153 | + /*if(gps.getTimestamp() > 1491951840000L) | ||
| 154 | + System.out.print("");*/ | ||
| 153 | 155 | ||
| 154 | //是否有任务 | 156 | //是否有任务 |
| 155 | 157 |
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/lj_zrw.html
src/main/resources/static/real_control_v2/js/line_schedule/context_menu.js
| @@ -227,7 +227,7 @@ var gb_schedule_context_menu = (function () { | @@ -227,7 +227,7 @@ var gb_schedule_context_menu = (function () { | ||
| 227 | name: '（子任务）加油' | 227 | name: '（子任务）加油' |
| 228 | }, | 228 | }, |
| 229 | 'add_sub_task_in': { | 229 | 'add_sub_task_in': { |
| 230 | - name: '（子任务）回场' | 230 | + name: '（子任务）进场' |
| 231 | }, | 231 | }, |
| 232 | 'add_sub_task_out': { | 232 | 'add_sub_task_out': { |
| 233 | name: '（子任务）出场' | 233 | name: '（子任务）出场' |