From 4a82fe3ccf4215480c7745b3085cfcad8785282f Mon Sep 17 00:00:00 2001 From: weizhihong Date: Thu, 8 Dec 2022 16:31:02 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=AE=9E=E8=AE=AD=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E7=AD=9B=E9=80=89=E4=BF=AE=E6=94=B9=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../joylink/rtss/vo/training2/rule/MapDeviceRule.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/java/club/joylink/rtss/vo/training2/rule/MapDeviceRule.java b/src/main/java/club/joylink/rtss/vo/training2/rule/MapDeviceRule.java index c90c187d1..da359bd80 100644 --- a/src/main/java/club/joylink/rtss/vo/training2/rule/MapDeviceRule.java +++ b/src/main/java/club/joylink/rtss/vo/training2/rule/MapDeviceRule.java @@ -181,7 +181,7 @@ public enum MapDeviceRule { if (route.getStart().getDeviceStation() != null && !route.getStart().getDeviceStation().isInterlock()) { return false; } - if ((!route.isArs()) || route.isGuide()) { + if ((!route.isArs()) || route.isGuide() || !route.isFlt()) { return false; } return true; @@ -283,6 +283,13 @@ public enum MapDeviceRule { if (deviceStation != null && !deviceStation.isInterlock()) { return false; } + Station station = section.getStation(); + if (station != null && station.isDepot()) { + return false; + } + if (station != null && !station.isInterlock()) { + return false; + } Section axleCounterSection = section.findAxleCounterSection(); if (axleCounterSection != null) { Station axleDeviceStation = axleCounterSection.getDeviceStation();