joylink/rt-sim-training-service
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 10 Wiki Activity

南京二 实训问题处理

Browse Source
This commit is contained in:
Jade 2021-11-24 09:20:46 +08:00
parent 8d540769cc
commit 002fca4c64
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/club/joylink/rtss/services/training/generatornew/base/SectionGeneratorNew.java
View File

@ -147,8 +147,10 @@ public class SectionGeneratorNew implements GeneratorNew {
} }
break; break;
case Stand_Set_Reentry_Strategy: case Stand_Set_Reentry_Strategy:
if (section.isStandTrack()) { if (section.isStandTrack() && section.isTurnBackTrack()) {
section.getStandList().get(0).setTypeStrategy(Stand.TurnBackType.AUTO); Stand stand = section.getStandList().get(0);
stand.setTypeStrategy(Stand.TurnBackType.AUTO);
deviceStatusModifyTool.loadManualTrainOfGroup(simulation, "001", section, stand.isRight());
} else { } else {
continue; continue;
} }

3
src/main/java/club/joylink/rtss/services/training/generatornew/base/StationGeneratorNew.java
View File

@ -40,6 +40,9 @@ public class StationGeneratorNew implements GeneratorNew {
if (MapPrdTypeEnum.LOCAL.equals(MapPrdTypeEnum.getMapPrdTypeEnumByCode(config.getPrdType()))) { if (MapPrdTypeEnum.LOCAL.equals(MapPrdTypeEnum.getMapPrdTypeEnumByCode(config.getPrdType()))) {
station.setControlMode(Station.ControlMode.Local); station.setControlMode(Station.ControlMode.Local);
} }
simulation.getRepository().getRouteList().stream()
.filter(route -> route.getInterlockStation().equals(station))
.forEach(route -> route.setAtsControl(false));
// List<Route> routeList1 = simulation.getRepository().getRouteList(); // List<Route> routeList1 = simulation.getRepository().getRouteList();
// for (Route route : routeList1) { // for (Route route : routeList1) {
// if (Objects.equals(route.getInterlockStation(), station)) { // if (Objects.equals(route.getInterlockStation(), station)) {

1
src/main/java/club/joylink/rtss/simulation/cbtc/ATS/service/AtsRouteService.java
View File

@ -233,6 +233,7 @@ public class AtsRouteService {
for (Route route : routeList) { for (Route route : routeList) {
if (route.isCiControl()) { if (route.isCiControl()) {
route.setCiControl(false); route.setCiControl(false);
route.setAtsControl(false);
} }
} }
} }