潘钊 / bsth_control · Commits

Commit 0c25bc7d9a732a0578f9286740b6c3122ca6d101

Authored by 王通
1 parent 5375a34e
build: skipped

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

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