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

移除：自动缓解EB逻辑

Browse Source
This commit is contained in:
joylink_zhangsai 2021-06-11 09:55:20 +08:00
parent 96af0971ec
commit 3b1f08df5d
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/club/joylink/rtss/simulation/cbtc/onboard/ATP/ATPLogicLoop.java
View File

@ -133,18 +133,18 @@ public class ATPLogicLoop {
this.handleStandParkedTrain(simulation, train);
}
if (train.isEB()) { // 列车EB
if (train.isAtpOn()) { // 尝试自动缓解信号EB
if (train.getLeverPosition() == 0 && train.getMa() != null) {
Float distance = CalculateService.calculateDistance(headPosition, train.getMa().getEnd().getEndPosition(), right);
if (distance != null && distance > 100) {
atpService.cancelSignalEB(train);
applicationContext.publishEvent(new SimulationATPAutoCancelEBEvent(this, simulation, train));
log.info(String.format("列车[%s]移动授权距离超过100m，EB自动缓解", train.getGroupNumber()));
}
}
}
}
// if (train.isEB()) { // 列车EB
// if (train.isAtpOn()) { // 尝试自动缓解信号EB
// if (train.getLeverPosition() == 0 && train.getMa() != null) {
// Float distance = CalculateService.calculateDistance(headPosition, train.getMa().getEnd().getEndPosition(), right);
// if (distance != null && distance > 100) {
// atpService.cancelSignalEB(train);
// applicationContext.publishEvent(new SimulationATPAutoCancelEBEvent(this, simulation, train));
// log.info(String.format("列车[%s]移动授权距离超过100m，EB自动缓解", train.getGroupNumber()));
// }
// }
// }
// }
/* 缓解EB检查 */
if (train.isEB()) {