diff --git a/pom.xml b/pom.xml index 13ec87ea6..0c1022f8b 100644 --- a/pom.xml +++ b/pom.xml @@ -149,19 +149,17 @@ ./src/main/resources/smart-doc.json - - 测试 - - - com.alibaba:fastjson - - - - - - com.alibaba:fastjson - + + + + + + + + + + diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/ATS/service/stage/AtsTrainStageHandler.java b/src/main/java/club/joylink/rtss/simulation/cbtc/ATS/service/stage/AtsTrainStageHandler.java index 4359c09b2..61f35e45a 100644 --- a/src/main/java/club/joylink/rtss/simulation/cbtc/ATS/service/stage/AtsTrainStageHandler.java +++ b/src/main/java/club/joylink/rtss/simulation/cbtc/ATS/service/stage/AtsTrainStageHandler.java @@ -5,8 +5,8 @@ import club.joylink.rtss.simulation.cbtc.ATS.service.AtsStandService; import club.joylink.rtss.simulation.cbtc.Simulation; import club.joylink.rtss.simulation.cbtc.constant.SimulationModule; import club.joylink.rtss.simulation.cbtc.data.SimulationDataRepository; -import club.joylink.rtss.simulation.cbtc.data.map.*; -import club.joylink.rtss.simulation.cbtc.data.support.RoutePath; +import club.joylink.rtss.simulation.cbtc.data.map.Section; +import club.joylink.rtss.simulation.cbtc.data.map.Stand; import club.joylink.rtss.simulation.cbtc.data.vo.TrainInfo; import club.joylink.rtss.simulation.cbtc.onboard.ATP.OnboardAtpApiService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/data/vo/TrainInfo.java b/src/main/java/club/joylink/rtss/simulation/cbtc/data/vo/TrainInfo.java index 83b8145b2..cda352f97 100644 --- a/src/main/java/club/joylink/rtss/simulation/cbtc/data/vo/TrainInfo.java +++ b/src/main/java/club/joylink/rtss/simulation/cbtc/data/vo/TrainInfo.java @@ -126,11 +126,6 @@ public class TrainInfo extends MapElement { */ private int ftbRemain; - /** - * 折返 - */ - private boolean turnBack; - /** * 优先排进路 */ @@ -557,11 +552,6 @@ public class TrainInfo extends MapElement { this.dt = 0; } - public void startTurnBack(Section endSection) { - this.turnBack = true; - this.planStandTrack = null; - } - public synchronized void change2HeadCode(String destinationCode, String serviceNumber, String tripNumber) { this.destinationCode = destinationCode; this.serviceNumber = serviceNumber; @@ -623,7 +613,6 @@ public class TrainInfo extends MapElement { } public void turnBackInit(Section lastRouteSection) { - this.turnBack = true; this.turnBackStatus = INIT; this.planStandTrack = null; this.planArriveTime = null; @@ -631,8 +620,11 @@ public class TrainInfo extends MapElement { // this.planStandTrack = lastRouteSection.getCode(); } + public boolean isTurnBack() { + return this.turnBackStatus != NON; + } + public void finishTurnBack() { - this.turnBack = false; this.turnBackStatus = NON; }