潘钊 / bsth_control · Commits

Commit b879d1b08e64cdc7ac7d1b2420f643111948b7d2

Authored by 潘钊
1 parent 3c77c0da

update...

Inline Side-by-side
Showing 3 changed files with 5 additions and 10 deletions
src/main/java/com/bsth/data/gpsdata/GpsRealData.java
  View file @b879d1b
1 1 package com.bsth.data.gpsdata;
2 2  
3   -import com.bsth.Application;
4 3 import com.bsth.data.BasicData;
5 4 import com.bsth.data.forecast.ForecastRealServer;
6 5 import com.bsth.data.gpsdata.thread.GpsDataLoaderThread;
... ... @@ -19,7 +18,6 @@ import org.springframework.stereotype.Component;
19 18 import java.util.*;
20 19 import java.util.concurrent.ConcurrentHashMap;
21 20 import java.util.concurrent.ConcurrentMap;
22   -import java.util.concurrent.TimeUnit;
23 21  
24 22 /**
25 23 * @author PanZhao
... ... @@ -64,7 +62,7 @@ public class GpsRealData implements CommandLineRunner {
64 62 public void run(String... arg0) throws Exception {
65 63 logger.info("gpsDataLoader,20,3");
66 64 //http形式获取GPS数据
67   - Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 20, 2, TimeUnit.SECONDS);
  65 + //Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 20, 2, TimeUnit.SECONDS);
68 66 //定时扫描掉离线
69 67 //Application.mainServices.scheduleWithFixedDelay(offlineMonitorThread, 120, 60, TimeUnit.SECONDS);
70 68  
... ...
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
  View file @b879d1b
... ... @@ -146,7 +146,7 @@ public class DayOfSchedule implements CommandLineRunner {
146 146 basicDataLoader.loadAllData();
147 147  
148 148 //翻班线程
149   - Application.mainServices.scheduleWithFixedDelay(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS);
  149 +// Application.mainServices.scheduleWithFixedDelay(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS);
150 150 //入库
151 151 // Application.mainServices.scheduleWithFixedDelay(schedulePstThread, 60, 30, TimeUnit.SECONDS);
152 152 //班次误点扫描
... ...
src/main/resources/application-dev.properties
  View file @b879d1b
... ... @@ -8,12 +8,10 @@ spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
8 8 spring.jpa.database= MYSQL
9 9 spring.jpa.show-sql= true
10 10 spring.datasource.driver-class-name= com.mysql.jdbc.Driver
11   -spring.datasource.url= jdbc:mysql://127.0.0.1/pd_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
  11 +spring.datasource.url= jdbc:mysql://127.0.0.1/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
12 12 spring.datasource.username= root
13   -spring.datasource.password= panzhao
14   -#spring.datasource.url= jdbc:mysql://192.168.168.117/pd_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
15   -#spring.datasource.username= root
16   -#spring.datasource.password= root
  13 +spring.datasource.password= root
  14 +
17 15 #DATASOURCE
18 16 spring.datasource.max-active=100
19 17 spring.datasource.max-idle=8
... ... @@ -29,7 +27,6 @@ spring.datasource.validation-query=select 1
29 27 ##
30 28 #222.66.0.204:5555
31 29 ##\u5B9E\u65F6gps
32   -http.gps.real.url= http://114.80.178.12:18080/transport_server/rtgps/
33 30 #http.gps.real.url= http://27.115.69.123:8800/transport_server/rtgps/
34 31 ##\u6D88\u606F\u4E0B\u53D1
35 32 http.send.directive = http://192.168.168.201:9090/transport_server/message/
... ...