update..

潘钊
1 parent 72c5e34b
Showing 2 changed files with 32 additions and 4 deletions
src/main/java/com/bsth/data/gpsdata_v2/GpsRealData.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
@@ -123,7 +123,13 @@ public class GpsRealData {
      * @Title: get @Description: TODO(线路编码获取GPS集合) @throws
      */
     public List<GpsEntity> getByLine(String lineCode) {
-        NavigableSet<String> set = lineCode2Devices.get(lineCode);
+        NavigableSet<String> set = lineCode2Devices.get(lineCode);//实际车载
+        Set<String> nbbmSet = dayOfSchedule.findCarByLineCode(lineCode);//计划用车
+
+        Map<String, String> nbbm2deviceMap = BasicData.deviceId2NbbmMap.inverse();
+        for(String nbbm : nbbmSet){
+            set.add(nbbm2deviceMap.get(nbbm));
+        }
  
         List<GpsEntity> rs = new ArrayList<>();
         GpsEntity gps;
@@ -15,6 +15,7 @@ import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
 import com.bsth.service.schedule.SchedulePlanInfoService;
 import com.bsth.websocket.handler.SendUtils;
 import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.HashMultimap;
 import org.apache.commons.lang3.StringUtils;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
@@ -55,6 +56,9 @@ public class DayOfSchedule {
     // 按车辆分组的班次数据
     private static ArrayListMultimap<String, ScheduleRealInfo> nbbmScheduleMap;
  
+    //按线路分组计划用车
+    private static HashMultimap<String, String> lineNbbmsMap;
+
     //按路牌分组的班次数据 线路编码_路牌名称 ——> 班次list
     private static ArrayListMultimap<String, ScheduleRealInfo> lpScheduleMap;
  
@@ -199,6 +203,8 @@ public class DayOfSchedule {
                 reCalcExecPlan(nbbm);
             }
  
+            //分组计划用车
+            reCalcLineNbbms();
             // 页面 翻班通知
             //sendUtils.shiftSchedule(lineCode);
         } catch (Exception e) {
@@ -543,15 +549,15 @@ public class DayOfSchedule {
      * @Description: TODO(线路下运营的车辆)
      */
     public Set<String> findCarByLineCode(String lineCode) {
-        Set<String> rs = new HashSet<>();
+        /*Set<String> rs = new HashSet<>();
  
         Collection<ScheduleRealInfo> schs = nbbmScheduleMap.values();
         for (ScheduleRealInfo sch : schs) {
             if (sch.getXlBm().equals(lineCode))
                 rs.add(sch.getClZbh());
         }
-
-        return rs;
+*/
+        return lineNbbmsMap.get(lineCode);
     }
  
     public List<ScheduleRealInfo> findByNbbm(String nbbm) {
@@ -908,6 +914,8 @@ public class DayOfSchedule {
         //重新计算车辆当前执行班次
         reCalcExecPlan(newClZbh);
         reCalcExecPlan(sch.getClZbh());
+        //重新分组计划用车
+        reCalcLineNbbms();
         return ups;
     }
  
@@ -1082,6 +1090,20 @@ public class DayOfSchedule {
         return id2SchedulMap.size();
     }
  
+    /**
+     * 重新计算线路计划用车
+     */
+    public void reCalcLineNbbms(){
+        HashMultimap<String, String> multimap = HashMultimap.create();
+
+        Collection<ScheduleRealInfo> schs = nbbmScheduleMap.values();
+        for (ScheduleRealInfo sch : schs) {
+            multimap.put(sch.getXlBm(), sch.getClZbh());
+        }
+
+        lineNbbmsMap = multimap;
+    }
+
     public String sizeString(){
         return id2SchedulMap.size() + "/" + nbbmScheduleMap.size();
     }