diff --git a/src/main/java/club/joylink/rtss/services/training/generatornew/base/SectionGeneratorNew.java b/src/main/java/club/joylink/rtss/services/training/generatornew/base/SectionGeneratorNew.java index dfe7845eb..167163653 100644 --- a/src/main/java/club/joylink/rtss/services/training/generatornew/base/SectionGeneratorNew.java +++ b/src/main/java/club/joylink/rtss/services/training/generatornew/base/SectionGeneratorNew.java @@ -147,8 +147,10 @@ public class SectionGeneratorNew implements GeneratorNew { } break; case Stand_Set_Reentry_Strategy: - if (section.isStandTrack()) { - section.getStandList().get(0).setTypeStrategy(Stand.TurnBackType.AUTO); + if (section.isStandTrack() && section.isTurnBackTrack()) { + Stand stand = section.getStandList().get(0); + stand.setTypeStrategy(Stand.TurnBackType.AUTO); + deviceStatusModifyTool.loadManualTrainOfGroup(simulation, "001", section, stand.isRight()); } else { continue; } diff --git a/src/main/java/club/joylink/rtss/services/training/generatornew/base/StationGeneratorNew.java b/src/main/java/club/joylink/rtss/services/training/generatornew/base/StationGeneratorNew.java index 950bada5d..25e6b18a7 100644 --- a/src/main/java/club/joylink/rtss/services/training/generatornew/base/StationGeneratorNew.java +++ b/src/main/java/club/joylink/rtss/services/training/generatornew/base/StationGeneratorNew.java @@ -40,6 +40,9 @@ public class StationGeneratorNew implements GeneratorNew { if (MapPrdTypeEnum.LOCAL.equals(MapPrdTypeEnum.getMapPrdTypeEnumByCode(config.getPrdType()))) { station.setControlMode(Station.ControlMode.Local); } + simulation.getRepository().getRouteList().stream() + .filter(route -> route.getInterlockStation().equals(station)) + .forEach(route -> route.setAtsControl(false)); // List routeList1 = simulation.getRepository().getRouteList(); // for (Route route : routeList1) { // if (Objects.equals(route.getInterlockStation(), station)) { diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/ATS/service/AtsRouteService.java b/src/main/java/club/joylink/rtss/simulation/cbtc/ATS/service/AtsRouteService.java index ea5fb5efc..e2c47746b 100644 --- a/src/main/java/club/joylink/rtss/simulation/cbtc/ATS/service/AtsRouteService.java +++ b/src/main/java/club/joylink/rtss/simulation/cbtc/ATS/service/AtsRouteService.java @@ -233,6 +233,7 @@ public class AtsRouteService { for (Route route : routeList) { if (route.isCiControl()) { route.setCiControl(false); + route.setAtsControl(false); } } }