Commit 5628589d04e813f07f970b42d087bab8706d5f51

Authored by 王通
1 parent e217b290

1.加入ms.fl.generate属性,用来判断是否需要往ms生成首末班数据

src/main/java/com/bsth/data/schedule/DayOfSchedule.java
@@ -25,6 +25,7 @@ import org.joda.time.format.DateTimeFormatter; @@ -25,6 +25,7 @@ import org.joda.time.format.DateTimeFormatter;
25 import org.slf4j.Logger; 25 import org.slf4j.Logger;
26 import org.slf4j.LoggerFactory; 26 import org.slf4j.LoggerFactory;
27 import org.springframework.beans.factory.annotation.Autowired; 27 import org.springframework.beans.factory.annotation.Autowired;
  28 +import org.springframework.beans.factory.annotation.Value;
28 import org.springframework.dao.DataIntegrityViolationException; 29 import org.springframework.dao.DataIntegrityViolationException;
29 import org.springframework.jdbc.core.BatchPreparedStatementSetter; 30 import org.springframework.jdbc.core.BatchPreparedStatementSetter;
30 import org.springframework.jdbc.core.JdbcTemplate; 31 import org.springframework.jdbc.core.JdbcTemplate;
@@ -52,6 +53,9 @@ import java.util.concurrent.ConcurrentMap; @@ -52,6 +53,9 @@ import java.util.concurrent.ConcurrentMap;
52 @Component 53 @Component
53 public class DayOfSchedule { 54 public class DayOfSchedule {
54 55
  56 + @Value("${ms.fl.generate}")
  57 + private boolean generate;
  58 +
55 Logger logger = LoggerFactory.getLogger(this.getClass()); 59 Logger logger = LoggerFactory.getLogger(this.getClass());
56 60
57 //按线路分组的 “原始计划” 排班数据 61 //按线路分组的 “原始计划” 排班数据
@@ -203,7 +207,9 @@ public class DayOfSchedule { @@ -203,7 +207,9 @@ public class DayOfSchedule {
203 putAll(list); 207 putAll(list);
204 208
205 //标记首末班 209 //标记首末班
206 - FirstAndLastHandler.marks(list); 210 + if (generate) {
  211 + FirstAndLastHandler.marks(list);
  212 + }
207 213
208 Set<String> lps = searchAllLP(list); 214 Set<String> lps = searchAllLP(list);
209 for (String lp : lps) { 215 for (String lp : lps) {
src/main/resources/application-dev.properties
@@ -45,3 +45,5 @@ http.gps.real.url= http://114.80.178.12:18080/transport_server/rtgps/ @@ -45,3 +45,5 @@ http.gps.real.url= http://114.80.178.12:18080/transport_server/rtgps/
45 http.send.directive = http://192.168.168.201:9090/transport_server/message/ 45 http.send.directive = http://192.168.168.201:9090/transport_server/message/
46 ## rfid data 46 ## rfid data
47 http.rfid.url= http://114.80.178.12:29000/rfid 47 http.rfid.url= http://114.80.178.12:29000/rfid
  48 +## first last generate
  49 +ms.fl.generate=true
48 \ No newline at end of file 50 \ No newline at end of file
src/main/resources/application-prod.properties
@@ -47,3 +47,5 @@ http.report.url.05= http://116.228.197.222:8081/ygjwsystem_j2ee/clbx/clbx_dd.do @@ -47,3 +47,5 @@ http.report.url.05= http://116.228.197.222:8081/ygjwsystem_j2ee/clbx/clbx_dd.do
47 http.report.url.22= http://116.247.73.122:9098/jgjwsystem_j2ee/clbx/clbx_dd.do 47 http.report.url.22= http://116.247.73.122:9098/jgjwsystem_j2ee/clbx/clbx_dd.do
48 http.report.url.26= http://116.236.141.34:8088/nhjwsystem_j2ee/clbx/clbx_dd.do 48 http.report.url.26= http://116.236.141.34:8088/nhjwsystem_j2ee/clbx/clbx_dd.do
49 http.report.url.55= http://180.168.216.248:8088/snjwsystem_j2ee/clbx/clbx_dd.do 49 http.report.url.55= http://180.168.216.248:8088/snjwsystem_j2ee/clbx/clbx_dd.do
  50 +## first last generate
  51 +ms.fl.generate=true
50 \ No newline at end of file 52 \ No newline at end of file
src/main/resources/application-test.properties
@@ -38,3 +38,5 @@ http.gps.real.url= http://10.10.200.79:8080/transport_server/rtgps/ @@ -38,3 +38,5 @@ http.gps.real.url= http://10.10.200.79:8080/transport_server/rtgps/
38 #http.send.directive = http://10.10.200.79:8080/transport_server/message/ 38 #http.send.directive = http://10.10.200.79:8080/transport_server/message/
39 ## rfid data 39 ## rfid data
40 http.rfid.url= http://10.10.200.82:9000/rfid 40 http.rfid.url= http://10.10.200.82:9000/rfid
  41 +## first last generate
  42 +ms.fl.generate=false
41 \ No newline at end of file 43 \ No newline at end of file