From 3b99e3f5eac88d34d917105de894f33ffcaaac3b Mon Sep 17 00:00:00 2001
From: joylink_zhangsai <1021828630@qq.com>
Date: Mon, 18 Jan 2021 17:24:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=81=A2=E5=A4=8D=E5=B9=B6=E4=BF=AE=E6=94=B9<?=
 =?UTF-8?q?=E8=BF=9B=E8=B7=AF=E7=BB=8F=E8=BF=87=E7=9A=84=E7=AB=99=E5=8F=B0?=
 =?UTF-8?q?=E8=BD=A8=E6=89=80=E5=B1=9E=E7=9A=84=E7=AB=99=E5=8F=B0=E7=9A=84?=
 =?UTF-8?q?=E5=B1=8F=E8=94=BD=E9=97=A8=E6=9C=AA=E5=85=B3=E9=97=AD=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E5=85=B3=E9=97=AD=E4=BF=A1=E5=8F=B7=E6=9C=BA>?=
 =?UTF-8?q?=E4=B8=BA=E9=9D=9ECBTC=E7=BA=A7=E5=88=AB=E4=B8=8B=E6=A3=80?=
 =?UTF-8?q?=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cbtc/CI/service/RouteService.java         | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

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<Section> standTracks = sectionList.stream().filter(Section::isStandTrack).collect(Collectors.toList());
-//            if (!CollectionUtils.isEmpty(standTracks)) {
-//                for (Section standTrack : standTracks) {
-//                    List<Stand> standList = standTrack.getStandList();
-//                    if (standList.stream().anyMatch(stand -> stand.getPsd() != null && !stand.getPsd().isCloseAndLock()))
-//                        return false;
-//                }
-//            }
+            // 非CBTC下，如果进路区段中有站台轨，站台屏蔽门开着，需要关灯
+            if (!route.isCbtcMode()) {
+                List<Section> standTracks = sectionList.stream().filter(Section::isStandTrack).collect(Collectors.toList());
+                if (!CollectionUtils.isEmpty(standTracks)) {
+                    for (Section standTrack : standTracks) {
+                        List<Stand> standList = standTrack.getStandList();
+                        if (standList.stream().anyMatch(stand -> stand.getPsd() != null && !stand.getPsd().isCloseAndLock()))
+                            return level;
+                    }
+                }
+            }
         } else { // 后备模式检查
             // 区段占用检查
             Route.CheckFailMessage checkFailMessage = this.ciLevelCheck(route);