1.配置变更

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