From d669bb2d4c2c6d96a185700e01ad0c65f0985253 Mon Sep 17 00:00:00 2001 From: walker-sheng Date: Thu, 28 Jan 2021 17:43:52 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=9B=E8=B7=AF=E8=B7=AF=E5=BE=84=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=96=B9=E6=B3=95=E5=93=88=E5=B0=94=E6=BB=A8ATP?= =?UTF-8?q?=E8=BF=9B=E8=B7=AF=E9=80=BB=E8=BE=91=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rtss/simulation/cbtc/data/CalculateService.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/data/CalculateService.java b/src/main/java/club/joylink/rtss/simulation/cbtc/data/CalculateService.java index f29a3efa8..f36a4f48c 100644 --- a/src/main/java/club/joylink/rtss/simulation/cbtc/data/CalculateService.java +++ b/src/main/java/club/joylink/rtss/simulation/cbtc/data/CalculateService.java @@ -737,15 +737,15 @@ public class CalculateService { Set
sections = routeMap.keySet(); for (Section last : sections) { List tempList = routeMap.get(last); - if (tempList.contains(lastRouteSection)) { + if (Objects.equals(last, lastRouteSection)) { + break; + } + if (tempList.get(0).getSectionList().contains(lastRouteSection)) { handled = true; tempList.add(route); List nextRouteList = route.getDestination().getRouteList(); - if (nextRouteList.size() == 1 && - Objects.equals(nextRouteList.get(0).getLastRouteSection(), last)) { + if (nextRouteList.size() == 1) { tempList.addAll(nextRouteList); - } else { - throw BusinessExceptionAssertEnum.SYSTEM_EXCEPTION.exception(); } } }