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:
weizhihong 2022-12-08 16:31:02 +08:00
parent 7ef02b4ce4
commit 4a82fe3ccf
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/club/joylink/rtss/vo/training2/rule/MapDeviceRule.java
View File

@ -181,7 +181,7 @@ public enum MapDeviceRule {
if (route.getStart().getDeviceStation() != null && !route.getStart().getDeviceStation().isInterlock()) { if (route.getStart().getDeviceStation() != null && !route.getStart().getDeviceStation().isInterlock()) {
return false; return false;
} }
if ((!route.isArs()) || route.isGuide()) { if ((!route.isArs()) || route.isGuide() || !route.isFlt()) {
return false; return false;
} }
return true; return true;
@ -283,6 +283,13 @@ public enum MapDeviceRule {
if (deviceStation != null && !deviceStation.isInterlock()) { if (deviceStation != null && !deviceStation.isInterlock()) {
return false; return false;
} }
Station station = section.getStation();
if (station != null && station.isDepot()) {
return false;
}
if (station != null && !station.isInterlock()) {
return false;
}
Section axleCounterSection = section.findAxleCounterSection(); Section axleCounterSection = section.findAxleCounterSection();
if (axleCounterSection != null) { if (axleCounterSection != null) {
Station axleDeviceStation = axleCounterSection.getDeviceStation(); Station axleDeviceStation = axleCounterSection.getDeviceStation();