潘钊 / bsth_control · Commits

Commit e2ca99830892d78d49cba69d2bba5902177a35c2

Authored by ljq
1 parent ee209390
build: skipped

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

Inline Side-by-side
Showing 9 changed files with 36 additions and 12 deletions
... ... @@ -190,6 +190,10 @@
190 190 <groupId>org.apache.xmlgraphics</groupId>
191 191 <artifactId>batik-js</artifactId>
192 192 </exclusion>
  193 + <exclusion>
  194 + <groupId>javassist</groupId>
  195 + <artifactId>javassist</artifactId>
  196 + </exclusion>
193 197 </exclusions>
194 198 </dependency>
195 199 <dependency>
... ...
src/main/java/com/bsth/data/zndd/AutomaticSch.java
  View file @e2ca998
... ... @@ -267,7 +267,7 @@ public class AutomaticSch {
267 267 Collections.sort(oldSchDateList, new ScheduleComparator.FCSJ());
268 268 for (ScheduleRealInfo t : oldSchDateList){
269 269 // 发车误点
270   - if (t.getDfsj() != null && t.getFcsjActual() != null
  270 + if (t.getDfsj() != null && t.getFcsjActual() != null && (t.getStatus() == 0 || t.getStatus() == 1)
271 271 && (t.getBcType().equals("normal") || t.getBcType().equals("region"))) {
272 272  
273 273 long sjc = t.getFcsjActualTime() - t.getDfsjT();
... ... @@ -294,6 +294,7 @@ public class AutomaticSch {
294 294 if (isCZ)
295 295 continue;
296 296 }
  297 +
297 298 //异常实发
298 299 ts(addStationPeople(t, "YCSF", 0l));
299 300 LogerWait("实发撤销",t);
... ...
src/main/java/com/bsth/data/zndd/dify/BusCongestionChecker.java
  View file @e2ca998
... ... @@ -16,10 +16,6 @@ import java.util.ArrayList;
16 16 import java.util.List;
17 17  
18 18 public class BusCongestionChecker {
19   - private static final String AK = "baidu.akyd=WnSDHZgtPbSbw2LfsH3KO3DDKWONmlYK"; // 替换为百度AK
20   - private static final String ORIGIN = "40.056878,116.30815"; // 起点坐标
21   - private static final String DESTINATION = "39.915285,116.403857"; // 终点坐标
22   - private static final String CITY = "上海"; // 城市名
23 19  
24 20 static Logger logger = LoggerFactory.getLogger(BusCongestionChecker.class);
25 21  
... ...
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
  View file @e2ca998
... ... @@ -1742,7 +1742,13 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
1742 1742  
1743 1743 try {
1744 1744 ScheduleRealInfo sch = dayOfSchedule.get(id);
1745   - if (sch.getFcsjActual() == null) {
  1745 + //已经完成班次的不自动撤销
  1746 + if (sch.getStatus() == 2 && !sch.isDestroy()) {
  1747 + //刷新班次不修改
  1748 + rs.put("status", ResponseCode.SUCCESS);
  1749 + ts.add(sch);
  1750 + rs.put("ts", ts);
  1751 + } else if (sch.getFcsjActual() == null) {
1746 1752 //刷新班次不修改
1747 1753 rs.put("status", ResponseCode.SUCCESS);
1748 1754 ts.add(sch);
... ...
src/main/resources/application-prod.properties
  View file @e2ca998
... ... @@ -40,11 +40,10 @@ sso.http.url.auth= http://10.10.200.142:9112/prod-api/system/utilitySystem/check
40 40 dc.imgurl= /home/control/klimg
41 41 dc.profile= profile
42 42  
43   -baidu.ak=AYiBOs3f9qBQFhdKFsaboX6CfObmKwRP
  43 +baidu.ak=YIT2mnCsfWkpbYnlLLqJ18ravGLs3OJS
44 44 passengerFlow.url = http://192.168.168.32:9999/images/
45 45  
46 46 electricity.importFile.path= /home/control/elecImportFile
47   -baidu.akyd=WnSDHZgtPbSbw2LfsH3KO3DDKWONmlYK
48 47 report_register.complaint.url= http://10.10.200.113:8060/complaint/TsReport/input.do
49 48  
50 49 path.speech.common = /home/control/speech/common/
... ...
src/main/resources/application-test.properties
  View file @e2ca998
... ... @@ -40,9 +40,8 @@ sso.http.url.auth= http://10.10.200.142:9112/prod-api/system/utilitySystem/check
40 40 dc.imgurl= E:/klimg
41 41 dc.profile= profile
42 42  
43   -baidu.ak=AYiBOs3f9qBQFhdKFsaboX6CfObmKwRP
  43 +baidu.ak=YIT2mnCsfWkpbYnlLLqJ18ravGLs3OJS
44 44 passengerFlow.url = http://127.0.0.1:9999/images/
45   -baidu.akyd=WnSDHZgtPbSbw2LfsH3KO3DDKWONmlYK
46 45 electricity.importFile.path= E:/elecImportFile
47 46  
48 47 report_register.complaint.url= http://192.168.168.172:8080/complaint/TsReport/input.do
... ...
src/main/resources/static/index.html
  View file @e2ca998
... ... @@ -636,7 +636,7 @@
636 636 <!-- 地图相关 -->
637 637 <!-- 百度 -->
638 638 <script
639   - src="//api.map.baidu.com/api?v=3.0&ak=za84VXA5QasXtkxfixJ4AIkdKXi2ib1W"
  639 + src="//api.map.baidu.com/api?v=3.0&ak=1TgEKvYqohJyeGXnN6yHSSTb4psOarQwJ406ssE2HnNNJcnKGZ6BwXYfhOJawM2J"
640 640 data-exclude=1></script>
641 641 <script
642 642 src="//api.map.baidu.com/library/TrafficControl/1.4/src/TrafficControl_min.js"
... ...
src/main/resources/static/real_control_v2/js/zndd/data_zndd.js
  View file @e2ca998
... ... @@ -46,6 +46,14 @@ var gb_dataZndd = (function (){
46 46 configureDkl();
47 47 return;
48 48 }
  49 + //实发撤销 -- 过滤个别线路
  50 + if (data.type == 'YCSF'){
  51 + if (YCSF(data.lineCode) == true){
  52 + configure();
  53 + }
  54 + return;
  55 + }
  56 +
49 57 //末二班车
50 58 if (data.type == 'DESCTWO'){
51 59 if (mo_two(data.lineCode) == true){
... ... @@ -134,6 +142,17 @@ var gb_dataZndd = (function (){
134 142 center: false,
135 143 bgclose: false
136 144 }
  145 + //特别线路发车及不准点过滤掉
  146 +
  147 + function YCSF(line){
  148 + var t =[230814];
  149 +
  150 + for (var lines in t){
  151 + if(line == t[lines])
  152 + return false;
  153 + }
  154 + return true;
  155 + }
137 156  
138 157  
139 158 //芦潮港1路 新临专线，临港10路， 浦东107路， 浦东91路，1078路，1135路，南临专线，临港4路，浦东111路，浦东74路，临港13路，申港3路，浦东29路，新芦专线
... ...
src/main/resources/static/real_control_v2/main.html
  View file @e2ca998
... ... @@ -127,7 +127,7 @@
127 127 </script>
128 128  
129 129 <!-- 地图相关 -->
130   -<script src="//api.map.baidu.com/api?v=2.0&ak=za84VXA5QasXtkxfixJ4AIkdKXi2ib1W"></script>
  130 +<script src="//api.map.baidu.com/api?v=2.0&ak=1TgEKvYqohJyeGXnN6yHSSTb4psOarQwJ406ssE2HnNNJcnKGZ6BwXYfhOJawM2J"></script>
131 131 <script src="//api.map.baidu.com/library/TrafficControl/1.4/src/TrafficControl_min.js"></script>
132 132 <script src="/assets/js/baidu//MarkerClusterer.js" merge="plugins"></script>
133 133 <script src="/assets/js/CoordinateConverter.js" merge="plugins"></script>
... ...