自动撤销只判断未执行和正在执行的，百度地图密钥更新

ljq
1 parent ee209390
Showing 9 changed files with 36 additions and 12 deletions
pom.xml
src/main/java/com/bsth/data/zndd/AutomaticSch.java
src/main/java/com/bsth/data/zndd/dify/BusCongestionChecker.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/application-prod.properties
src/main/resources/application-test.properties
src/main/resources/static/index.html
src/main/resources/static/real_control_v2/js/zndd/data_zndd.js
src/main/resources/static/real_control_v2/main.html
@@ -190,6 +190,10 @@
                     <groupId>org.apache.xmlgraphics</groupId>
                     <artifactId>batik-js</artifactId>
                 </exclusion>
+				<exclusion>
+					<groupId>javassist</groupId>
+					<artifactId>javassist</artifactId>
+				</exclusion>
             </exclusions>
 		</dependency>
 		<dependency>
@@ -267,7 +267,7 @@ public class AutomaticSch {
                 Collections.sort(oldSchDateList, new ScheduleComparator.FCSJ());
                 for (ScheduleRealInfo t : oldSchDateList){
                     // 发车误点
-                    if (t.getDfsj() != null && t.getFcsjActual() != null
+                    if (t.getDfsj() != null && t.getFcsjActual() != null && (t.getStatus() == 0 || t.getStatus() == 1)
                             && (t.getBcType().equals("normal") || t.getBcType().equals("region"))) {
                         long sjc = t.getFcsjActualTime() - t.getDfsjT();
@@ -294,6 +294,7 @@ public class AutomaticSch {
                                     if (isCZ)
                                         continue;
                                 }
+
                                 //异常实发
                                 ts(addStationPeople(t, "YCSF", 0l));
                                 LogerWait("实发撤销",t);
@@ -16,10 +16,6 @@ import java.util.ArrayList;
 import java.util.List;
 public class BusCongestionChecker {
-    private static final String AK = "baidu.akyd=WnSDHZgtPbSbw2LfsH3KO3DDKWONmlYK"; // 替换为百度AK
-    private static final String ORIGIN = "40.056878,116.30815"; // 起点坐标
-    private static final String DESTINATION = "39.915285,116.403857"; // 终点坐标
-    private static final String CITY = "上海"; // 城市名
     static Logger logger = LoggerFactory.getLogger(BusCongestionChecker.class);
@@ -1742,7 +1742,13 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         try {
             ScheduleRealInfo sch = dayOfSchedule.get(id);
-            if (sch.getFcsjActual() == null) {
+            //已经完成班次的不自动撤销
+            if (sch.getStatus() == 2 && !sch.isDestroy()) {
+                //刷新班次不修改
+                rs.put("status", ResponseCode.SUCCESS);
+                ts.add(sch);
+                rs.put("ts", ts);
+            } else if (sch.getFcsjActual() == null) {
                 //刷新班次不修改
                 rs.put("status", ResponseCode.SUCCESS);
                 ts.add(sch);
@@ -40,11 +40,10 @@ sso.http.url.auth= http://10.10.200.142:9112/prod-api/system/utilitySystem/check
 dc.imgurl= /home/control/klimg
 dc.profile= profile
-baidu.ak=AYiBOs3f9qBQFhdKFsaboX6CfObmKwRP
+baidu.ak=YIT2mnCsfWkpbYnlLLqJ18ravGLs3OJS
 passengerFlow.url = http://192.168.168.32:9999/images/
 electricity.importFile.path= /home/control/elecImportFile
-baidu.akyd=WnSDHZgtPbSbw2LfsH3KO3DDKWONmlYK
 report_register.complaint.url= http://10.10.200.113:8060/complaint/TsReport/input.do
 path.speech.common = /home/control/speech/common/
@@ -40,9 +40,8 @@ sso.http.url.auth= http://10.10.200.142:9112/prod-api/system/utilitySystem/check
 dc.imgurl= E:/klimg
 dc.profile= profile
-baidu.ak=AYiBOs3f9qBQFhdKFsaboX6CfObmKwRP
+baidu.ak=YIT2mnCsfWkpbYnlLLqJ18ravGLs3OJS
 passengerFlow.url = http://127.0.0.1:9999/images/
-baidu.akyd=WnSDHZgtPbSbw2LfsH3KO3DDKWONmlYK
 electricity.importFile.path= E:/elecImportFile
 report_register.complaint.url= http://192.168.168.172:8080/complaint/TsReport/input.do
@@ -636,7 +636,7 @@
 <!-- 地图相关 -->
 <!-- 百度 -->
 <script
-		src="//api.map.baidu.com/api?v=3.0&ak=za84VXA5QasXtkxfixJ4AIkdKXi2ib1W"
+		src="//api.map.baidu.com/api?v=3.0&ak=1TgEKvYqohJyeGXnN6yHSSTb4psOarQwJ406ssE2HnNNJcnKGZ6BwXYfhOJawM2J"
 		data-exclude=1></script>
 <script
 		src="//api.map.baidu.com/library/TrafficControl/1.4/src/TrafficControl_min.js"
@@ -46,6 +46,14 @@ var gb_dataZndd = (function (){
             configureDkl();
             return;
         }
+        //实发撤销 -- 过滤个别线路
+        if (data.type == 'YCSF'){
+            if (YCSF(data.lineCode) == true){
+                configure();
+            }
+            return;
+        }
+
         //末二班车
         if (data.type == 'DESCTWO'){
             if (mo_two(data.lineCode) == true){
@@ -134,6 +142,17 @@ var gb_dataZndd = (function (){
         center: false,
         bgclose: false
     }
+    //特别线路发车及不准点过滤掉
+
+    function YCSF(line){
+        var t =[230814];
+
+        for (var lines in t){
+            if(line == t[lines])
+                return false;
+        }
+        return  true;
+    }
     //芦潮港1路 新临专线，临港10路， 浦东107路， 浦东91路，1078路，1135路，南临专线，临港4路，浦东111路，浦东74路，临港13路，申港3路，浦东29路，新芦专线
@@ -127,7 +127,7 @@
 </script>
 <!-- 地图相关 -->
-<script src="//api.map.baidu.com/api?v=2.0&ak=za84VXA5QasXtkxfixJ4AIkdKXi2ib1W"></script>
+<script src="//api.map.baidu.com/api?v=2.0&ak=1TgEKvYqohJyeGXnN6yHSSTb4psOarQwJ406ssE2HnNNJcnKGZ6BwXYfhOJawM2J"></script>
 <script src="//api.map.baidu.com/library/TrafficControl/1.4/src/TrafficControl_min.js"></script>
 <script src="/assets/js/baidu//MarkerClusterer.js" merge="plugins"></script>
 <script src="/assets/js/CoordinateConverter.js" merge="plugins"></script>