update...

潘钊
1 parent 2c2f2fb2
Showing 4 changed files with 36 additions and 23 deletions
src/main/java/com/bsth/controller/realcontrol/anomalyCheckController.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/real_control_v2/js/main.js
@@ -10,9 +10,9 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
  
-import java.util.HashSet;
+import java.util.HashMap;
 import java.util.List;
-import java.util.Set;
+import java.util.Map;
  
 /**
  * 相关数据异常检测
@@ -35,16 +35,19 @@ public class anomalyCheckController {
     public void schRepeat(@RequestParam String nbbm){
         logger.info("前端通知，车辆 " + nbbm + "出现重复班次，开始检测...");
         List<ScheduleRealInfo> list = dayOfSchedule.findByNbbm(nbbm);
+        logger.info("检测前，车辆班次数量：" + list.size());
  
-        Set<ScheduleRealInfo> set = new HashSet<>();
+        Map<Long, ScheduleRealInfo> map = new HashMap<>();
         for(ScheduleRealInfo sch : list){
-            if(!set.add(sch)){
-                logger.info("出现一次重复班次，班次ID：" + sch.getId());
+            if(map.containsKey(sch.getId())){
+                logger.info("检测到重复ID： " + sch.getId());
             }
+            map.put(sch.getId(), sch);
         }
  
-        if(set.size() > 0){
-            dayOfSchedule.replaceByNbbm(nbbm, set);
+        logger.info("检测后，车辆班次数量：" + list.size());
+        if(map.values().size() > 0){
+            dayOfSchedule.replaceByNbbm(nbbm, map.values());
         }
     }
 }
@@ -480,7 +480,7 @@ public class DayOfSchedule implements CommandLineRunner {
     public List<ScheduleRealInfo> findByLineCode(String lineCode) {
         List<ScheduleRealInfo> rs = new ArrayList<>();
  
-        Collection<ScheduleRealInfo> schs = nbbmScheduleMap.values();
+        Collection<ScheduleRealInfo> schs = id2SchedulMap.values();
         for (ScheduleRealInfo sch : schs) {
             if (sch.getXlBm().equals(lineCode))
                 rs.add(sch);
@@ -489,6 +489,22 @@ public class DayOfSchedule implements CommandLineRunner {
     }
  
     /**
+     * @Title: findByLineCode
+     * @Description: TODO(lineList 获取班次)
+     */
+    public Map<String, Collection<ScheduleRealInfo>> findByLineCodes(List<String> lineList) {
+        ArrayListMultimap<String, ScheduleRealInfo> mMap = ArrayListMultimap.create();
+
+        Collection<ScheduleRealInfo> schs = id2SchedulMap.values();
+        for (ScheduleRealInfo sch : schs) {
+            if(lineList.contains(sch.getXlBm())){
+                mMap.put(sch.getXlBm(), sch);
+            }
+        }
+        return mMap.asMap();
+    }
+
+    /**
      * @Title: findCarByLineCode
      * @Description: TODO(线路下运营的车辆)
      */
@@ -870,16 +886,14 @@ public class DayOfSchedule implements CommandLineRunner {
      */
     public List<ScheduleRealInfo> changeCar(ScheduleRealInfo sch, String newClZbh) {
         List<ScheduleRealInfo> ups = new ArrayList<>();
-        /*String oldClzbh = sch.getClZbh();
-        if (oldClzbh.equals(newClZbh))
-            return ups;*/
-
  
         //变更相关映射信息
         nbbmScheduleMap.remove(sch.getClZbh(), sch);
  
         sch.setClZbh(newClZbh);
-        nbbmScheduleMap.put(newClZbh, sch);
+        if(!nbbmScheduleMap.containsEntry(newClZbh, sch)){
+            nbbmScheduleMap.put(newClZbh, sch);
+        }
  
         //重新计算班次应到时间
         //ups.addAll(updateQdzTimePlan(oldClzbh));
@@ -996,11 +1010,9 @@ public class DayOfSchedule implements CommandLineRunner {
      * @param nbbm
      * @param sets
      */
-    public void replaceByNbbm(String nbbm, Set<ScheduleRealInfo> sets){
+    public void replaceByNbbm(String nbbm, Collection<ScheduleRealInfo> sets){
         nbbmScheduleMap.removeAll(nbbm);
         nbbmScheduleMap.putAll(nbbm, sets);
-        //重新计算班次应到时间
-        updateQdzTimePlan(nbbm);
     }
  
     /**
@@ -49,10 +49,8 @@ import com.bsth.service.sys.DutyEmployeeService;
 import com.bsth.util.*;
 import com.bsth.websocket.handler.SendUtils;
 import com.google.common.base.Splitter;
-import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.BiMap;
 import com.google.common.collect.Lists;
-import com.google.common.collect.Multimap;
 import org.apache.commons.lang3.StringEscapeUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.joda.time.format.DateTimeFormat;
@@ -144,12 +142,12 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     public Map<String, Collection<ScheduleRealInfo>> findByLines(String lines) {
         List<String> lineList = Lists.newArrayList(Splitter.on(',').trimResults().omitEmptyStrings().split(lines));
  
-        Multimap<String, ScheduleRealInfo> mMap = ArrayListMultimap.create();
+        /*Multimap<String, ScheduleRealInfo> mMap = ArrayListMultimap.create();
  
         for (String lineCode : lineList) {
             mMap.putAll(lineCode, dayOfSchedule.findByLineCode(lineCode));
-        }
-        return mMap.asMap();
+        }*/
+        return dayOfSchedule.findByLineCodes(lineList);
     }
  
     private final static long DAY_TIME = 1000 * 60 * 60 * 24L;
@@ -171,8 +171,8 @@ var disabled_submit_btn = function (form) {
 function showUpdateDescription() {
     //更新说明
     var updateDescription = {
-        date: '2017-04-26',
-        text: '<h5>临加班次新增一项场到场</h5><h5>搜索框可按路牌搜索，lp 打头，st 和 et打头可搜索时间范围</h5>'
+        date: '2017-04-28 下午',
+        text: '<h5>修复在特定情况下出现线调界面班次显示不全，比路单少的情况。</h5><h5>尝试修复在特定情况下车辆走向不跟随班次执行结束而跳动的问题。</h5>'
     };
  
     var storage = window.localStorage