潘钊 / bsth_control · Commits

Commit 66b33865d333ff372636903fb585c10fcdbe16ac

Authored by 徐烜
2 parents c1cab68d c531f0e7
build: skipped

Merge branch 'pudong_jdk8' of http://101.95.0.106:8888/panzhaov5/bsth_control into pudong_jdk8

Inline Side-by-side
Showing 7 changed files with 14 additions and 4 deletions
src/main/java/com/bsth/XDApplication.java
  View file @66b3386
... ... @@ -239,6 +239,7 @@ public class XDApplication implements CommandLineRunner {
239 239 ScheduledExecutorService sexec = Application.mainServices;
240 240 //安全驾驶
241 241 sexec.scheduleWithFixedDelay(safeDrivDataLoadThread, 180, 10, TimeUnit.SECONDS);
  242 + sexec.scheduleWithFixedDelay(mtPlanDataLoadThread, 180, 10, TimeUnit.SECONDS);
242 243  
243 244 GpsDataLoaderThread.setFlag(-1);
244 245 //dayOfSchedule.dataRecovery();
... ... @@ -285,6 +286,7 @@ public class XDApplication implements CommandLineRunner {
285 286 ScheduledExecutorService sexec = Application.mainServices;
286 287 //安全驾驶
287 288 sexec.scheduleWithFixedDelay(safeDrivDataLoadThread, 180, 10, TimeUnit.SECONDS);
  289 + sexec.scheduleWithFixedDelay(mtPlanDataLoadThread, 180, 10, TimeUnit.SECONDS);
288 290  
289 291 GpsDataLoaderThread.setFlag(-1);
290 292 /** 线调业务 */
... ...
src/main/java/com/bsth/websocket/handler/SendUtils.java
  View file @66b3386
... ... @@ -261,7 +261,9 @@ public class SendUtils{
261 261 ObjectMapper mapper = new ObjectMapper();
262 262  
263 263 try {
264   - socketHandler.sendMessageToLine(maintenancePlan.getLine(), mapper.writeValueAsString(map));
  264 + if (maintenancePlan.getLine() != null) {
  265 + socketHandler.sendMessageToLine(maintenancePlan.getLine(), mapper.writeValueAsString(map));
  266 + }
265 267 } catch (JsonProcessingException e) {
266 268 logger.error("sendMaintenancePlan", e);
267 269 }
... ...
src/main/resources/application-cloud.properties
  View file @66b3386
... ... @@ -38,6 +38,11 @@ http.gps.real.url= http://192.170.100.252:8080/transport_server/rtgps/
38 38 http.send.directive = http://192.170.100.252:8080/transport_server/message/
39 39 ## rfid data
40 40 http.rfid.url= http://192.170.100.80:9000/rfid
  41 +## wxsb
  42 +http.report.url.05= http://116.228.197.222:8081/ygjwsystem_j2ee/clbx/clbx_dd.do
  43 +http.report.url.22= http://116.247.73.122:9098/jgjwsystem_j2ee/clbx/clbx_dd.do
  44 +http.report.url.26= http://116.236.141.34:8088/nhjwsystem_j2ee/clbx/clbx_dd.do
  45 +http.report.url.55= http://180.168.216.248:8088/snjwsystem_j2ee/clbx/clbx_dd.do
41 46 ## http ticketing interface
42 47 http.ticketing.interface= http://112.64.187.3:1080/gjService/request
43 48 http.mtplan.interface= https://112.64.45.51/wxk-prod-api/service-api/pdgj/schedule/byinfo
... ...
src/main/resources/control-jdbc.properties
  View file @66b3386
1 1 station.mysql.driver= com.mysql.jdbc.Driver
2   -station.mysql.url= jdbc:mysql://10.10.200.121:3306/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
  2 +station.mysql.url= jdbc:mysql://192.170.100.132/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
3 3 station.mysql.username= root
4 4 station.mysql.password= root2jsp
5 5  
... ...
src/main/resources/ms-jdbc.properties
  View file @66b3386
... ... @@ -4,6 +4,6 @@
4 4 #ms.mysql.password= 123456
5 5  
6 6 ms.mysql.driver= com.mysql.jdbc.Driver
7   -ms.mysql.url= jdbc:mysql://10.10.150.122:3306/ms?useUnicode=true&characterEncoding=utf-8
  7 +ms.mysql.url= jdbc:mysql://192.170.100.63/ms?useUnicode=true&characterEncoding=utf-8
8 8 ms.mysql.username= root
9 9 ms.mysql.password= root2jsp
10 10 \ No newline at end of file
... ...
src/main/resources/static/real_control_v2/js/safe_driv/safeDriv.js
  View file @66b3386
... ... @@ -86,6 +86,7 @@ var gb_safe_driv = (function () {
86 86 // 浦东公交维修库
87 87 case 'mt':
88 88 var data = { zbh: $(this).data('zbh'), bydj: $(this).data('bydj'), bysj: $(this).data('bysj'), bydd: $(this).data('bydd')};
  89 + $(this).remove();
89 90 window.localStorage.setItem('mtPlanModal', JSON.stringify(data));
90 91 open_modal('/real_control_v2/fragments/multi_plat_msg/mt_plan_modal.html', {}, {center: false, bgclose: false});
91 92 break;
... ...
src/main/resources/traffic-jdbc.properties
  View file @66b3386
... ... @@ -4,6 +4,6 @@
4 4 #ms.mysql.password= 123456
5 5  
6 6 ms.mysql.driver= com.mysql.jdbc.Driver
7   -ms.mysql.url= jdbc:mysql://10.10.150.122:3306/ms?useUnicode=true&characterEncoding=utf-8
  7 +ms.mysql.url= jdbc:mysql://192.170.100.63/ms?useUnicode=true&characterEncoding=utf-8
8 8 ms.mysql.username= root
9 9 ms.mysql.password= root2jsp
10 10 \ No newline at end of file
... ...