潘钊 / bsth_control · Commits

Commit 5628589d04e813f07f970b42d087bab8706d5f51

Authored by 王通
1 parent e217b290
build: skipped

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

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