update...

panzhaov5
1 parent e82b0342
Showing 6 changed files with 18 additions and 18 deletions
src/main/java/com/bsth/XDApplication.java
src/main/java/com/bsth/data/gpsdata_v2/DataHandleProcess.java
src/main/resources/application-prod.properties
src/main/resources/datatools/config-prod.properties
src/main/resources/ms-jdbc.properties
src/main/resources/traffic-jdbc.properties
@@ -156,11 +156,12 @@ public class XDApplication implements CommandLineRunner {
         log.info("prodInit...");
         ScheduledExecutorService sexec = Application.mainServices;
         //安全驾驶
-        sexec.scheduleWithFixedDelay(safeDrivDataLoadThread, 180, 10, TimeUnit.SECONDS);
+        //sexec.scheduleWithFixedDelay(safeDrivDataLoadThread, 180, 10, TimeUnit.SECONDS);
         /** 线调业务 */
         sexec.scheduleWithFixedDelay(scheduleRefreshThread, 10, 120, TimeUnit.SECONDS);//班次更新线程
         sexec.scheduleWithFixedDelay(scheduleLateThread, 140, 30, TimeUnit.SECONDS);//检查班次误点
+        gpsDataLoader.setFlag(-1);
         sexec.scheduleWithFixedDelay(gpsDataLoader, 100, 2, TimeUnit.SECONDS);//抓取GPS数据
         sexec.scheduleWithFixedDelay(fixedCheckStationCodeThread, 60, 60 * 5, TimeUnit.SECONDS);//检查班次站点编码
@@ -41,7 +41,7 @@ public class DataHandleProcess {
     static Logger logger = LoggerFactory.getLogger(DataHandleProcess.class);
-    final static int POOL_SIZE = 20;
+    final static int POOL_SIZE = 8;
     static ExecutorService threadPool = Executors.newFixedThreadPool(POOL_SIZE + 1);
     public static CountDownLatch count;
@@ -8,9 +8,9 @@ spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
 spring.jpa.database= MYSQL
 spring.jpa.show-sql= false
 spring.datasource.driver-class-name= com.mysql.jdbc.Driver
-spring.datasource.url= jdbc:mysql://10.10.150.20:3306/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
+spring.datasource.url= jdbc:mysql://192.168.168.171:3306/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
 spring.datasource.username= root
-spring.datasource.password= root2jsp@JSP
+spring.datasource.password= root2jsp
 #DATASOURCE
 spring.datasource.max-active=100
 spring.datasource.max-idle=8
@@ -23,9 +23,9 @@ spring.datasource.test-on-return=true
 spring.datasource.test-while-idle=true
 spring.datasource.validation-query=select 1
-## gps client data
-http.gps.real.cache.url= http://10.10.150.24:12580/realGps/all
-## gateway real data
-http.gps.real.url= http://10.10.150.21:8080/transport_server/rtgps/
-## gateway send directive
-http.send.directive = http://10.10.150.21:8080/transport_server/message/
 \ No newline at end of file
+##
+#222.66.0.204:5555
+##\u5B9E\u65F6gps
+http.gps.real.url= http://192.168.168.171:8080/transport_server/rtgps/
+##\u6D88\u606F\u4E0B\u53D1
+http.send.directive = http://192.168.168.171:8080/transport_server/message/
 \ No newline at end of file
@@ -5,11 +5,11 @@ datatools.kettle_properties=/datatools/kettle.properties
 # 2、ktr文件通用配置变量（数据库连接，根据不同的环境需要修正）
 #数据库ip地址
-datatools.kvars_dbip=10.10.150.20
+datatools.kvars_dbip=192.168.168.171
 #数据库用户名
 datatools.kvars_dbuname=root
 #数据库密码
-datatools.kvars_dbpwd=root2jsp@JSP
+datatools.kvars_dbpwd=root2jsp
 #数据库库名
 datatools.kvars_dbdname=control
@@ -4,6 +4,6 @@
 #ms.mysql.password= 123456
 ms.mysql.driver= com.mysql.jdbc.Driver
-ms.mysql.url= jdbc:mysql://10.10.200.226:3306/ms?useUnicode=true&characterEncoding=utf-8
+ms.mysql.url= jdbc:mysql://192.168.168.171:3306/ms?useUnicode=true&characterEncoding=utf-8
 ms.mysql.username= root
-ms.mysql.password= root2jsp
+ms.mysql.password= root2jsp
 \ No newline at end of file
 #ms.mysql.driver= com.mysql.jdbc.Driver
-#ms.mysql.url= jdbc:mysql://127.0.0.1/pd_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
+#ms.mysql.url= jdbc:mysql://192.168.168.201:3306/ms?useUnicode=true&characterEncoding=utf-8&useSSL=false
 #ms.mysql.username= root
 #ms.mysql.password= 123456
 ms.mysql.driver= com.mysql.jdbc.Driver
-ms.mysql.url= jdbc:mysql://10.10.150.21:3306/ms?useUnicode=true&characterEncoding=utf-8
+ms.mysql.url= jdbc:mysql://192.168.168.171:3306/ms?useUnicode=true&characterEncoding=utf-8
 ms.mysql.username= root
-ms.mysql.password= root2jsp@JSP
-
+ms.mysql.password= root2jsp
 \ No newline at end of file