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 2023-03-11 22:21:21 +08:00
parent e72837d793
commit d4fc3ebbe0
2 changed files with 7 additions and 5 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/AtpSectionService.java
View File

@ -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);

2
src/main/java/club/joylink/rtss/simulation/cbtc/device/real/modbustcp/say/SaySwitchConfig.java
View File

@ -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;