diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/CI/service/RouteService.java b/src/main/java/club/joylink/rtss/simulation/cbtc/CI/service/RouteService.java index 50c711773..9220ce15e 100644 --- a/src/main/java/club/joylink/rtss/simulation/cbtc/CI/service/RouteService.java +++ b/src/main/java/club/joylink/rtss/simulation/cbtc/CI/service/RouteService.java @@ -869,15 +869,17 @@ public class RouteService { return level; } } -// // 如果进路区段中有站台轨,站台屏蔽门开着,需要关灯 -// List
standTracks = sectionList.stream().filter(Section::isStandTrack).collect(Collectors.toList()); -// if (!CollectionUtils.isEmpty(standTracks)) { -// for (Section standTrack : standTracks) { -// List standList = standTrack.getStandList(); -// if (standList.stream().anyMatch(stand -> stand.getPsd() != null && !stand.getPsd().isCloseAndLock())) -// return false; -// } -// } + // 非CBTC下,如果进路区段中有站台轨,站台屏蔽门开着,需要关灯 + if (!route.isCbtcMode()) { + List
standTracks = sectionList.stream().filter(Section::isStandTrack).collect(Collectors.toList()); + if (!CollectionUtils.isEmpty(standTracks)) { + for (Section standTrack : standTracks) { + List standList = standTrack.getStandList(); + if (standList.stream().anyMatch(stand -> stand.getPsd() != null && !stand.getPsd().isCloseAndLock())) + return level; + } + } + } } else { // 后备模式检查 // 区段占用检查 Route.CheckFailMessage checkFailMessage = this.ciLevelCheck(route);