Merge remote-tracking branch 'origin/test' into test

2021-02-03 18:35:32 +08:00 · 2021-02-03 18:35:32 +08:00 · cc9aba942c
commit cc9aba942c
parent ee2922f84a 54c5ec595c
1 changed files with 3 additions and 0 deletions
--- a/src/main/java/club/joylink/rtss/simulation/cbtc/ATS/AtsApiServiceImpl.java
+++ b/src/main/java/club/joylink/rtss/simulation/cbtc/ATS/AtsApiServiceImpl.java
@ -40,6 +40,9 @@ public class AtsApiServiceImpl implements AtsApiService {
        TrainInfo train = repository.findSupervisedTrainByGroup(stopMessage.getGroupNumber());
        Section section = stopMessage.getSection();
        Station station = section.getStation();
+        if (train == null || station == null) {
+            return;
+        }
        if (train.isParking() && Objects.equals(train.getStationCode(), station.getCode())) {
            // 已经处理过
            return;