Commit 715eb08b20513c2c4b290b28026ab5dd948294b5
1 parent
ec25859a
1.测试系统
Showing
4 changed files
with
11 additions
and
11 deletions
src/main/java/com/bsth/XDApplication.java
| @@ -172,14 +172,14 @@ public class XDApplication implements CommandLineRunner { | @@ -172,14 +172,14 @@ public class XDApplication implements CommandLineRunner { | ||
| 172 | sexec.scheduleWithFixedDelay(sampleTimeDataLoader, 140, 120 * 60, TimeUnit.SECONDS);//到离站预测需要的站点间耗时数据 | 172 | sexec.scheduleWithFixedDelay(sampleTimeDataLoader, 140, 120 * 60, TimeUnit.SECONDS);//到离站预测需要的站点间耗时数据 |
| 173 | sexec.scheduleWithFixedDelay(basicDataLoader, 1, 1, TimeUnit.HOURS);//基础数据更新 | 173 | sexec.scheduleWithFixedDelay(basicDataLoader, 1, 1, TimeUnit.HOURS);//基础数据更新 |
| 174 | sexec.scheduleWithFixedDelay(autoExecScanThread, 180, 50, TimeUnit.SECONDS);//班次自动执行 | 174 | sexec.scheduleWithFixedDelay(autoExecScanThread, 180, 50, TimeUnit.SECONDS);//班次自动执行 |
| 175 | - DirectivePushQueue.start();//消息队列 -指令,系统下发的 | 175 | + //DirectivePushQueue.start();//消息队列 -指令,系统下发的 |
| 176 | WebSocketPushQueue.start();//消息队列 -webSocket ,推送至线调web页面的 | 176 | WebSocketPushQueue.start();//消息队列 -webSocket ,推送至线调web页面的 |
| 177 | 177 | ||
| 178 | /** 线调为其他程序提供的数据 --写入数据库 */ | 178 | /** 线调为其他程序提供的数据 --写入数据库 */ |
| 179 | sexec.scheduleWithFixedDelay(fcxxUpdateThread, 160, 30, TimeUnit.SECONDS);//发车信息(发车屏、信息发布) | 179 | sexec.scheduleWithFixedDelay(fcxxUpdateThread, 160, 30, TimeUnit.SECONDS);//发车信息(发车屏、信息发布) |
| 180 | //线路首末班数据(网关用,班次更新时写入) | 180 | //线路首末班数据(网关用,班次更新时写入) |
| 181 | //com.bsth.data.schedule.f_a_l.FirstAndLastHandler | 181 | //com.bsth.data.schedule.f_a_l.FirstAndLastHandler |
| 182 | - sexec.scheduleWithFixedDelay(schSiginUpdateDBThread, 160, 60 * 30, TimeUnit.SECONDS);//无法自动完成的班次信息(网关用,补信号) | 182 | + //sexec.scheduleWithFixedDelay(schSiginUpdateDBThread, 160, 60 * 30, TimeUnit.SECONDS);//无法自动完成的班次信息(网关用,补信号) |
| 183 | 183 | ||
| 184 | //运管处静态数据提交 | 184 | //运管处静态数据提交 |
| 185 | log.info(timeDiff / 1000 / 60 + "分钟之后提交到运管处"); | 185 | log.info(timeDiff / 1000 / 60 + "分钟之后提交到运管处"); |
src/main/java/com/bsth/data/schedule/f_a_l/FirstAndLastHandler.java
| @@ -110,7 +110,7 @@ public class FirstAndLastHandler { | @@ -110,7 +110,7 @@ public class FirstAndLastHandler { | ||
| 110 | } | 110 | } |
| 111 | 111 | ||
| 112 | public static void saveAll(){ | 112 | public static void saveAll(){ |
| 113 | - if(!flag) | 113 | + /*if(!flag) |
| 114 | return; | 114 | return; |
| 115 | 115 | ||
| 116 | final List<ToGateway> pstList = new ArrayList<>(maps.values()); | 116 | final List<ToGateway> pstList = new ArrayList<>(maps.values()); |
| @@ -153,6 +153,6 @@ public class FirstAndLastHandler { | @@ -153,6 +153,6 @@ public class FirstAndLastHandler { | ||
| 153 | }catch (Exception e){ | 153 | }catch (Exception e){ |
| 154 | log.error("", e); | 154 | log.error("", e); |
| 155 | tran.rollback(status); | 155 | tran.rollback(status); |
| 156 | - } | 156 | + }*/ |
| 157 | } | 157 | } |
| 158 | } | 158 | } |
src/main/resources/application-prod.properties
| @@ -8,7 +8,7 @@ spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy | @@ -8,7 +8,7 @@ spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy | ||
| 8 | spring.jpa.database= MYSQL | 8 | spring.jpa.database= MYSQL |
| 9 | spring.jpa.show-sql= false | 9 | spring.jpa.show-sql= false |
| 10 | spring.datasource.driver-class-name= com.mysql.jdbc.Driver | 10 | spring.datasource.driver-class-name= com.mysql.jdbc.Driver |
| 11 | -spring.datasource.url= jdbc:mysql://10.10.200.121:3306/control?useUnicode=true&characterEncoding=utf-8&useSSL=false | 11 | +spring.datasource.url= jdbc:mysql://10.10.150.24:3306/control?useUnicode=true&characterEncoding=utf-8&useSSL=false |
| 12 | spring.datasource.username= root | 12 | spring.datasource.username= root |
| 13 | spring.datasource.password= root2jsp | 13 | spring.datasource.password= root2jsp |
| 14 | #DATASOURCE | 14 | #DATASOURCE |
| @@ -28,13 +28,13 @@ http.gps.real.cache.url= http://10.10.150.24:12580/realGps/all | @@ -28,13 +28,13 @@ http.gps.real.cache.url= http://10.10.150.24:12580/realGps/all | ||
| 28 | ## gateway real data | 28 | ## gateway real data |
| 29 | http.gps.real.url= http://10.10.200.79:8080/transport_server/rtgps/ | 29 | http.gps.real.url= http://10.10.200.79:8080/transport_server/rtgps/ |
| 30 | ## gateway send directive | 30 | ## gateway send directive |
| 31 | -http.send.directive = http://10.10.200.79:8080/transport_server/message/ | 31 | +#http.send.directive = http://10.10.200.79:8080/transport_server/message/ |
| 32 | ## wxsb | 32 | ## wxsb |
| 33 | #http.report.url.05= http://192.168.168.154:8088/ygjwsystem_j2ee/clbx/clbx_dd.do | 33 | #http.report.url.05= http://192.168.168.154:8088/ygjwsystem_j2ee/clbx/clbx_dd.do |
| 34 | #http.report.url.22= http://192.168.168.154:8088/jgjwsystem_j2ee/clbx/clbx_dd.do | 34 | #http.report.url.22= http://192.168.168.154:8088/jgjwsystem_j2ee/clbx/clbx_dd.do |
| 35 | #http.report.url.26= http://192.168.168.154:8088/nhjwsystem_j2ee/clbx/clbx_dd.do | 35 | #http.report.url.26= http://192.168.168.154:8088/nhjwsystem_j2ee/clbx/clbx_dd.do |
| 36 | #http.report.url.55= http://192.168.168.154:8088/snjwsystem_j2ee/clbx/clbx_dd.do | 36 | #http.report.url.55= http://192.168.168.154:8088/snjwsystem_j2ee/clbx/clbx_dd.do |
| 37 | -http.report.url.05= http://116.228.197.222:8081/ygjwsystem_j2ee/clbx/clbx_dd.do | ||
| 38 | -http.report.url.22= http://116.247.73.122:9098/jgjwsystem_j2ee/clbx/clbx_dd.do | ||
| 39 | -http.report.url.26= http://116.236.141.34:8088/nhjwsystem_j2ee/clbx/clbx_dd.do | ||
| 40 | -http.report.url.55= http://180.168.216.248:8088/snjwsystem_j2ee/clbx/clbx_dd.do | ||
| 41 | \ No newline at end of file | 37 | \ No newline at end of file |
| 38 | +http.report.url.05= http://116.228.197.222:8081/ygjwsystem_j2ee/clbx/clbx_dd1.do | ||
| 39 | +http.report.url.22= http://116.247.73.122:9098/jgjwsystem_j2ee/clbx/clbx_dd1.do | ||
| 40 | +http.report.url.26= http://116.236.141.34:8088/nhjwsystem_j2ee/clbx/clbx_dd1.do | ||
| 41 | +http.report.url.55= http://180.168.216.248:8088/snjwsystem_j2ee/clbx/clbx_dd1.do | ||
| 42 | \ No newline at end of file | 42 | \ No newline at end of file |