Commit f2378ac6b89082b0db0f10e74b55c158a931147c
1 parent
c857201c
update
Showing
4 changed files
with
15 additions
and
19 deletions
src/main/java/com/bsth/data/car_out_info/CarOutInfoHandler.java
| @@ -54,27 +54,19 @@ public class CarOutInfoHandler { | @@ -54,27 +54,19 @@ public class CarOutInfoHandler { | ||
| 54 | * 全量更新发车信息表 | 54 | * 全量更新发车信息表 |
| 55 | */ | 55 | */ |
| 56 | public void updateAll() { | 56 | public void updateAll() { |
| 57 | - Set<String> ks = BasicData.lineCode2NameMap.keySet(); | ||
| 58 | - for (String lineCode : ks) { | ||
| 59 | - update(lineCode); | ||
| 60 | - } | ||
| 61 | - } | ||
| 62 | - | ||
| 63 | - public void update(String lineCode) { | ||
| 64 | - try { | ||
| 65 | - ArrayListMultimap<String, ScheduleRealInfo> lpScheduleMap = dayOfSchedule.getLpScheduleMap(); | ||
| 66 | - List<ScheduleRealInfo> list = new ArrayList<>(); | 57 | + try{ |
| 58 | + //将班次按线路分组 | ||
| 59 | + List<ScheduleRealInfo> all = new ArrayList<>(dayOfSchedule.findAll()); | ||
| 60 | + ArrayListMultimap<String, ScheduleRealInfo> xlMaps = ArrayListMultimap.create(); | ||
| 61 | + for(ScheduleRealInfo sch : all){ | ||
| 62 | + xlMaps.put(sch.getXlBm(), sch); | ||
| 63 | + } | ||
| 67 | 64 | ||
| 68 | - Set<String> ks = lpScheduleMap.keySet(); | ||
| 69 | - String prefix = lineCode + "_"; | 65 | + Set<String> ks = xlMaps.keySet(); |
| 70 | for (String k : ks) { | 66 | for (String k : ks) { |
| 71 | - if (k.startsWith(prefix)) { | ||
| 72 | - list.addAll(lpScheduleMap.get(k)); | ||
| 73 | - } | 67 | + update(xlMaps.get(k)); |
| 74 | } | 68 | } |
| 75 | - | ||
| 76 | - update(list); | ||
| 77 | - } catch (Exception e) { | 69 | + }catch (Exception e){ |
| 78 | logger.error("", e); | 70 | logger.error("", e); |
| 79 | } | 71 | } |
| 80 | } | 72 | } |
src/main/java/com/bsth/data/gpsdata/arrival/handlers/InOutStationSignalHandle.java
| @@ -338,6 +338,9 @@ public class InOutStationSignalHandle extends SignalHandle{ | @@ -338,6 +338,9 @@ public class InOutStationSignalHandle extends SignalHandle{ | ||
| 338 | if(lpNext != null){ | 338 | if(lpNext != null){ |
| 339 | lpNext.setQdzArrDatesj(sch.getZdsjActual()); | 339 | lpNext.setQdzArrDatesj(sch.getZdsjActual()); |
| 340 | } | 340 | } |
| 341 | + else{ | ||
| 342 | + logger.info(sch.getClZbh() + " 到终点，无下一班"); | ||
| 343 | + } | ||
| 341 | 344 | ||
| 342 | //通知客户端 | 345 | //通知客户端 |
| 343 | sendUtils.sendZdsj(sch, lpNext, doneSum); | 346 | sendUtils.sendZdsj(sch, lpNext, doneSum); |
src/main/resources/static/real_control_v2/css/line_schedule.css
src/main/resources/static/real_control_v2/css/north.css