From c747a67d59c2a5891f82ee6d06917c90d8615051 Mon Sep 17 00:00:00 2001
From: walker-sheng <shengxuqiang@joylink.club>
Date: Thu, 21 Jan 2021 16:09:38 +0800
Subject: [PATCH] =?UTF-8?q?ATS=E8=BF=9B=E8=B7=AF=E8=A7=A6=E5=8F=91bug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=B7=BB=E5=8A=A0=E8=BF=9B=E8=B7=AF?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ATS/service/AtsRouteSettingService.java   |  4 +---
 .../cbtc/CI/service/RouteService.java         | 23 +++++++++++++++----
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/ATS/service/AtsRouteSettingService.java b/src/main/java/club/joylink/rtss/simulation/cbtc/ATS/service/AtsRouteSettingService.java
index 71ff6fe70..8346a001c 100644
--- a/src/main/java/club/joylink/rtss/simulation/cbtc/ATS/service/AtsRouteSettingService.java
+++ b/src/main/java/club/joylink/rtss/simulation/cbtc/ATS/service/AtsRouteSettingService.java
@@ -39,9 +39,7 @@ public class AtsRouteSettingService {
         // 执行进路排列
         for (TrainRoute trainRoute : waitSetList) {
             Route route = trainRoute.getRoute();
-            if (!simulation.getRepository().hasSettingRoute(route)) {
-                this.ciApiService.settingRoute(simulation, route.getCode());
-            }
+            this.ciApiService.settingRoute(simulation, route.getCode());
         }
     }
 
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 aa933bbe4..303090679 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
@@ -792,9 +792,13 @@ public class RouteService {
         List<Section> sectionList = route.getSectionList();
         for (Section section : sectionList) {
             if (!section.isRouteLockOn(right)) {
+                log.info(String.format("进路[%s]连锁条件检查失败：区段[%s]锁闭方向错误", route.debugStr(),
+                        section.debugStr()));
                 return level;
             }
             if (section.isNoStatus()) {
+                log.info(String.format("进路[%s]连锁条件检查失败：区段[%s]连锁无状态", route.debugStr(),
+                        section.debugStr()));
                 return level;
             }
         }
@@ -813,13 +817,15 @@ public class RouteService {
                 } else {
                     p = "失表";
                 }
-                log.debug(String.format("联锁网络检查失败：道岔[%s(%s)]位置[%s]",
+                log.info(String.format("进路[%s]连锁条件检查失败：道岔[%s(%s)]位置[%s]",
+                        route.debugStr(),
                         element.getASwitch().getName(), element.getASwitch().getCode(), p));
                 return level;
             }
         }
         level = Signal.LEVEL_2; // 引导级
         if (route.getStart().isBlockade()) {
+            log.info(String.format("进路[%s]连锁条件检查失败：始端信号机封锁", route.debugStr()));
             return level;
         }
         // 进路侧防检查
@@ -839,6 +845,7 @@ public class RouteService {
                         if ((pSignal != null && !pSignal.isClose()) ||
                                 (fpae != null && !fpae.getASwitch().isOnPosition(fpae.isNormal()))) {
                             level1Result = false;
+                            break;
                         }
                     }
                 }
@@ -851,6 +858,8 @@ public class RouteService {
         if (!CollectionUtils.isEmpty(route.getEspList())) {
             for (ESP esp : route.getEspList()) {
                 if (esp.isEffective()) {
+                    log.info(String.format("进路[%s]连锁条件检查失败：站台紧急停车按钮[%s]按下", route.debugStr(),
+                            esp.debugStr()));
                     return level;
                 }
             }
@@ -865,10 +874,12 @@ public class RouteService {
                     Collections.reverse(logicList);
                 }
                 if (logicList.get(0).isOccupied()) {
+                    log.info(String.format("进路[%s]连锁条件检查失败：CTC模式首个区段占用", route.debugStr()));
                     return level;
                 }
             } else {
                 if (firstRouteSection.isOccupied()) {
+                    log.info(String.format("进路[%s]连锁条件检查失败：CTC模式首个区段占用", route.debugStr()));
                     return level;
                 }
             }
@@ -876,7 +887,8 @@ public class RouteService {
             // 区段占用检查
             Route.CheckFailMessage checkFailMessage = this.ciLevelCheck(route);
             if (Objects.nonNull(checkFailMessage)) {
-                log.debug(String.format("联锁网络检查失败：[%s]", checkFailMessage.toJson()));
+                log.info(String.format("进路[%s]连锁条件检查失败：[%s]",
+                        route.debugStr(), checkFailMessage.toJson()));
                 return level;
             }
 //            // 屏蔽门
@@ -894,7 +906,8 @@ public class RouteService {
             if (!CollectionUtils.isEmpty(route.getStandHoldList())) {
                 for (Stand stand : route.getStandHoldList()) {
                     if (stand.isHoldTrain()) {
-                        log.debug(String.format("联锁网络检查失败：站台[%s(%s)]扣车",
+                        log.info(String.format("进路[%s]连锁条件检查失败：站台[%s(%s)]扣车",
+                                route.debugStr(),
                                 stand.getName(), stand.getCode()));
                         return level;
                     }
@@ -1153,8 +1166,8 @@ public class RouteService {
         if (!interlocked) {
             // 进路信号开放，联锁逻辑不满足，需关闭信号
             this.routeClose(simulation, route);
-            log.debug(String.format("进路始端信号联锁条件不满足，信号机[%s(%s)]关灯",
-                    route.getStart().getName(), route.getStart().getCode()));
+            log.info(String.format("进路[%s]始端信号联锁条件不满足，信号机[%s(%s)]关灯",
+                    route.debugStr(), route.getStart().getName(), route.getStart().getCode()));
         }
 //            this.reLockOverlap(simulation, route);
 //        }