ZC非通信车占用移动授权逻辑bug修改

src/main/java/club/joylink/rtss/simulation/cbtc/ATP/ground/ZCLogicLoop.java

@@ -172,9 +172,12 @@ public class ZCLogicLoop {
                 break;
             }
             //非通信车占用区段
-            if (temp.isNonCbtcOccupy() && !temp.isSwitchTrack()) {
+            if (temp.isNonCbtcOccupy()) {
+                SectionPosition headPosition1 = train.getHeadPosition();
+                if (!temp.isSamePhysical(headPosition1.getSection().getCode())) {
                     deviceEnd = new MovementAuthority.End(section,
                             MovementAuthority.EndType.NCT_OCCUPIED_IN_FRONT_OF_SECTION);
+                }
                 break;
             }
             section = temp;

src/main/java/club/joylink/rtss/simulation/cbtc/SimulationMainThread.java

@@ -669,7 +669,7 @@ public class SimulationMainThread {
         Set<String> users = simulation.getSimulationUserIds();
         SocketMessageVO<Boolean> message = SocketMessageFactory.build(
                 WebSocketMessageType.Simulation_Reset,
-                simulation.getGroup(), false);
+                simulation.getGroup(), true);
         this.stompMessageService.sendToUser(users, message);
     }
 

src/main/java/club/joylink/rtss/simulation/cbtc/data/support/MovementAuthority.java

@@ -42,7 +42,10 @@ public class MovementAuthority {
     }
 
     public String debugStr() {
-        return String.format("移动授权终点[类型:%s|位置:%s]", end.type, end.getEndPosition());
+        return String.format("移动授权终点[类型:%s|设备:%s|baseSection:%s|位置:%s]", end.type,
+                end.device.debugStr(),
+                end.baseSection != null ? end.baseSection.debugStr() : "null",
+                end.getEndPosition());
     }
 
     @Getter