update...

潘钊
1 parent b69e5ebb
Showing 8 changed files with 117 additions and 7 deletions
src/main/java/com/bsth/controller/realcontrol/RealMapController.java
src/main/java/com/bsth/data/gpsdata/arrival/GeoCacheData.java
src/main/java/com/bsth/data/gpsdata/arrival/entity/TimedEnableStationRoute.java
src/main/java/com/bsth/data/schedule/SchAttrCalculator.java
src/main/resources/static/real_control_v2/mapmonitor/css/real.css
src/main/resources/static/real_control_v2/mapmonitor/js/config.js
src/main/resources/static/real_control_v2/mapmonitor/js/map/platform/baidu.js
src/main/resources/static/real_control_v2/mapmonitor/real.html
 package com.bsth.controller.realcontrol;
+import com.bsth.data.gpsdata.arrival.GeoCacheData;
+import com.bsth.data.gpsdata.arrival.entity.TimedEnableStationRoute;
 import com.bsth.service.realcontrol.RealMapService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
@@ -74,4 +77,9 @@ public class RealMapController {
     public Map<String, Object> multiSectionRoute(@RequestParam String codeIdx){
         return realMapService.multiSectionRoute(codeIdx);
     }
+
+    @RequestMapping(value = "/lockAndFlxedTimeEnabled", method = RequestMethod.POST)
+    public void lockAndFlxedTimeEnabled(TimedEnableStationRoute tes){
+        GeoCacheData.tesMap.put(tes.getLineCode(), tes);
+    }
 }
@@ -2,6 +2,7 @@ package com.bsth.data.gpsdata.arrival;
 import com.bsth.data.gpsdata.GpsEntity;
 import com.bsth.data.gpsdata.arrival.entity.StationRoute;
+import com.bsth.data.gpsdata.arrival.entity.TimedEnableStationRoute;
 import com.bsth.data.gpsdata.arrival.utils.CircleQueue;
 import com.bsth.data.gpsdata.arrival.utils.StationRouteComp;
 import com.google.common.collect.ArrayListMultimap;
@@ -53,6 +54,10 @@ public class GeoCacheData {
     //线路限速信息
     private static Map<String, Double> speedLimitMap;
+    //需要定时刷新的站点路由
+    public static Map<String, TimedEnableStationRoute> tesMap = new HashMap<>();
+    //TimedEnableStationRoute
+
     @Autowired
     JdbcTemplate jdbcTemplate;
@@ -282,6 +287,28 @@ public class GeoCacheData {
                 connectStationRoute(tempMap.get(key));
             }
+            //定时启用的站点走向
+            if(tesMap.size() > 0){
+                List<String> rems = new ArrayList<>();
+                long t = System.currentTimeMillis();
+                for(TimedEnableStationRoute tes : tesMap.values()){
+                    if(tes.getEnableTime() > t){
+                        logger.info("锁住站点路由，"  + tes.getLineCode());
+                        tempMap.replaceValues(tes.getLineCode() + "_0", stationCacheMap.get(tes.getLineCode() + "_0"));
+                        tempMap.replaceValues(tes.getLineCode() + "_1", stationCacheMap.get(tes.getLineCode() + "_1"));
+                    }
+                    else
+                        rems.add(tes.getLineCode());
+                }
+
+                //remove
+                if(rems.size() > 0){
+                    for(String lineCode : rems){
+                        logger.info("启用路由，"  + lineCode);
+                        tesMap.remove(lineCode);
+                    }
+                }
+            }
             stationCacheMap = tempMap;
             routeCodeMap = codeMap;
         }
+package com.bsth.data.gpsdata.arrival.entity;
+
+/**
+ * 定时启用站点路由
+ * Created by panzhao on 2017/8/28.
+ */
+public class TimedEnableStationRoute {
+
+    private String lineCode;
+
+    private Long enableTime;
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    public Long getEnableTime() {
+        return enableTime;
+    }
+
+    public void setEnableTime(Long enableTime) {
+        this.enableTime = enableTime;
+    }
+}
@@ -117,8 +117,7 @@ public class SchAttrCalculator {
 		for(int i = 1; i < len; i ++){
 			curr = list.get(i);
-			if(prve.getZdzName().equals(curr.getQdzName())
-					|| prve.getZdzCode().equals(curr.getQdzCode())){
+			if(isJoin(prve, curr)){
 				curr.setQdzArrDatejh(prve.getZdsj());
 				if(StringUtils.isNotEmpty(prve.getZdsjActual()))
 					curr.setQdzArrDatesj(prve.getZdsjActual());
@@ -126,6 +125,13 @@ public class SchAttrCalculator {
 			prve = curr;
 		}
 	}
+
+	private boolean isJoin(ScheduleRealInfo prve, ScheduleRealInfo curr) {
+		return prve.getZdzName().equals(curr.getQdzName())//名称相等
+				|| prve.getZdzCode().equals(curr.getQdzCode())//编码相等
+				|| prve.getZdzName().startsWith(curr.getQdzName())//起始包括
+				|| curr.getQdzName().startsWith(prve.getZdzName());//起始包括
+	}
 	/**
 	 * 
@@ -64,7 +64,7 @@ input[type=checkbox].disabled{
     position: absolute;
     z-index: 2;
     top: 20px;
-    background: red;
+    background: white;
     color: white;
     padding: 7px 25px 7px 7px;
     right: calc(50% - 250px);
@@ -87,14 +87,17 @@ input[type=checkbox].disabled{
     box-shadow: none;
 }
-.map-system-msg.flex-left a:before{
-    content: '老版本地图';
+.map-system-msg.flex-left a.now_map{
+    top: 35px;
+    width: 50px;
+}
+
+.map-system-msg.flex-left a:after{
     position: absolute;
     width: 100%;
     z-index: 2;
     height: 100%;
     background: #ffffff;
-    top: 0;
     left: 0;
     text-align: center;
     font-size: 12px;
@@ -102,6 +105,26 @@ input[type=checkbox].disabled{
     color: #969696;
 }
+.map-system-msg.flex-left a.old_map:after{
+    content: '老版本地图';
+    top: 0;
+}
+
+.map-system-msg.flex-left a.now_map>i{
+    font-size: 12px;
+    vertical-align: top;
+    color: #535151;
+    margin-top: -1px;
+}
+
+.map-system-msg.flex-left a.now_map:after{
+    content: '单屏地图';
+    top: 0;
+    left: 20px;
+    text-align: left;
+    text-indent: 7px;
+}
+
 .map-system-msg a:hover{
     text-decoration: none;
 }
@@ -111,6 +111,8 @@ var gb_map_config = (function () {
     function trafficSwitch(val) {
         //修改配置项
         set('traffic', this.checked);
+
+        gb_map_imap.call('transparent_line', this.checked);
         gb_map_imap.call('traffic', this.checked);
     }
@@ -57,6 +57,19 @@ var gb_map_baidu = (function(){
 			//根据ID保存映射
 			polylines[opt.id]=_pLines;
+		}
+		,
+		transparent_line: function (checked) {
+			for(var id in polylines){
+				for(var i=0,polyline;polyline=polylines[id][i++];){
+					if(polyline.isVisible()){
+						if(checked)
+							polyline.setStrokeOpacity(0);
+						else
+							polyline.setStrokeOpacity(1);
+					}
+				}
+			}
 		},
 		traffic: function (enable) {
 			if(enable)
@@ -6,7 +6,10 @@
 <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/progress.gradient.min.css" merge="map_plugins">
 <div class="map-system-msg flex-left">
-    <a class="z-depth-2" href="/pages/mapmonitor/alone/wrap.html" target="_blank"></a>
+    <a class="z-depth-2 old_map" href="/pages/mapmonitor/alone/wrap.html" target="_blank"></a>
+    <a class="z-depth-2 now_map" href="/real_control_v2/mapmonitor/alone_page/alone_wrap.html" target="_blank">
+        <i class="uk-icon-send-o"></i>
+    </a>
 </div>
 <div id="real_map_container"></div>