1.临港环境相应信息变更

王通
1 parent 5375a34e
Showing 12 changed files with 20 additions and 31 deletions
src/main/java/com/bsth/XDApplication.java
src/main/java/com/bsth/data/gpsdata_v2/load/SocketClientLoader.java
src/main/java/com/bsth/data/gpsdata_v2/thread/GpsDataLoaderThread.java
src/main/resources/application-prod.properties
src/main/resources/application.properties
src/main/resources/control-jdbc.properties
src/main/resources/datatools/config-prod.properties
src/main/resources/ms-jdbc.properties
src/main/resources/static/real_control_v2/fragments/north/nav/safeDriving.html
src/main/resources/static/real_control_v2/js/websocket/sch_websocket.js
src/main/resources/static/real_control_v2/mapmonitor/fragments/map_infowindow.html
src/main/resources/traffic-jdbc.properties
@@ -145,7 +145,7 @@ public class XDApplication implements CommandLineRunner {
         sexec.scheduleWithFixedDelay(scheduleRefreshThread, 10, 120, TimeUnit.SECONDS);//班次更新线程
         sexec.scheduleWithFixedDelay(scheduleLateThread, 140, 20, TimeUnit.SECONDS);//检查班次误点
         sexec.scheduleWithFixedDelay(gpsDataLoader, 100, 2, TimeUnit.SECONDS);//抓取GPS数据
-        sexec.scheduleWithFixedDelay(rfidDataLoader, 5, 5, TimeUnit.SECONDS);//抓取RFID数据
+        //sexec.scheduleWithFixedDelay(rfidDataLoader, 5, 5, TimeUnit.SECONDS);//抓取RFID数据
         sexec.scheduleWithFixedDelay(fixedCheckStationCodeThread, 60, 60 * 5, TimeUnit.SECONDS);//检查班次站点编码
         sexec.scheduleWithFixedDelay(offlineMonitorThread, 120, 60, TimeUnit.SECONDS);//GPS设备掉离线
@@ -189,7 +189,7 @@ public class XDApplication implements CommandLineRunner {
         sexec.scheduleWithFixedDelay(scheduleRefreshThread, 10, 120, TimeUnit.SECONDS);//班次更新线程
         sexec.scheduleWithFixedDelay(scheduleLateThread, 140, 20, TimeUnit.SECONDS);//检查班次误点
         sexec.scheduleWithFixedDelay(gpsDataLoader, 0, 2, TimeUnit.SECONDS);//抓取GPS数据
-        sexec.scheduleWithFixedDelay(rfidDataLoader, 5, 5, TimeUnit.SECONDS);//抓取RFID数据
+        //sexec.scheduleWithFixedDelay(rfidDataLoader, 5, 5, TimeUnit.SECONDS);//抓取RFID数据
         sexec.scheduleWithFixedDelay(fixedCheckStationCodeThread, 60, 60 * 5, TimeUnit.SECONDS);//检查班次站点编码
         sexec.scheduleWithFixedDelay(offlineMonitorThread, 120, 60, TimeUnit.SECONDS);//GPS设备掉离线
@@ -234,7 +234,7 @@ public class XDApplication implements CommandLineRunner {
         sexec.scheduleWithFixedDelay(scheduleRefreshThread, 10, 120, TimeUnit.SECONDS);//班次更新线程
         sexec.scheduleWithFixedDelay(scheduleLateThread, 140, 20, TimeUnit.SECONDS);//检查班次误点
         sexec.scheduleWithFixedDelay(gpsDataLoader, 0, 2, TimeUnit.SECONDS);//抓取GPS数据
-        sexec.scheduleWithFixedDelay(rfidDataLoader, 5, 5, TimeUnit.SECONDS);//抓取RFID数据
+        //sexec.scheduleWithFixedDelay(rfidDataLoader, 5, 5, TimeUnit.SECONDS);//抓取RFID数据
         sexec.scheduleWithFixedDelay(fixedCheckStationCodeThread, 60, 60 * 5, TimeUnit.SECONDS);//检查班次站点编码
         sexec.scheduleWithFixedDelay(offlineMonitorThread, 120, 60, TimeUnit.SECONDS);//GPS设备掉离线
@@ -24,7 +24,7 @@ import java.util.List;
  * 从专用的socket client 加载数据
  * Created by panzhao on 2017/11/15.
  */
-@Component
+//@Component
 public class SocketClientLoader {
     static Logger logger = LoggerFactory.getLogger(SocketClientLoader.class);
@@ -32,11 +32,7 @@ public class GpsDataLoaderThread extends Thread {
     @Override
     public void run() {
         try {
-            List<GpsEntity> list;
-            if (flag == 0)
-                list = SocketClientLoader.load();
-            else
-                list = GatewayHttpLoader.load();
+            List<GpsEntity> list = GatewayHttpLoader.load();
             if(null != list && list.size() > 0)
                 handleProcess.handle(list);
@@ -13,7 +13,7 @@ spring.jpa.show-sql= true
 #DATABASE
 spring.datasource.driver-class-name= com.mysql.jdbc.Driver
-spring.datasource.url= jdbc:mysql://10.10.200.121:3306/control?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
+spring.datasource.url= jdbc:mysql://106.14.119.95/control?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
 spring.datasource.username= root
 spring.datasource.password= root2jsp
 spring.datasource.type= com.zaxxer.hikari.HikariDataSource
@@ -30,19 +30,12 @@ spring.datasource.hikari.connection-test-query= SELECT 1
 spring.datasource.hikari.validation-timeout= 3000
 ## gps client data
-http.gps.real.cache.url= http://10.10.150.24:12580/realGps/all
+#http.gps.real.cache.url= http://10.10.150.24:12580/realGps/all
 ## gateway real data
-http.gps.real.url= http://10.10.200.79:8080/transport_server/rtgps/
+http.gps.real.url= http://106.14.30.180:18080/transport_server/rtgps/
 ## gateway send directive
-http.send.directive= http://10.10.200.79:8080/transport_server/message/
+http.send.directive= http://106.14.30.180:18080/transport_server/message/
 ## rfid data
 http.rfid.url= http://10.10.200.82:9000/rfid
 ## wxsb
-#http.report.url.05= http://192.168.168.154:8088/ygjwsystem_j2ee/clbx/clbx_dd.do
-#http.report.url.22= http://192.168.168.154:8088/jgjwsystem_j2ee/clbx/clbx_dd.do
-#http.report.url.26= http://192.168.168.154:8088/nhjwsystem_j2ee/clbx/clbx_dd.do
-#http.report.url.55= http://192.168.168.154:8088/snjwsystem_j2ee/clbx/clbx_dd.do
-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
 \ No newline at end of file
+http.report.url.400= http://101.132.34.225:8088/lgjwsystem_j2ee/clbx/clbx_dd.do
 \ No newline at end of file
-spring.profiles.active = test
+spring.profiles.active = prod
 spring.view.suffix=.html
 server.session-timeout=-1
 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://106.14.119.95/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
 station.mysql.username= root
 station.mysql.password= root2jsp
@@ -5,7 +5,7 @@ datatools.kettle_properties=/datatools/kettle.properties
 # 2、ktr文件通用配置变量（数据库连接，根据不同的环境需要修正）
 #数据库ip地址
-datatools.kvars_dbip=10.10.200.121
+datatools.kvars_dbip=106.14.119.95
 #数据库用户名
 datatools.kvars_dbuname=root
 #数据库密码
@@ -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://106.14.119.95/ms?useUnicode=true&characterEncoding=utf-8
 ms.mysql.username= root
 ms.mysql.password= root2jsp
 \ No newline at end of file
@@ -84,9 +84,9 @@
             <td>
                 <a class="image_link" href="{{sd.url}}.gif" data-uk-lightbox="{group:'gif_group2'}" title="{{sd.title}}">查看</a>
             </td>
-            <td>
+            <!--<td>
                 <a data-type="{{sd.yczltype}}" class="show_vedio_modal" style="color: grey">DVR</a>
-            </td>
+            </td>-->
         </tr>
         {{/each}}
     </script>
@@ -96,7 +96,7 @@ var gb_sch_websocket = (function () {
     };
     var safeDriv = function (msg) {
-        gb_safe_driv.pop(msg.t);
+        //gb_safe_driv.pop(msg.t);
     };
     /**
@@ -38,8 +38,8 @@
             {{if expectStopTime!=null}}
             <a href="javascript:;" style="color: #07D;margin-right: 7px;">预计 {{expectStopTime}} 分钟到达终点</a>
             {{/if}}
-            <a href="javascript:;" style="float: left;" onclick="javascript:window.open('http://211.95.61.66:9020/transport_server/dvr_monitor2.html?userid=4&zbh={{nbbm}}');">DVR</a>
-            <a href="W9:1@139.196.29.203@?method=call&1111:{{dvrcode}}" style="margin-left: 50px;" >拨打电话</a>
+            <!--<a href="javascript:;" style="float: left;" onclick="javascript:window.open('http://211.95.61.66:9020/transport_server/dvr_monitor2.html?userid=4&zbh={{nbbm}}');">DVR</a>
+            <a href="W9:1@139.196.29.203@?method=call&1111:{{dvrcode}}" style="margin-left: 50px;" >拨打电话</a>-->
             <a href="javascript:;" style="float: right;" onclick="javascript:gb_map_play_back.initParams('{{deviceId}}', '{{nbbm}}');">轨迹回放</a>
         </div>
     </script>
@@ -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://106.14.119.95/ms?useUnicode=true&characterEncoding=utf-8
 ms.mysql.username= root
 ms.mysql.password= root2jsp
 \ No newline at end of file