潘钊 / bsth_control · Commits

Commit 9474fbf69fbe5e89b446e887320a343f69c266a1

Authored by 潘钊
1 parent 62bddf13

update...

Inline Side-by-side
Showing 2 changed files with 10 additions and 12 deletions
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
  View file @9474fbf
@@ -272,11 +272,11 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf @@ -272,11 +272,11 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf
272 } 272 }
273 273
274 //如果正在执行该班次 274 //如果正在执行该班次
275 - ScheduleRealInfo exec = dayOfSchedule.executeCurr(schedule.getClZbh());  
276 - if(exec != null && exec == schedule){ 275 + //ScheduleRealInfo exec = dayOfSchedule.executeCurr(schedule.getClZbh());
  276 + //if(exec != null && exec == schedule){
277 //重新计算正在执行班次 277 //重新计算正在执行班次
278 dayOfSchedule.reCalcExecPlan(schedule.getClZbh()); 278 dayOfSchedule.reCalcExecPlan(schedule.getClZbh());
279 - } 279 + //}
280 280
281 //重新计算是否误点 281 //重新计算是否误点
282 schedule.reCalcLate(); 282 schedule.reCalcLate();
src/main/resources/application-dev.properties
  View file @9474fbf
@@ -6,12 +6,11 @@ spring.jpa.hibernate.ddl-auto= update @@ -6,12 +6,11 @@ spring.jpa.hibernate.ddl-auto= update
6 spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy 6 spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
7 #DATABASE 7 #DATABASE
8 spring.jpa.database= MYSQL 8 spring.jpa.database= MYSQL
9 -spring.jpa.show-sql= false 9 +spring.jpa.show-sql= true
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://127.0.0.1/control?useUnicode=true&characterEncoding=utf-8&useSSL=false 11 +spring.datasource.url= jdbc:mysql://127.0.0.1/pd_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
12 spring.datasource.username= root 12 spring.datasource.username= root
13 -spring.datasource.password=  
14 - 13 +spring.datasource.password= panzhao
15 #spring.datasource.url= jdbc:mysql://192.168.168.117/pd_control?useUnicode=true&characterEncoding=utf-8&useSSL=false 14 #spring.datasource.url= jdbc:mysql://192.168.168.117/pd_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
16 #spring.datasource.username= root 15 #spring.datasource.username= root
17 #spring.datasource.password= root 16 #spring.datasource.password= root
@@ -27,10 +26,9 @@ spring.datasource.test-on-return=true @@ -27,10 +26,9 @@ spring.datasource.test-on-return=true
27 spring.datasource.test-while-idle=true 26 spring.datasource.test-while-idle=true
28 spring.datasource.validation-query=select 1 27 spring.datasource.validation-query=select 1
29 28
  29 +## gps client data
30 http.gps.real.cache.url= http://10.10.150.24:12580/realGps/all 30 http.gps.real.cache.url= http://10.10.150.24:12580/realGps/all
31 -##  
32 -#222.66.0.204:5555  
33 -http.gps.real.cache.url= http://10.10.150.24:12580/realGps/all 31 +## gateway real data
34 http.gps.real.url= http://114.80.178.12:18080/transport_server/rtgps/ 32 http.gps.real.url= http://114.80.178.12:18080/transport_server/rtgps/
35 -##\u6D88\u606F\u4E0B\u53D1  
36 -#http.send.directive = http://192.168.168.201:9090/transport_server/message/  
37 \ No newline at end of file 33 \ No newline at end of file
  34 +## gateway send directive
  35 +http.send.directive = http://192.168.168.201:9090/transport_server/message/