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

重启令解实训，背景给车站设置站控；列车经过【ARB】【进路锁闭】的区段之后，取消进路锁闭

Browse Source
This commit is contained in:
joylink_zhangsai 2021-12-02 12:59:54 +08:00
parent a7acb9929d
commit 09d423a3f4
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -277,6 +277,11 @@ public class StationGeneratorNew implements GeneratorNew {
param.put("stationCode", station.getCode()); param.put("stationCode", station.getCode());
atsOperationDispatcher.execute(simulation, member, operate, param); atsOperationDispatcher.execute(simulation, member, operate, param);
station.setInterlockMachineStarting(true); station.setInterlockMachineStarting(true);
if(station.isCentralized()) {
station.setControlMode(Station.ControlMode.Local);
}else{
station.getDeviceStation().setControlMode(Station.ControlMode.Local);
}
break; break;
} }
case Station_Release: { case Station_Release: {

2
src/main/java/club/joylink/rtss/simulation/cbtc/CI/device/CiRouteService.java
View File

@ -462,7 +462,7 @@ public class CiRouteService {
Collections.reverse(logicList); Collections.reverse(logicList);
} }
for (Section logic : logicList) { for (Section logic : logicList) {
if (!logic.isOccupied() && !logic.isInvalid() && logic.isRouteLockOn(right)) { if (!logic.isOccupied() && /*!logic.isInvalid() &&*/ logic.isRouteLockOn(right)) {
logic.routeUnlocking(route); logic.routeUnlocking(route);
logic.overlapUnlocking(); logic.overlapUnlocking();
} else if(logic.isOccupied() || logic.isInvalid()) { } else if(logic.isOccupied() || logic.isInvalid()) {