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

修改进路接近锁闭的判定条件与信号机保持一致；回滚办理引导进路时，引导信号持续时间逻辑

This commit is contained in:
joylink_zhangsai 2023-12-19 14:54:23 +08:00
parent 5372e55b44
commit 5cbcd67041
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/club/joylink/rtss/simulation/cbtc/CI/CiApiServiceImpl2.java
View File

@ -494,15 +494,17 @@ public class CiApiServiceImpl2 implements CiApiService {
}
}
}
if (signal.getGuideRemain() > 0) {
// Route lockedRoute = signal.getLockedRoute();
// if (lockedRoute != null && lockedRoute.getFirstLogicSection().isOccupied() && signal.isGuideAspect()) {
// signal.guideDelayStart();
// }
signal.setGuideRemain(0);
} else {
signal.guideDelayStart();
if (repository.getConfig().isRailway() && signal.isHigherThanGuideLevel()) {
Route lockedRoute = signal.getLockedRoute();
if (lockedRoute != null && lockedRoute.getFirstLogicSection().isOccupied()) {
signal.guideDelayStart();
}
}
// if (signal.getGuideRemain() > 0) {
// signal.setGuideRemain(0);
// } else {
// signal.guideDelayStart();
// }
}
/**

2
src/main/java/club/joylink/rtss/simulation/cbtc/data/map/Route.java
View File

@ -441,7 +441,7 @@ public class Route extends MapNamedElement {
}
public boolean isApproachLock() {
return this.isOpenMain() && this.getStart().isApproachLock();
return /*this.isOpenMain() &&*/ this.getStart().isApproachLock();
}
public boolean isAnySectionOccupied() {