进路信号封锁联锁检查和开放逻辑修改

src/main/java/club/joylink/rtss/simulation/cbtc/CI/service/RouteService.java

@@ -401,9 +401,12 @@ public class RouteService {
             this.sectionLock(simulation, route);
             // 联锁网络检查
             if (this.isInterlocked(route)) {
+                route.settingFinish();
+                if (route.getStart().isBlockade()) {
+                    return;
+                }
                 // 联锁检查通过，开放信号
                 this.routeOpen(simulation, route);
-                route.settingFinish();
             }
         }
     }
@@ -843,10 +846,10 @@ public class RouteService {
             }
         }
         level = Signal.LEVEL_2; // 引导级
-        if (route.getStart().isBlockade()) {
-            log.info(String.format("进路[%s]连锁条件检查失败：始端信号机封锁", route.debugStr()));
-            return level;
-        }
+//        if (route.getStart().isBlockade()) {
+//            log.info(String.format("进路[%s]连锁条件检查失败：始端信号机封锁", route.debugStr()));
+//            return level;
+//        }
         // 进路侧防检查
         List<RouteFls> flsList = route.getFlsList();
         if (!route.isOpenGuide() && !CollectionUtils.isEmpty(flsList)) {