diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/ATP/ground/ZCLogicLoop.java b/src/main/java/club/joylink/rtss/simulation/cbtc/ATP/ground/ZCLogicLoop.java index b3be427ec..531d0d638 100644 --- a/src/main/java/club/joylink/rtss/simulation/cbtc/ATP/ground/ZCLogicLoop.java +++ b/src/main/java/club/joylink/rtss/simulation/cbtc/ATP/ground/ZCLogicLoop.java @@ -120,11 +120,11 @@ public class ZCLogicLoop { if (switchEnd != null) return List.of(switchEnd); // 检查列车当前所在进路是否锁闭 - MovementAuthority.End end1 = this.checkRouteLock(simulation, section, tailSection, right, train); - if (Objects.nonNull(end1)) { - endList.add(end1); - return endList; - } +// MovementAuthority.End end1 = this.checkRouteLock(simulation, section, tailSection, right, train); +// if (Objects.nonNull(end1)) { +// endList.add(end1); +// return endList; +// } // // 检查车头区段是否故障 // if (headPosition.getSection().isFault()) { // endList.add(new MovementAuthority.End(headPosition.getSection(), MovementAuthority.EndType.FAULT_SECTION)); diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/data/vr/VirtualRealityTrain.java b/src/main/java/club/joylink/rtss/simulation/cbtc/data/vr/VirtualRealityTrain.java index 938f3e9ca..d258e4008 100644 --- a/src/main/java/club/joylink/rtss/simulation/cbtc/data/vr/VirtualRealityTrain.java +++ b/src/main/java/club/joylink/rtss/simulation/cbtc/data/vr/VirtualRealityTrain.java @@ -595,6 +595,7 @@ public class VirtualRealityTrain extends VirtualRealityDevice { this.signalEB = false; this.atpOn = true; this.atoOn = true; + this.nextParking = true; } public synchronized void updateNextStationPlan(Station nextStation, Section targetSection, boolean nextParking) { diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/robot/RobotLogicLoop.java b/src/main/java/club/joylink/rtss/simulation/cbtc/robot/RobotLogicLoop.java index 632f7e14e..0cb7bdd3d 100644 --- a/src/main/java/club/joylink/rtss/simulation/cbtc/robot/RobotLogicLoop.java +++ b/src/main/java/club/joylink/rtss/simulation/cbtc/robot/RobotLogicLoop.java @@ -102,9 +102,9 @@ public class RobotLogicLoop { atoService.doBreakMax(train); train.setRobotTargetPosition(null); TrainInfo trainInfo = repository.getSupervisedTrainByGroup(train.getGroupNumber()); - if (trainInfo.isManual()) { - train.setTarget(null); - } +// if (trainInfo.isManual()) { +// train.setTarget(null); +// } continue; } // if (train.isEB()) { @@ -120,6 +120,7 @@ public class RobotLogicLoop { TrainInfo trainInfo = repository.getSupervisedTrainByGroup(train.getGroupNumber()); if (trainInfo.isManual()) { train.setTarget(train.getRobotTargetPosition().getSection()); + train.setRobotTargetPosition(null); } break; case CM: