From 1a223feef68c64c4bdc2f3c94cf80ba6f0e1682f Mon Sep 17 00:00:00 2001
From: Jade <yuanqi@joylink.club>
Date: Tue, 7 Sep 2021 15:06:12 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=8F=B8=E6=9C=BA=E9=A9=BE=E9=A9=B6=20?=
 =?UTF-8?q?=E9=97=A8=E6=A8=A1=E5=BC=8F=E3=80=81=E9=97=A8=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../joylink/rtss/simulation/cbtc/onboard/ATP/ATPLogicLoop.java | 3 +++
 .../joylink/rtss/simulation/cbtc/onboard/ATP/ATPService.java   | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/onboard/ATP/ATPLogicLoop.java b/src/main/java/club/joylink/rtss/simulation/cbtc/onboard/ATP/ATPLogicLoop.java
index b5b915f8f..336d63e7a 100644
--- a/src/main/java/club/joylink/rtss/simulation/cbtc/onboard/ATP/ATPLogicLoop.java
+++ b/src/main/java/club/joylink/rtss/simulation/cbtc/onboard/ATP/ATPLogicLoop.java
@@ -318,6 +318,9 @@ public class ATPLogicLoop {
 //                    }
                 // 可以关门
 //                this.atoService.syncCloseDoor(simulation, train);
+                if (train.getDoorMode().equals(VirtualRealityTrain.DoorMode.AA)) { // 自动关门
+                    this.atoService.syncCloseDoor(simulation, train);
+                }
                 if (this.isAllDoorClose(simulation, train)) {
                     train.nextParkedTrainActivity();
                 }
diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/onboard/ATP/ATPService.java b/src/main/java/club/joylink/rtss/simulation/cbtc/onboard/ATP/ATPService.java
index 3f55cd295..be14dc358 100644
--- a/src/main/java/club/joylink/rtss/simulation/cbtc/onboard/ATP/ATPService.java
+++ b/src/main/java/club/joylink/rtss/simulation/cbtc/onboard/ATP/ATPService.java
@@ -293,7 +293,7 @@ public class ATPService {
             log.warn(String.format("列车[%s]未停止，不能操作车门", train.getGroupNumber()));
             return;
         }
-        if (!train.getDoorMode().isAuto(right)) {
+        if (!train.getDoorMode().isAuto(open)) {
             log.warn(String.format("列车[%s]门模式自动，不能操作车门", train.getGroupNumber()));
             return;
         }

From 1f9d75a28d59f81f52a2e1eda8378cfca345e206 Mon Sep 17 00:00:00 2001
From: Jade <yuanqi@joylink.club>
Date: Tue, 7 Sep 2021 15:49:07 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=8C=89=E8=AE=A1=E5=88=92=E8=A1=8C?=
 =?UTF-8?q?=E8=BD=A6=E5=88=97=E8=BD=A6=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../rtss/simulation/cbtc/ATS/service/AtsTrainLoadService.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/ATS/service/AtsTrainLoadService.java b/src/main/java/club/joylink/rtss/simulation/cbtc/ATS/service/AtsTrainLoadService.java
index a503f16aa..c531c65ab 100644
--- a/src/main/java/club/joylink/rtss/simulation/cbtc/ATS/service/AtsTrainLoadService.java
+++ b/src/main/java/club/joylink/rtss/simulation/cbtc/ATS/service/AtsTrainLoadService.java
@@ -621,7 +621,7 @@ public class AtsTrainLoadService {
         SimulationDataRepository repository = simulation.getRepository();
         int loadedNum = 0;
         for (TrainLoadParam2 trainLoadParam2 : trainLoadList) {
-            if (loadedNum > num) {
+            if (loadedNum == num) {
                 break;
             }
             TripPlan tripPlan = trainLoadParam2.getTripPlan();

From 984c950da8b693a5138133f24ccf20c1c5f15e82 Mon Sep 17 00:00:00 2001
From: Jade <yuanqi@joylink.club>
Date: Tue, 7 Sep 2021 16:35:59 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=88=97=E8=BD=A6=E9=A9=BE=E9=A9=B6=20ATO?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../rtss/simulation/cbtc/onboard/ATP/ATPLogicLoop.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/onboard/ATP/ATPLogicLoop.java b/src/main/java/club/joylink/rtss/simulation/cbtc/onboard/ATP/ATPLogicLoop.java
index 336d63e7a..f711d7912 100644
--- a/src/main/java/club/joylink/rtss/simulation/cbtc/onboard/ATP/ATPLogicLoop.java
+++ b/src/main/java/club/joylink/rtss/simulation/cbtc/onboard/ATP/ATPLogicLoop.java
@@ -293,17 +293,17 @@ public class ATPLogicLoop {
         switch (activity) {
             case PARK: // 停靠
                 train.nextParkedTrainActivity();
+                if (train.isAtoOn()) {
+                    atoService.closeATO(train);
+                    train.setAutoOpenATO(true);
+                }
                 break;
             case OPEN_DOOR: // 开门
-                if (train.isAtoOn() && !train.getDoorMode().equals(VirtualRealityTrain.DoorMode.MM)) { // 不是自动开门
+                if (!train.getDoorMode().equals(VirtualRealityTrain.DoorMode.MM)) { // 不是自动开门
                     this.atoService.syncOpenDoor(simulation, train);
                 }
                 if (this.isAllDoorOpen(simulation, train)) {
                     train.nextParkedTrainActivity();
-                    if (train.isAtoOn()) {
-                        atoService.closeATO(train);
-                        train.setAutoOpenATO(true);
-                    }
                 }
                 break;
             case BOARD: // 乘客乘降