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 10:46:07 +08:00
parent 5130b67ddd
commit 68ebd521d8
4 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,7 +60,8 @@ public class StandGeneratorNew implements GeneratorNew {
break;
}
case Stand_Force_Cancel_Hold_Train:
stand.setCenterHoldTrain(true);
case Stand_Cancel_Setting:
stand.setCenterHoldTrain(true);
break;
case Stand_Cancel_Hold_Train:
case Stand_Cancel_Hold_Train_Batch: {

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

@ -249,6 +249,10 @@ public class StationGeneratorNew implements GeneratorNew {
}
station.setInterlockMachineStarting(true);
break;
case Station_Release:
if(!station.isInterlock())continue;
Station.Fault.INTERLOCK_FAULT.apply(station);
break;
default:
// 其他操作，不生成
continue;

11
src/main/java/club/joylink/rtss/services/training/generatornew/base/SwitchGeneratorNew.java
View File

@ -94,10 +94,13 @@ public class SwitchGeneratorNew implements GeneratorNew {
break;
}
case Switch_Fault_Unlock:{
// 背景为道岔区段故障锁闭
aSwitch.getA().setFaultLock(true);
aSwitch.getB().setFaultLock(true);
aSwitch.getC().setFaultLock(true);
// // 背景为道岔区段故障锁闭
// aSwitch.getA().setFaultLock(true);
// aSwitch.getB().setFaultLock(true);
// aSwitch.getC().setFaultLock(true);
aSwitch.setRouteLock(true);
aSwitch.getA().setRouteLock(true);
aSwitch.getB().setRouteLock(true);
break;
}
case Switch_Axle_Pre_Reset:{

9
src/main/java/club/joylink/rtss/simulation/cbtc/CI/CiApiServiceImpl2.java
View File

@ -258,8 +258,13 @@ public class CiApiServiceImpl2 implements CiApiService {
}
}
}
for (Route lockedRoute : lockSwitchRoutes) {
this.routeService.switchFaultUnlock(simulation, aSwitch, lockedRoute);
if (!lockSwitchRoutes.isEmpty()) {
for (Route lockedRoute : lockSwitchRoutes) {
this.routeService.switchFaultUnlock(simulation, aSwitch, lockedRoute);
}
} else {
aSwitch.faultUnlock();
aSwitch.sectionFaultUnlock();
}
}