diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/ATP/ground/AtpSectionService.java b/src/main/java/club/joylink/rtss/simulation/cbtc/ATP/ground/AtpSectionService.java index c23d8a323..7fc7cff24 100644 --- a/src/main/java/club/joylink/rtss/simulation/cbtc/ATP/ground/AtpSectionService.java +++ b/src/main/java/club/joylink/rtss/simulation/cbtc/ATP/ground/AtpSectionService.java @@ -145,11 +145,11 @@ public class AtpSectionService { } else if (Section.AxleFault.FAULT.equals(section.getFault()) && section.getVirtualAxleCounter().isOccupy()) { section.judgeAsNctOccupied(simulation); } -// if (/*!section.isInvalid() &&*/ section.isNctOccupied()) { -// if (!sectionList.contains(section)) { -// section.judgeAsNctOccupied(); -// } -// } + if (/*!section.isInvalid() &&*/ section.isNctOccupied()) { + if (!sectionList.contains(section)) { + section.judgeAsNctOccupied(simulation); + } + } //ARB故障恢复判断 if (Section.AxleFault.ARB.equals(section.getFault()) && !section.getVirtualAxleCounter().isOccupy()) { Section.AxleFault.ARB.fix(section); diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/device/real/modbustcp/say/SaySwitchConfig.java b/src/main/java/club/joylink/rtss/simulation/cbtc/device/real/modbustcp/say/SaySwitchConfig.java index 7ff0bf4bb..16384a24a 100644 --- a/src/main/java/club/joylink/rtss/simulation/cbtc/device/real/modbustcp/say/SaySwitchConfig.java +++ b/src/main/java/club/joylink/rtss/simulation/cbtc/device/real/modbustcp/say/SaySwitchConfig.java @@ -44,6 +44,7 @@ public class SaySwitchConfig extends RealDeviceConfig { return false; } else { turnToN = true; + turnToP = false; startTime = LocalDateTime.now(); return true; } @@ -57,6 +58,7 @@ public class SaySwitchConfig extends RealDeviceConfig { if (turnToP) { return false; } else { + turnToN = false; turnToP = true; startTime = LocalDateTime.now(); return true;