update...

潘钊
1 parent 8723dd64
Showing 4 changed files with 9 additions and 7 deletions
src/main/java/com/bsth/data/gpsdata/GpsRealData.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/service/directive/DirectiveServiceImpl.java
src/main/resources/application-dev.properties
 package com.bsth.data.gpsdata;
+import com.bsth.Application;
 import com.bsth.data.BasicData;
 import com.bsth.data.forecast.ForecastRealServer;
 import com.bsth.data.gpsdata.thread.GpsDataLoaderThread;
@@ -18,6 +19,7 @@ import org.springframework.stereotype.Component;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.TimeUnit;
 /**
  * @author PanZhao
@@ -62,7 +64,7 @@ public class GpsRealData implements CommandLineRunner {
     public void run(String... arg0) throws Exception {
         logger.info("gpsDataLoader,20,3");
         //http形式获取GPS数据
-        //Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 20, 2, TimeUnit.SECONDS);
+        Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 20, 2, TimeUnit.SECONDS);
         //定时扫描掉离线
         //Application.mainServices.scheduleWithFixedDelay(offlineMonitorThread, 120, 60, TimeUnit.SECONDS);
@@ -146,7 +146,7 @@ public class DayOfSchedule implements CommandLineRunner {
         basicDataLoader.loadAllData();
         //翻班线程
-//        Application.mainServices.scheduleWithFixedDelay(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS);
+        Application.mainServices.scheduleWithFixedDelay(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS);
         //入库
 //        Application.mainServices.scheduleWithFixedDelay(schedulePstThread, 60, 30, TimeUnit.SECONDS);
         //班次误点扫描
@@ -132,14 +132,14 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
 		// 发送指令
 		int code = GatewayHttpUtils.postJson(jObj.toJSONString());
-		// 添加到缓存，等待入库
 		d60.setDispatch(true);
 		d60.setSch(sch);
 		d60.setHttpCode(code);
-		dayOfDirectives.put60(d60);
 		if (code == 0) {
 			sch.setDirectiveState(60);
+			// 添加到缓存，延迟入库
+			dayOfDirectives.put60(d60);
 			// 通知页面
 			sendD60ToPage(sch);
 		}
@@ -8,9 +8,9 @@ spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
 spring.jpa.database= MYSQL
 spring.jpa.show-sql= true
 spring.datasource.driver-class-name= com.mysql.jdbc.Driver
-spring.datasource.url= jdbc:mysql://127.0.0.1/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
+spring.datasource.url= jdbc:mysql://127.0.0.1/pd_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
 spring.datasource.username= root
-spring.datasource.password=
+spring.datasource.password= panzhao
 #spring.datasource.url= jdbc:mysql://192.168.168.117/pd_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
 #spring.datasource.username= root
 #spring.datasource.password= root
@@ -32,4 +32,4 @@ spring.datasource.validation-query=select 1
 http.gps.real.url= http://114.80.178.12:18080/transport_server/rtgps/
 #http.gps.real.url= http://27.115.69.123:8800/transport_server/rtgps/
 ##\u6D88\u606F\u4E0B\u53D1
-http.send.directive = http://192.168.168.201:9090/transport_server/message/
 \ No newline at end of file
+http.send.directive = http://192.168.168.201:9090/transport_server/message/