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

修改备用车无法ATO驾驶（zc去掉未锁闭进路检查）、不停站问题

Browse Source
This commit is contained in:
joylink_zhangsai 2021-07-29 15:19:51 +08:00
parent f078ad99dd
commit 988bed827d
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -120,11 +120,11 @@ public class ZCLogicLoop {
if (switchEnd != null) if (switchEnd != null)
return List.of(switchEnd); return List.of(switchEnd);
// 检查列车当前所在进路是否锁闭 // 检查列车当前所在进路是否锁闭
MovementAuthority.End end1 = this.checkRouteLock(simulation, section, tailSection, right, train); // MovementAuthority.End end1 = this.checkRouteLock(simulation, section, tailSection, right, train);
if (Objects.nonNull(end1)) { // if (Objects.nonNull(end1)) {
endList.add(end1); // endList.add(end1);
return endList; // return endList;
} // }
// // 检查车头区段是否故障 // // 检查车头区段是否故障
// if (headPosition.getSection().isFault()) { // if (headPosition.getSection().isFault()) {
// endList.add(new MovementAuthority.End(headPosition.getSection(), MovementAuthority.EndType.FAULT_SECTION)); // endList.add(new MovementAuthority.End(headPosition.getSection(), MovementAuthority.EndType.FAULT_SECTION));

1
src/main/java/club/joylink/rtss/simulation/cbtc/data/vr/VirtualRealityTrain.java
View File

@ -595,6 +595,7 @@ public class VirtualRealityTrain extends VirtualRealityDevice {
this.signalEB = false; this.signalEB = false;
this.atpOn = true; this.atpOn = true;
this.atoOn = true; this.atoOn = true;
this.nextParking = true;
} }
public synchronized void updateNextStationPlan(Station nextStation, Section targetSection, boolean nextParking) { public synchronized void updateNextStationPlan(Station nextStation, Section targetSection, boolean nextParking) {

7
src/main/java/club/joylink/rtss/simulation/cbtc/robot/RobotLogicLoop.java
View File

@ -102,9 +102,9 @@ public class RobotLogicLoop {
atoService.doBreakMax(train); atoService.doBreakMax(train);
train.setRobotTargetPosition(null); train.setRobotTargetPosition(null);
TrainInfo trainInfo = repository.getSupervisedTrainByGroup(train.getGroupNumber()); TrainInfo trainInfo = repository.getSupervisedTrainByGroup(train.getGroupNumber());
if (trainInfo.isManual()) { // if (trainInfo.isManual()) {
train.setTarget(null); // train.setTarget(null);
} // }
continue; continue;
} }
// if (train.isEB()) { // if (train.isEB()) {
@ -120,6 +120,7 @@ public class RobotLogicLoop {
TrainInfo trainInfo = repository.getSupervisedTrainByGroup(train.getGroupNumber()); TrainInfo trainInfo = repository.getSupervisedTrainByGroup(train.getGroupNumber());
if (trainInfo.isManual()) { if (trainInfo.isManual()) {
train.setTarget(train.getRobotTargetPosition().getSection()); train.setTarget(train.getRobotTargetPosition().getSection());
train.setRobotTargetPosition(null);
} }
break; break;
case CM: case CM: