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
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
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> routeMap = new HashMap<>(); // 进路终端对应进路列表(ATP进路合并进正常进路终端) routeList.sort(Comparator.comparing(Route::isAtp)); // 将ATP进路排在最后处理 for (Route route : routeList) {