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

进路办理检查中加入道岔引导总锁

Browse Source
This commit is contained in:
joylink_zhangsai 2022-05-12 08:49:46 +08:00
parent 76fe31d729
commit 193097dc55
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/club/joylink/rtss/simulation/cbtc/CI/device/CiRouteService.java
View File

@ -150,6 +150,9 @@ public class CiRouteService {
if (aSwitch.isBlockade()) { // 道岔封锁 if (aSwitch.isBlockade()) { // 道岔封锁
return new Route.CheckFailMessage(Route.CheckFailReason.SwitchBlockade, aSwitch); return new Route.CheckFailMessage(Route.CheckFailReason.SwitchBlockade, aSwitch);
} }
if (aSwitch.isGuideMasterLock()) {
return new Route.CheckFailMessage(Route.CheckFailReason.SwitchGuideMasterLock, aSwitch);
}
if ((aSwitch.isLocked() || aSwitch.isSectionOccupied()) && if ((aSwitch.isLocked() || aSwitch.isSectionOccupied()) &&
aSwitch.getPos().equals(SwitchIndication.of(!switchElement.isNormal()))) {//道岔锁闭或占用在相反位置 aSwitch.getPos().equals(SwitchIndication.of(!switchElement.isNormal()))) {//道岔锁闭或占用在相反位置
return new Route.CheckFailMessage(Route.CheckFailReason.SwitchLockPositionError, aSwitch); return new Route.CheckFailMessage(Route.CheckFailReason.SwitchLockPositionError, aSwitch);

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

@ -665,6 +665,10 @@ public class Route extends MapNamedElement {
StartSignalFlankProtectLock, StartSignalFlankProtectLock,
/** 道岔封锁 */ /** 道岔封锁 */
SwitchBlockade, SwitchBlockade,
/**
* 道岔引导总锁
*/
SwitchGuideMasterLock,
/** 道岔锁闭的方向不对 */ /** 道岔锁闭的方向不对 */
SwitchLockPositionError, SwitchLockPositionError,
/** 道岔被征用在相反位置 */ /** 道岔被征用在相反位置 */