From 6b16dc6fb40250a4affa41f5e3ac1d00da42b7b4 Mon Sep 17 00:00:00 2001
From: thesai <1021828630@qq.com>
Date: Mon, 22 Nov 2021 09:36:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=9F=A5=E8=AF=A2=E8=BF=9B?=
 =?UTF-8?q?=E8=B7=AF=E8=B7=AF=E5=BE=84=E6=96=B9=E6=B3=95=E4=B8=AD=EF=BC=8C?=
 =?UTF-8?q?=E8=99=9A=E6=8B=9F=E4=BF=A1=E5=8F=B7=E6=9C=BA=E4=B8=8B=E7=9A=84?=
 =?UTF-8?q?=E8=BF=9B=E8=B7=AF=E5=8F=AA=E6=9C=89=E4=B8=80=E6=9D=A1=E7=9A=84?=
 =?UTF-8?q?=E6=96=AD=E8=A8=80=E5=92=8C=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cbtc/data/CalculateService.java           | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 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 fd4dba10e..09c1c5212 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
@@ -755,22 +755,22 @@ public class CalculateService {
         if (!CollectionUtils.isEmpty(routeList)) {
             // 进路
             boolean find = false;
-            if (signal.isVirtual()) { // 虚拟信号机，应该只有一条进路
-                BusinessExceptionAssertEnum.SYSTEM_EXCEPTION.assertTrue(routeList.size() == 1);
-                Route route = routeList.get(0);
-                routePath.addRoute(route);
-                List<Section> sectionList = route.getSectionList();
-                int i = sectionList.indexOf(end);
-                if (i >= 0) {
-                    // 找到
-                    routePath.addSections(sectionList.subList(0, i));
-                    list.add(routePath);
-                } else {
-                    routePath.addSections(sectionList);
-                    queryRoutePaths(iter + 1, iterTimes, route.getLastRouteSection(), routePath, list, warnList);
-                }
-                return;
-            }
+//            if (signal.isVirtual()) { // 虚拟信号机，应该只有一条进路
+//                BusinessExceptionAssertEnum.SYSTEM_EXCEPTION.assertTrue(routeList.size() == 1);
+//                Route route = routeList.get(0);
+//                routePath.addRoute(route);
+//                List<Section> sectionList = route.getSectionList();
+//                int i = sectionList.indexOf(end);
+//                if (i >= 0) {
+//                    // 找到
+//                    routePath.addSections(sectionList.subList(0, i));
+//                    list.add(routePath);
+//                } else {
+//                    routePath.addSections(sectionList);0
+//                    queryRoutePaths(iter + 1, iterTimes, route.getLastRouteSection(), routePath, list, warnList);
+//                }
+//                return;
+//            }
             Map<Section, List<Route>> routeMap = new HashMap<>(); // 进路终端对应进路列表(ATP进路合并进正常进路终端)
             routeList.sort(Comparator.comparing(Route::isAtp)); // 将ATP进路排在最后处理
             for (Route route : routeList) {