Commit a2e754a0fa3fd10fff9120bbb76a4ebb3952a126

Authored by 潘钊
2 parents 23284cb3 ad37eaa0

Merge branch 'minhang' into pudong

src/main/java/com/bsth/controller/realcontrol/anomalyCheckController.java
... ... @@ -102,7 +102,7 @@ public class anomalyCheckController {
102 102 }
103 103  
104 104 @RequestMapping(value = "/findSchByLpName")
105   - public List<ScheduleRealInfo> findSchByLpName(String lpName){
  105 + public List<ScheduleRealInfo> findSchByLpName(@RequestParam String lpName){
106 106 return dayOfSchedule.getLpScheduleMap().get(lpName);
107 107 }
108 108 }
... ...
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
... ... @@ -278,12 +278,14 @@ public class DayOfSchedule {
278 278 List<String> lprms = new ArrayList<>();
279 279 Set<String> lps = lpScheduleMap.keySet();
280 280 for (String lp : lps) {
281   - if (lp.indexOf(lineCode + "_") != -1)
  281 + if (lp.startsWith(lineCode + "_"))
282 282 lprms.add(lp);
283 283 }
284 284  
285   - for (String lp : lprms)
  285 + for (String lp : lprms){
  286 + logger.info("清理路牌映射 " + lp);
286 287 lpScheduleMap.removeAll(lp);
  288 + }
287 289  
288 290 logger.info(lineCode + "排班清理 " + count);
289 291 }
... ...
src/main/resources/static/real_control_v2/js/main.js
... ... @@ -169,8 +169,8 @@ var disabled_submit_btn = function (form) {
169 169 function showUpdateDescription() {
170 170 //更新说明
171 171 var updateDescription = {
172   - date: '2017-08-13',
173   - text: '<h5>1、修复了 “子任务-区间调头” 当上下行里程不等时,站间距公里提示错误的问题!</h5>'
  172 + date: '2017-08-25',
  173 + text: '<h5>1、修复了一个bug,这个bug导致个别班次不显示实到时间!</h5>'
174 174 };
175 175  
176 176 var storage = window.localStorage
... ...