潘钊 / bsth_control · Commits

Commit 867b90c53838b0f22224ddfef38e9ae6151d1882

Authored by 王通
1 parent c44ef6e1
build: skipped

1.

Inline Side-by-side
Showing 5 changed files with 55 additions and 61 deletions
... ... @@ -403,8 +403,8 @@
403 403 <artifactId>maven-compiler-plugin</artifactId>
404 404 <version>2.3.2</version><!--$NO-MVN-MAN-VER$ -->
405 405 <configuration>
406   - <source>1.7</source>
407   - <target>1.7</target>
  406 + <source>1.8</source>
  407 + <target>1.8</target>
408 408 </configuration>
409 409 </plugin>
410 410 <plugin>
... ... @@ -418,6 +418,14 @@
418 418 <groupId>org.springframework.boot</groupId>
419 419 <artifactId>spring-boot-maven-plugin</artifactId>
420 420 </plugin>
  421 + <plugin>
  422 + <groupId>org.apache.maven.plugins</groupId>
  423 + <artifactId>maven-compiler-plugin</artifactId>
  424 + <configuration>
  425 + <source>8</source>
  426 + <target>8</target>
  427 + </configuration>
  428 + </plugin>
421 429 </plugins>
422 430 <resources>
423 431 <resource>
... ...
src/main/java/com/bsth/XDApplication.java
  View file @867b90c
... ... @@ -173,8 +173,6 @@ public class XDApplication implements CommandLineRunner {
173 173 public void prodInit(){
174 174 log.info("prodInit...");
175 175 ScheduledExecutorService sexec = Application.mainServices;
176   - //安全驾驶
177   - //sexec.scheduleWithFixedDelay(safeDrivDataLoadThread, 180, 10, TimeUnit.SECONDS);
178 176  
179 177 /** 线调业务 */
180 178 sexec.scheduleWithFixedDelay(scheduleRefreshThread, 10, 120, TimeUnit.SECONDS);//班次更新线程
... ... @@ -209,16 +207,11 @@ public class XDApplication implements CommandLineRunner {
209 207  
210 208 //线路版本更新
211 209 sexec.scheduleWithFixedDelay(lineVersionsData, 60 * 5, 60 * 15, TimeUnit.SECONDS);
212   -
213   - //线路版本更新
214   - //sexec.scheduleWithFixedDelay(fixedEnableVerionsThread, 60 * 4, 60 * 2 , TimeUnit.SECONDS);
215 210 }
216 211  
217 212 public void testInit(){
218 213 log.info("testInit...");
219 214 ScheduledExecutorService sexec = Application.mainServices;
220   - //安全驾驶
221   - //sexec.scheduleWithFixedDelay(safeDrivDataLoadThread, 180, 10, TimeUnit.SECONDS);
222 215  
223 216 /** 线调业务 */
224 217 sexec.scheduleWithFixedDelay(scheduleRefreshThread, 10, 120, TimeUnit.SECONDS);//班次更新线程
... ... @@ -239,22 +232,7 @@ public class XDApplication implements CommandLineRunner {
239 232 DirectivePushQueue.start();//消息队列 -指令，系统下发的
240 233 WebSocketPushQueue.start();//消息队列 -webSocket ，推送至线调web页面的
241 234  
242   - /** 线调为其他程序提供的数据 --写入数据库 */
243   - //sexec.scheduleWithFixedDelay(fcxxUpdateThread, 160, 30, TimeUnit.SECONDS);//发车信息（发车屏、信息发布）
244   - //线路首末班数据（网关用，班次更新时写入）
245   - //com.bsth.data.schedule.f_a_l.FirstAndLastHandler
246   - //sexec.scheduleWithFixedDelay(schSiginUpdateDBThread, 160, 60 * 30, TimeUnit.SECONDS);//无法自动完成的班次信息（网关用，补信号）
247   -
248   - //运管处静态数据提交
249   - //log.info(timeDiff / 1000 / 60 + "分钟之后提交到运管处");
250   - //sexec.scheduleAtFixedRate(submitToTrafficManage, timeDiffTraffic / 1000, 60 * 60 * 24, TimeUnit.SECONDS);
251 235 //计算油、公里加注
252 236 sexec.scheduleAtFixedRate(calcOilThread, timeDiff / 1000, 60 * 60 * 24, TimeUnit.SECONDS);
253   -
254   - //线路版本更新
255   - sexec.scheduleWithFixedDelay(lineVersionsData, 60 * 5, 60 * 15, TimeUnit.SECONDS);
256   -
257   - //线路版本更新
258   - //sexec.scheduleWithFixedDelay(fixedEnableVerionsThread, 60 * 4, 60 * 2 , TimeUnit.SECONDS);
259 237 }
260 238 }
... ...
src/main/resources/application-dev.properties
  View file @867b90c
1   -server.port=9088
2   -management.port= 9001
3   -management.address= 127.0.0.1
4   -
5   -dubbo.use=false
6   -
7   -spring.jpa.hibernate.ddl-auto= update
8   -spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
9   -#DATABASE
10   -spring.jpa.database= MYSQL
11   -spring.jpa.show-sql= true
12   -spring.datasource.driver-class-name= com.mysql.jdbc.Driver
13   -spring.datasource.url= jdbc:mysql://127.0.0.1/pd_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
14   -spring.datasource.username= root
15   -spring.datasource.password=
16   -#spring.datasource.url= jdbc:mysql://192.168.168.117/pd_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
17   -#spring.datasource.username= root
18   -#spring.datasource.password= root
19   -#DATASOURCE
20   -spring.datasource.max-active=100
21   -spring.datasource.max-idle=8
22   -spring.datasource.min-idle=8
23   -spring.datasource.initial-size=5
24   -
25   -spring.datasource.test-on-borrow=true
26   -spring.datasource.test-on-connect=true
27   -spring.datasource.test-on-return=true
28   -spring.datasource.test-while-idle=true
29   -spring.datasource.validation-query=select 1
30   -
31   -## gps client data
32   -http.gps.real.cache.url= http://10.10.150.24:12580/realGps/all
33   -## gateway real data
34   -http.gps.real.url= http://114.80.178.12:18080/transport_server/rtgps/
35   -## gateway send directive
36   -http.send.directive = http://192.168.168.201:9090/transport_server/message/
  1 +server.port=9088
  2 +management.port= 9001
  3 +management.address= 127.0.0.1
  4 +
  5 +dubbo.use=false
  6 +
  7 +spring.jpa.hibernate.ddl-auto= update
  8 +spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
  9 +#DATABASE
  10 +spring.jpa.database= MYSQL
  11 +spring.jpa.show-sql= true
  12 +spring.datasource.driver-class-name= com.mysql.jdbc.Driver
  13 +spring.datasource.url= jdbc:mysql://127.0.0.1/pd_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
  14 +spring.datasource.username= root
  15 +spring.datasource.password=
  16 +#spring.datasource.url= jdbc:mysql://192.168.168.117/pd_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
  17 +#spring.datasource.username= root
  18 +#spring.datasource.password= root
  19 +#DATASOURCE
  20 +spring.datasource.max-active=100
  21 +spring.datasource.max-idle=8
  22 +spring.datasource.min-idle=8
  23 +spring.datasource.initial-size=5
  24 +
  25 +spring.datasource.test-on-borrow=true
  26 +spring.datasource.test-on-connect=true
  27 +spring.datasource.test-on-return=true
  28 +spring.datasource.test-while-idle=true
  29 +spring.datasource.validation-query=select 1
  30 +
  31 +## gps client data
  32 +http.gps.real.cache.url= http://10.10.150.24:12580/realGps/all
  33 +## gateway real data
  34 +http.gps.real.url= http://114.80.178.12:18080/transport_server/rtgps/
  35 +## gateway send directive
  36 +http.send.directive = http://192.168.168.201:9090/transport_server/message/
  37 +## enabled
  38 +enabled.whiteip= false
  39 +## email
  40 +waybill.emails= 113252620@qq.com
... ...
src/main/resources/application-prod.properties
  View file @867b90c
... ... @@ -31,3 +31,5 @@ http.gps.real.url= http://192.168.40.82:8080/transport_server/rtgps/
31 31 http.send.directive = http://192.168.40.82:8080/transport_server/message/
32 32 ## enabled
33 33 enabled.whiteip= false
  34 +## email
  35 +waybill.emails= 113252620@qq.com
... ...
src/main/resources/application-test.properties
  View file @867b90c
... ... @@ -28,6 +28,8 @@ spring.datasource.validation-query=select 1
28 28 ## gateway real data
29 29 http.gps.real.url= http://192.168.40.82:8080/transport_server/rtgps/
30 30 ## gateway send directive
31   -http.send.directive = http://192.168.40.82:8080/transport_server/message/
  31 +#http.send.directive = http://192.168.40.82:8080/transport_server/message/
32 32 ## enabled
33 33 enabled.whiteip= false
  34 +## email
  35 +waybill.emails= 113252620@qq.com
... ...