From 67f61cb9deb8b0dd287eee3b4485f849307dac03 Mon Sep 17 00:00:00 2001
From: joylink_zhangsai <1021828630@qq.com>
Date: Fri, 20 May 2022 15:30:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E9=93=81=E8=BF=9B=E8=B7=AF=E4=B8=B4?=
 =?UTF-8?q?=E6=97=B6=E9=99=90=E5=88=B6=E8=87=AA=E5=8A=A8=E9=87=8D=E5=BC=80?=
 =?UTF-8?q?=E4=BF=A1=E5=8F=B7=EF=BC=9B=E5=BC=95=E5=AF=BC=E4=BF=A1=E5=8F=B7?=
 =?UTF-8?q?=E4=BB=85=E5=9C=A8=E8=BF=9B=E8=B7=AF=E5=A7=8B=E7=AB=AF=E5=8C=BA?=
 =?UTF-8?q?=E6=AE=B5=E5=8D=A0=E7=94=A8=E6=97=B6=E6=89=8D=E8=AE=A1=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../joylink/rtss/simulation/cbtc/CI/CiApiServiceImpl2.java   | 5 ++++-
 .../java/club/joylink/rtss/simulation/cbtc/CI/CiLogic.java   | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/CI/CiApiServiceImpl2.java b/src/main/java/club/joylink/rtss/simulation/cbtc/CI/CiApiServiceImpl2.java
index 8fa19e8ca..f867cf62f 100644
--- a/src/main/java/club/joylink/rtss/simulation/cbtc/CI/CiApiServiceImpl2.java
+++ b/src/main/java/club/joylink/rtss/simulation/cbtc/CI/CiApiServiceImpl2.java
@@ -472,7 +472,10 @@ public class CiApiServiceImpl2 implements CiApiService {
             }
         }
         if (repository.getConfig().isHasCTC() && signal.isHigherThanGuideLevel()) {
-            signal.guideDelayStart();
+            Route lockedRoute = signal.getLockedRoute();
+            if (lockedRoute != null && lockedRoute.getFirstLogicSection().isOccupied()) {
+                signal.guideDelayStart();
+            }
         }
     }
 
diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/CI/CiLogic.java b/src/main/java/club/joylink/rtss/simulation/cbtc/CI/CiLogic.java
index 192d9a7d1..51eeda118 100644
--- a/src/main/java/club/joylink/rtss/simulation/cbtc/CI/CiLogic.java
+++ b/src/main/java/club/joylink/rtss/simulation/cbtc/CI/CiLogic.java
@@ -108,6 +108,7 @@ public class CiLogic {
      * @param route
      */
     public void interlockMonitor(Simulation simulation, Route route) {
+        MapConfig config = simulation.getRepository().getConfig();
         if (route.isCiControl()) { // 进路联锁自动触发
             if (!route.isLock() && !route.isSetting() && ciService.isCiRouteTrigger(simulation, route)) {
                 routeService.setRoute(simulation, route);
@@ -153,6 +154,8 @@ public class CiLogic {
                     CiLogic.log.info("进路[{}]联锁条件不满足，关闭信号", route.debugStr());
                     signalControlService.tryControlSignalAspectAccordingLevel(simulation,
                             start, start.getDefaultAspect());
+                    if (config.isHasCTC()) //大铁线路暂时限制自动重开信号
+                        start.setForbidden(true);
                 } else if (start.isDefaultAspect() && !start.isForbidden() && !start.isBlockade() && start.isSupportMainAspect()) {
                     CiLogic.log.info("进路[{}]联锁条件满足，开放信号", route.debugStr());
                     signalControlService.tryControlSignalAspectAccordingLevel(simulation,