修改target更新逻辑；修改设置计划车bug；修改计轴故障时进路不能解锁问题

src/main/java/club/joylink/rtss/services/MapService.java

@@ -430,8 +430,8 @@ public class MapService implements IMapService {
         BusinessExceptionAssertEnum.DATA_NOT_EXIST.assertTrue(!ObjectUtils.isEmpty(mapInfoList),
                 String.format("地图名称为[%s]的发布地图数据不存在", mapVO.getName()));
         map = mapInfoList.get(0);
-        BusinessExceptionAssertEnum.OPERATION_NOT_SUPPORTED.assertEquals(map.getLineCode(), mapVO.getLineCode(),
+//        BusinessExceptionAssertEnum.OPERATION_NOT_SUPPORTED.assertEquals(map.getLineCode(), mapVO.getLineCode(),
-                "存在名称相同但基于不同真实线路的地图");
+//                "存在名称相同但基于不同真实线路的地图");
         BusinessExceptionAssertEnum.OPERATION_NOT_SUPPORTED.assertEquals(map.getCityCode(), mapVO.getCityCode(),
                 "存在名称相同但基于不同关联城市的地图");
         if (Objects.nonNull(map3dDataVO)) {

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

@@ -27,8 +27,8 @@ public class MaService {
 
     @Getter
     public static class Ma {
-        public static final int Safety_Margin = 10; // 安全余量，单位m
+        public static final int Safety_Margin = 1; // 安全余量，单位m
-        public static final int EB_Trigger = 20; // 紧急制动触发点偏移量，单位m
+        public static final int EB_Trigger = 3; // 紧急制动触发点偏移量，单位m
         public static final int Safety_Distance = 30; // 安全距离， 单位m
 
         VirtualRealityTrain train; // 列车

src/main/java/club/joylink/rtss/simulation/cbtc/ATS/service/AtsTrainService.java

@@ -1,5 +1,6 @@
 package club.joylink.rtss.simulation.cbtc.ATS.service;
 
+import club.joylink.rtss.entity.PlanRouting;
 import club.joylink.rtss.exception.BusinessExceptionAssertEnum;
 import club.joylink.rtss.simulation.cbtc.CI.CiApiService;
 import club.joylink.rtss.simulation.cbtc.Simulation;
@@ -157,9 +158,10 @@ public class AtsTrainService {
         if (supervisedTrain.hasPositionAndDirection()) {
             Section phySection = repository.getByCode(supervisedTrain.getPhysicalSection(), Section.class);
             StationPlan nextPlan = null;
+            List<StationPlan> planList = tripPlan.getPlanList();
             if ((phySection.isTurnBackTrack() || phySection.isTransferTrack()) && supervisedTrain.isStop()) {
                 // 列车折返轨停车中，判断以此折返轨为始端，有没有到计划中的车站停车的路径单元
-                List<StationPlan> stationPlanList = tripPlan.getPlanList();
+                List<StationPlan> stationPlanList = planList;
                 for (StationPlan stationPlan : stationPlanList) {
                     List<RoutePath> routePaths = repository.queryRoutePaths(phySection, stationPlan.getSection());
                     if (!CollectionUtils.isEmpty(routePaths)) {
@@ -169,11 +171,13 @@ public class AtsTrainService {
                 }
             } else {
                 // 列车不在折返轨停车，判断列车目标区段是否在计划到站的站台轨中
-                String targetSection = supervisedTrain.getPlanStandTrack();
+                for (int i = planList.size() - 1; i >= 0; i--) {
-                Optional<StationPlan> filterPlan = tripPlan.getPlanList().stream()
+                    StationPlan stationPlan = planList.get(i);
-                        .filter(plan -> plan.getSection().getCode().equals(targetSection)).limit(1).findFirst();
+                    List<RoutePath> routePaths = repository.queryRoutePathsByEndAndContainsSection(stationPlan.getSection(), phySection);
-                if (filterPlan.isPresent()) {
+                    if (!CollectionUtils.isEmpty(routePaths)) {
-                    nextPlan = filterPlan.get();
+                        nextPlan = stationPlan;
+                        break;
+                    }
                 }
             }
             if (Objects.isNull(nextPlan)) {

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

@@ -1361,13 +1361,13 @@ public class RouteService {
                 section.routeLocking(route, right);
             }
         }
-        if (route.isOpen()) {
         // 判断是否列车进入正常解锁
         Section firstLogicSection = route.getFirstLogicSection();
         if (firstLogicSection.isCtOccupied() || firstLogicSection.isNctOccupied()) {
             this.normalUnlockStart(simulation, route);
             return;
         }
+        if (route.isOpen()) {
             boolean interlocked = this.isInterlocked(route);
             if (!interlocked) {
                 // 进路信号开放，联锁逻辑不满足，需关闭信号

src/main/java/club/joylink/rtss/simulation/cbtc/onboard/ATO/service/ATOService.java

@@ -100,7 +100,7 @@ public class ATOService {
         if (speedCurve == null) {
             return;
         }
-        // 更新目标距离和建议速度
+        // 更新目标距离
         train.setTargetDistance(speedCurve.getTotalDistance());
         this.doControlBySpeedCurve(train, speedCurve, speedCurve.getTotalDistance());
     }

src/main/java/club/joylink/rtss/simulation/cbtc/onboard/TrainTargetUpdateService.java

@@ -26,48 +26,54 @@ public class TrainTargetUpdateService {
         List<VirtualRealityTrain> onlineTrain = repository.getOnlineTrainList();
         for (VirtualRealityTrain train : onlineTrain) {
             Section target = train.getTarget();
-            if (target == null) {
-                continue;
-            }
             TrainInfo trainInfo = repository.getSupervisedTrainByGroup(train.getGroupNumber());
             Section newTarget;
-            if (trainInfo.isManualTrain()) {
+//            if (trainInfo.isManualTrain()) {
-                newTarget = this.queryArriveTarget4Manual(train);
+                newTarget = this.queryArriveTarget4Manual(train, trainInfo, target);
-            } else {
+//            } else {
-                if (train.isStop()) {
+//                if (target == null) {
-                    continue;
+//                    continue;
-                }
+//                }
-                if (Objects.equals(target, train.getHeadPosition().getSection())) {
+//                if (train.isStop()) {
-                    continue;
+//                    continue;
-                }
+//                }
-                newTarget = this.queryArriveTarget(train, target);
+//                if (Objects.equals(target, train.getHeadPosition().getSection())) {
-            }
+//                    continue;
-            if (target.equals(newTarget)) {
+//                }
-                continue;
+//                newTarget = this.queryArriveTarget(train, target);
-            } else {
+//            }
+            if (newTarget != null && !Objects.equals(target, newTarget)) {
                 train.setTarget(newTarget);
             }
         }
     }
 
-    private Section queryArriveTarget4Manual(VirtualRealityTrain train) {
+    private Section queryArriveTarget4Manual(VirtualRealityTrain train, TrainInfo trainInfo, Section target) {
         SectionPosition headPosition = train.getHeadPosition();
         boolean right = train.isRight();
+        Section newTarget = target;
         Section temp = headPosition.getSection();
-        Section newTarget = temp;
         for (int i = 0; i < 50; i++) {
+            if (temp == null)
+                break;
+            if (!temp.isFunctionTrack()) {
+                temp = temp.getNextRunningSectionBaseRealSwitch(right);
+                continue;
+            }
             Signal signal = temp.getSignalOf(right);
             if (signal != null && !signal.isNormalOpen()) {
                 newTarget = temp;
                 break;
             }
-            if ((temp.isNormalStandTrack() || temp.isTransferTrack()) && !temp.equals(headPosition.getSection())) {
+            if ((temp.isNormalStandTrack() || temp.isTransferTrack()) && !train.isParkingAt()) {
+                if ((train.isParkingAt() && temp.isSameAxle(headPosition.getSection().getCode())) ||
+                    headPosition.isAheadOf(temp.buildStopPointPosition(right), right)) {
+                    continue;
+                }
                 newTarget = temp;
                 break;
             }
             temp = temp.getNextRunningSectionBaseRealSwitch(right);
-            if (temp == null)
-                break;
         }
         return newTarget;
     }