From 193097dc55d5122026ffb7a98ffca6d6f95e5c69 Mon Sep 17 00:00:00 2001
From: joylink_zhangsai <1021828630@qq.com>
Date: Thu, 12 May 2022 08:49:46 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=9B=E8=B7=AF=E5=8A=9E=E7=90=86=E6=A3=80?=
 =?UTF-8?q?=E6=9F=A5=E4=B8=AD=E5=8A=A0=E5=85=A5=E9=81=93=E5=B2=94=E5=BC=95?=
 =?UTF-8?q?=E5=AF=BC=E6=80=BB=E9=94=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../rtss/simulation/cbtc/CI/device/CiRouteService.java        | 3 +++
 .../club/joylink/rtss/simulation/cbtc/data/map/Route.java     | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/CI/device/CiRouteService.java b/src/main/java/club/joylink/rtss/simulation/cbtc/CI/device/CiRouteService.java
index 1dc535d5b..4603e6afc 100644
--- a/src/main/java/club/joylink/rtss/simulation/cbtc/CI/device/CiRouteService.java
+++ b/src/main/java/club/joylink/rtss/simulation/cbtc/CI/device/CiRouteService.java
@@ -150,6 +150,9 @@ public class CiRouteService {
                 if (aSwitch.isBlockade()) { // 道岔封锁
                     return new Route.CheckFailMessage(Route.CheckFailReason.SwitchBlockade, aSwitch);
                 }
+                if (aSwitch.isGuideMasterLock()) {
+                    return new Route.CheckFailMessage(Route.CheckFailReason.SwitchGuideMasterLock, aSwitch);
+                }
                 if ((aSwitch.isLocked() || aSwitch.isSectionOccupied()) &&
                         aSwitch.getPos().equals(SwitchIndication.of(!switchElement.isNormal()))) {//道岔锁闭或占用在相反位置
                     return new Route.CheckFailMessage(Route.CheckFailReason.SwitchLockPositionError, aSwitch);
diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/data/map/Route.java b/src/main/java/club/joylink/rtss/simulation/cbtc/data/map/Route.java
index a2338afec..71ecc3e0d 100644
--- a/src/main/java/club/joylink/rtss/simulation/cbtc/data/map/Route.java
+++ b/src/main/java/club/joylink/rtss/simulation/cbtc/data/map/Route.java
@@ -665,6 +665,10 @@ public class Route extends MapNamedElement {
         StartSignalFlankProtectLock,
         /** 道岔封锁 */
         SwitchBlockade,
+        /**
+         * 道岔引导总锁
+         */
+        SwitchGuideMasterLock,
         /** 道岔锁闭的方向不对 */
         SwitchLockPositionError,
         /** 道岔被征用在相反位置 */