From cd8efe1a2180a6d0823c89dbbed1032507b427f7 Mon Sep 17 00:00:00 2001
From: joylink_zhangsai <1021828630@qq.com>
Date: Mon, 31 May 2021 13:05:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=BE=E7=BD=AE=E5=A4=B4?=
 =?UTF-8?q?=E7=A0=81=E8=BD=A6=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cbtc/ATS/service/AtsTrainService.java      | 18 ++++++++----------
 .../cbtc/CI/service/RouteService.java          |  1 +
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/ATS/service/AtsTrainService.java b/src/main/java/club/joylink/rtss/simulation/cbtc/ATS/service/AtsTrainService.java
index 47d97d896..99695aba8 100644
--- a/src/main/java/club/joylink/rtss/simulation/cbtc/ATS/service/AtsTrainService.java
+++ b/src/main/java/club/joylink/rtss/simulation/cbtc/ATS/service/AtsTrainService.java
@@ -260,24 +260,22 @@ public class AtsTrainService {
                 default:
                     throw new SimulationException(SimulationExceptionType.System_Fault, String.format("无法识别的目的地码类型[%s]", destinationCodeDefinition.getType()));
             }
-            supervisedTrain.change2HeadCode(destinationCode, serviceNumber, tripNumber);
             //默认
-            this.onboardAtpApiService.update2HeadTrainServiceNumber(simulation, groupNumber, serviceNumber, tripNumber, destinationCode, true);
         } else { //没有新版目的地码数据
             List<Routing> routingList = repository.queryRoutingByDestCode(destinationCode);
             if (CollectionUtils.isEmpty(routingList)) {
                 throw new SimulationException(SimulationExceptionType.Operation_Handle_FAIL,
                         String.format("不存在目的地号为[%s]的交路", destinationCode));
-            } else {
-                boolean needParking = true;
-                if (repository.getConfig().isNoParkingServiceNumber(serviceNumber)) {
-                    needParking = false;
-                }
-                supervisedTrain.change2HeadCode(destinationCode, serviceNumber, tripNumber);
-                //默认
-                this.onboardAtpApiService.update2HeadTrainServiceNumber(simulation, groupNumber, serviceNumber, tripNumber, destinationCode, needParking);
             }
         }
+
+        boolean needParking = true;
+        if (repository.getConfig().isNoParkingServiceNumber(serviceNumber)) {
+            needParking = false;
+        }
+        supervisedTrain.change2HeadCode(destinationCode, serviceNumber, tripNumber);
+        this.onboardAtpApiService.update2HeadTrainServiceNumber(simulation, groupNumber, serviceNumber, tripNumber, destinationCode, needParking);
+        supervisedTrain.updateEstimatedArriveInfo(null, null);
     }
 
     /**
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 6743b3a16..65caeedb2 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
@@ -801,6 +801,7 @@ public class RouteService {
         }
         //进路解锁
         route.setLock(false);
+        route.setSetting(false);
         simulation.getRepository().removeSettingRoute(route);
     }