Merge branch 'pudong' of http://222.66.0.204:8090//panzhaov5/bsth_control into pudong

徐烜
2 parents c5456b0b fc605612
Showing 7 changed files with 51 additions and 22 deletions
src/main/java/com/bsth/common/Constants.java
src/main/java/com/bsth/data/gpsdata_v2/GpsRealData.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/filter/BaseFilter.java
src/main/java/com/bsth/security/WebSecurityConfig.java
src/main/java/com/bsth/security/filter/LoginInterceptor.java
src/main/resources/static/index.html
@@ -38,6 +38,7 @@ public class Constants {
 	public static final String SESSION_USERNAME = "sessionUserName";
 	public static final String COMPANY_AUTHORITYS = "cmyAuths";
+	public static final String STATION_AND_SECTION_COUNT = "/station/updateStationAndSectionCode";
 	/**
 	 * 解除调度指令和班次的外键约束
@@ -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();
     }
@@ -17,7 +17,7 @@ public abstract class BaseFilter implements Filter {
 	 * 白名单
 	 */
 	private String[] whiteListURLs = { Constants.LOGIN_PAGE,Constants.CAPTCHA, Constants.SERVICE_INTERFACE,
-			Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.METRONIC_URL, Constants.LOGIN, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES, Constants.XD_REAL_GPS, Constants.UP_RFID_URL };
+			Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.METRONIC_URL, Constants.LOGIN, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES, Constants.XD_REAL_GPS, Constants.UP_RFID_URL, Constants.STATION_AND_SECTION_COUNT };
 	@Override
 	public void destroy() {
@@ -36,7 +36,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
     public void configure(WebSecurity web) throws Exception {
         // 白名单
         web.ignoring().antMatchers(Constants.LOGIN_PAGE, Constants.LOGIN, Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.CAPTCHA,
-                Constants.SERVICE_INTERFACE, Constants.METRONIC_URL, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES, Constants.UP_RFID_URL);
+                Constants.SERVICE_INTERFACE, Constants.METRONIC_URL, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES, Constants.UP_RFID_URL,Constants.STATION_AND_SECTION_COUNT);
     }
     @Override
@@ -33,7 +33,7 @@ public class LoginInterceptor implements Filter {
 	 * 相比于 BaseFilter，此处对线调GPS请求进行了拦截验证
 	 */
 	private String[] whiteListURLs = { Constants.LOGIN_PAGE,Constants.CAPTCHA, Constants.SERVICE_INTERFACE,
-			Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.METRONIC_URL, Constants.LOGIN, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES, Constants.UP_RFID_URL };
+			Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.METRONIC_URL, Constants.LOGIN, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES, Constants.UP_RFID_URL,Constants.STATION_AND_SECTION_COUNT };
 	@Override
@@ -612,24 +612,24 @@
 <!-- 地图相关 -->
 <!-- 百度 -->
-<!--<script-->
-		<!--src="http://api.map.baidu.com/api?v=2.0&ak=IGGrr4UjwIYzatoCRFKEL8sT"-->
-		<!--data-exclude=1></script>-->
-<!--<script-->
-		<!--src="http://api.map.baidu.com/library/TrafficControl/1.4/src/TrafficControl_min.js"-->
-		<!--data-exclude=1></script>-->
-<!--<script type="text/javascript"-->
-		<!--src="http://api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.js"-->
-		<!--data-exclude=1></script>-->
-<!--<script type="text/javascript"-->
-		<!--src="http://api.map.baidu.com/library/RichMarker/1.2/src/RichMarker_min.js "-->
-		<!--data-exclude=1></script>-->
+<script
+		src="http://api.map.baidu.com/api?v=2.0&ak=IGGrr4UjwIYzatoCRFKEL8sT"
+		data-exclude=1></script>
+<script
+		src="http://api.map.baidu.com/library/TrafficControl/1.4/src/TrafficControl_min.js"
+		data-exclude=1></script>
+<script type="text/javascript"
+		src="http://api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.js"
+		data-exclude=1></script>
+<script type="text/javascript"
+		src="http://api.map.baidu.com/library/RichMarker/1.2/src/RichMarker_min.js "
+		data-exclude=1></script>
 <script src="/assets/js/baidu/TextIconOverlay.js" data-exclude=1></script>
 <script src="/assets/js/baidu//MarkerClusterer.js" data-exclude=1></script>
 <!-- 高德  -->
-<!--<script-->
-		<!--src="http://webapi.amap.com/maps?v=1.3&key=16cb1c5043847e09ef9edafdd77befda"-->
-		<!--data-exclude=1></script>-->
+<script
+		src="http://webapi.amap.com/maps?v=1.3&key=16cb1c5043847e09ef9edafdd77befda"
+		data-exclude=1></script>
 <script src="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.jquery.js"  merge="plugins"></script>