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

修改：换端操作不再关闭ATO；进路相关移动授权计算

Browse Source
This commit is contained in:
joylink_zhangsai 2021-07-06 09:24:59 +08:00
parent 35d6139ed6
commit f25c5fd5f1
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/club/joylink/rtss/simulation/cbtc/ATP/ground/ZCLogicLoop.java
View File

@ -468,7 +468,7 @@ public class ZCLogicLoop {
base = pre; base = pre;
} }
} }
if (!lock) { if (!lock && section.getSignalOf(right) == null) {
// 未锁闭进路中，设置移动授权终点 // 未锁闭进路中，设置移动授权终点
return new MovementAuthority.End(section, MovementAuthority.EndType.UNLOCK_SECTION); return new MovementAuthority.End(section, MovementAuthority.EndType.UNLOCK_SECTION);
} }

1
src/main/java/club/joylink/rtss/simulation/cbtc/ATS/operation/handler/DriverOperateHandler.java
View File

@ -169,7 +169,6 @@ public class DriverOperateHandler {
public void changeHead(Simulation simulation, String groupNumber) { public void changeHead(Simulation simulation, String groupNumber) {
VirtualRealityTrain train = simulation.getRepository().getOnlineTrainBy(groupNumber); VirtualRealityTrain train = simulation.getRepository().getOnlineTrainBy(groupNumber);
if (train.isStop()) { if (train.isStop()) {
train.setAtoOn(false);
this.ATPService.turnDirectionImmediately(train); this.ATPService.turnDirectionImmediately(train);
} }
} }