潘钊 / bsth_control · Commits

Commit ee21795153bfa82a69f7f14958fb1b314a1204cb

Authored by 潘钊
1 parent 2fba747f
build: skipped

update...

Inline Side-by-side
Showing 2 changed files with 21 additions and 2 deletions
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
  View file @ee21795
... ... @@ -494,6 +494,9 @@ public class DayOfSchedule implements CommandLineRunner {
494 494 if (config != null)
495 495 outConfig = config.getOutConfig();
496 496  
  497 + //限定出站既出场的停车场
  498 + String park = config.getTwinsPark();
  499 + boolean limitPark = StringUtils.isNotEmpty(park);
497 500 boolean flag = false;
498 501 ScheduleRealInfo next = null;
499 502 for (ScheduleRealInfo temp : list) {
... ... @@ -506,7 +509,8 @@ public class DayOfSchedule implements CommandLineRunner {
506 509 continue;
507 510  
508 511 //出站既出场，忽略出场班次
509   - if (outConfig == 2 && temp.getBcType().equals("out"))
  512 + if (outConfig == 2 && temp.getBcType().equals("out")
  513 + && (!limitPark || park.equals(temp.getQdzCode())))
510 514 continue;
511 515  
512 516 if (flag) {
... ... @@ -529,6 +533,9 @@ public class DayOfSchedule implements CommandLineRunner {
529 533 if (config != null)
530 534 outConfig = config.getOutConfig();
531 535  
  536 + //限定出站既出场的停车场
  537 + String park = config.getTwinsPark();
  538 + boolean limitPark = StringUtils.isNotEmpty(park);
532 539 boolean flag = false;
533 540 ScheduleRealInfo next = null;
534 541 for (ScheduleRealInfo temp : list) {
... ... @@ -541,7 +548,8 @@ public class DayOfSchedule implements CommandLineRunner {
541 548 continue;
542 549  
543 550 //出站既出场，忽略出场班次
544   - if (outConfig == 2 && temp.getBcType().equals("out"))
  551 + if (outConfig == 2 && temp.getBcType().equals("out")
  552 + && (!limitPark || park.equals(temp.getQdzCode())))
545 553 continue;
546 554  
547 555 if (flag && temp.getXlDir().equals(sch.getXlDir())) {
... ...
src/main/java/com/bsth/entity/realcontrol/LineConfig.java
  View file @ee21795
... ... @@ -47,6 +47,9 @@ public class LineConfig {
47 47 /** 出场时间设置 0：真实出场（设备离开缓冲区时间） 1：请求出场时间 2：出站即出场 */
48 48 private int outConfig;
49 49  
  50 + /** 出站既出场 对应的停车场 */
  51 + private String twinsPark;
  52 +
50 53 /** 短语模板 , 号分隔多个 */
51 54 private String phraseTemps;
52 55  
... ... @@ -208,4 +211,12 @@ public class LineConfig {
208 211 public void setDownOutDiff(int downOutDiff) {
209 212 this.downOutDiff = downOutDiff;
210 213 }
  214 +
  215 + public String getTwinsPark() {
  216 + return twinsPark;
  217 + }
  218 +
  219 + public void setTwinsPark(String twinsPark) {
  220 + this.twinsPark = twinsPark;
  221 + }
211 222 }
... ...