Commit b179797e5492f394936aca8787b6cee449a16c93
1 parent
df28ac5c
update...
Showing
1 changed file
with
9 additions
and
5 deletions
src/main/java/com/bsth/data/schedule/late_adjust/LateAdjustHandle.java
| @@ -68,8 +68,6 @@ public class LateAdjustHandle implements ApplicationContextAware{ | @@ -68,8 +68,6 @@ public class LateAdjustHandle implements ApplicationContextAware{ | ||
| 68 | //通知客户端 | 68 | //通知客户端 |
| 69 | sch.setLate2(true); | 69 | sch.setLate2(true); |
| 70 | sendUtils.sendAutoWdtz(sch, old); | 70 | sendUtils.sendAutoWdtz(sch, old); |
| 71 | - | ||
| 72 | - logger.info("【应发未到】班次 " + sch.getClZbh() + " -" + sch.getDfsj() + " -id: " + sch.getId() + " -加入误点调整！"); | ||
| 73 | } | 71 | } |
| 74 | } | 72 | } |
| 75 | 73 | ||
| @@ -84,15 +82,21 @@ public class LateAdjustHandle implements ApplicationContextAware{ | @@ -84,15 +82,21 @@ public class LateAdjustHandle implements ApplicationContextAware{ | ||
| 84 | * @return 返回被移除的误点班次 | 82 | * @return 返回被移除的误点班次 |
| 85 | */ | 83 | */ |
| 86 | private static ScheduleRealInfo popLateSch(ScheduleRealInfo sch) { | 84 | private static ScheduleRealInfo popLateSch(ScheduleRealInfo sch) { |
| 87 | - List<ScheduleRealInfo> list = lateSchMaps.get(sch.getXlBm()); | 85 | + List<ScheduleRealInfo> list = lateSchMaps.get(sch.getClZbh()); |
| 88 | 86 | ||
| 89 | - if(null == list || list.size() == 0) | 87 | + if(null == list || list.size() == 0){ |
| 90 | lateSchMaps.put(sch.getClZbh(), sch); | 88 | lateSchMaps.put(sch.getClZbh(), sch); |
| 89 | + logger.info("【应发未到】班次 " + sch.getClZbh() + " -" + sch.getDfsj() + " -id: " + sch.getId() + " -加入误点调整！"); | ||
| 90 | + } | ||
| 91 | else { | 91 | else { |
| 92 | ScheduleRealInfo old = findExistQdz(list, sch.getQdzCode(), sch.getQdzName()); | 92 | ScheduleRealInfo old = findExistQdz(list, sch.getQdzCode(), sch.getQdzName()); |
| 93 | 93 | ||
| 94 | + if(null == old){ | ||
| 95 | + lateSchMaps.put(sch.getClZbh(), sch); | ||
| 96 | + logger.info("【应发未到 -多个("+lateSchMaps.get(sch.getClZbh()).size()+")】班次 " + sch.getClZbh() + " -" + sch.getDfsj() + " -id: " + sch.getId() + " -加入误点调整！"); | ||
| 97 | + } | ||
| 94 | //同一个起点，保留时间最大的班次 | 98 | //同一个起点，保留时间最大的班次 |
| 95 | - if(null == old || old.getDfsjT() < sch.getDfsjT()){ | 99 | + else if(old.getDfsjT() < sch.getDfsjT()){ |
| 96 | lateSchMaps.remove(old.getClZbh(), old); | 100 | lateSchMaps.remove(old.getClZbh(), old); |
| 97 | lateSchMaps.put(sch.getClZbh(), sch); | 101 | lateSchMaps.put(sch.getClZbh(), sch); |
| 98 | 102 |