From 78796a70090abab51b20fa7e7571d46c9148c678 Mon Sep 17 00:00:00 2001
From: joylink_zhangsai <1021828630@qq.com>
Date: Thu, 31 Mar 2022 10:22:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BD=9B=E5=B1=B1=E7=BA=BF?=
 =?UTF-8?q?=E8=BF=90=E8=A1=8C=E5=9B=BE=E5=AF=BC=E5=85=A5=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=EF=BC=9B=E4=BF=AE=E6=94=B9ats=E5=87=86=E5=A4=87=E5=8F=91?=
 =?UTF-8?q?=E8=BD=A6=E6=97=B6=E7=9A=84=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../runplan/importReal/FoshanTramRunPlanNew.java         | 9 ++++++---
 .../cbtc/ATS/service/stage/AtsPlanTrainStageService.java | 3 +++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/main/java/club/joylink/rtss/services/runplan/importReal/FoshanTramRunPlanNew.java b/src/main/java/club/joylink/rtss/services/runplan/importReal/FoshanTramRunPlanNew.java
index f7264246b..144a33fe8 100644
--- a/src/main/java/club/joylink/rtss/services/runplan/importReal/FoshanTramRunPlanNew.java
+++ b/src/main/java/club/joylink/rtss/services/runplan/importReal/FoshanTramRunPlanNew.java
@@ -80,7 +80,7 @@ public class FoshanTramRunPlanNew implements IRunPlanStrategyNew {
                 tripVO.setDestinationCode("BF");
                 break;
             case "雷岗":
-                if (tripVO.getServiceNumber().equals("09")) { //据观察，服务号09是调试车
+                if (tripVO.getServiceNumber().equals("02")) { //据观察，服务号02是备用车
                     tripVO.setStartSectionCode("T38"); //G2109
                     tripVO.setDestinationCode("AA");
                 } else {
@@ -108,7 +108,7 @@ public class FoshanTramRunPlanNew implements IRunPlanStrategyNew {
                 tripVO.setDestinationCode("BF");
                 break;
             case "雷岗":
-                if (tripVO.getServiceNumber().equals("09")) { //据观察，服务号09是调试车
+                if (tripVO.getServiceNumber().equals("02")) { //据观察，服务号02是备用车
                     tripVO.setEndSectionCode("T38"); //G2109
                     tripVO.setDestinationCode("AA");
                 } else {
@@ -117,6 +117,9 @@ public class FoshanTramRunPlanNew implements IRunPlanStrategyNew {
                 }
                 break;
         }
+        if (tripVO.getServiceNumber().equals("02")) {
+            tripVO.setIsBackUp(true);
+        }
     }
 
     /**
@@ -133,7 +136,7 @@ public class FoshanTramRunPlanNew implements IRunPlanStrategyNew {
             return;
         }
         if ("雷岗".equals(stationVO.getRunPlanName())) {
-            if (runPlanImport.getServiceNumber().equals("09")) { //据观察，服务号09是调试车
+            if (runPlanImport.getServiceNumber().equals("02")) { //据观察，服务号02是备用车
                 timeVO.setSectionCode("T38"); //G2109
             } else {
                 timeVO.setSectionCode("T39");  //G2103
diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/ATS/service/stage/AtsPlanTrainStageService.java b/src/main/java/club/joylink/rtss/simulation/cbtc/ATS/service/stage/AtsPlanTrainStageService.java
index 4d4ec24a7..8a1e1c933 100644
--- a/src/main/java/club/joylink/rtss/simulation/cbtc/ATS/service/stage/AtsPlanTrainStageService.java
+++ b/src/main/java/club/joylink/rtss/simulation/cbtc/ATS/service/stage/AtsPlanTrainStageService.java
@@ -163,6 +163,9 @@ public class AtsPlanTrainStageService implements AtsStageService {
                 return;
             }
             if (tripPlan.isLastPlan(stationPlan)) {
+                if (tripPlan.isBackup() && parkSection.equals(tripPlan.getEndSection())) {
+                    return;
+                }
                 // 到达终点站，准备折返
                 log.debug(String.format("列车[%s]折返初始化", trainInfo.getGroupNumber()));
                 List<RoutePath> routePaths = repository.getRoutePaths(parkSection, tripPlan.getEndSection());