joylink/rt-sim-training-service
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 10 Wiki Activity

删除无用字段和配置

Browse Source
This commit is contained in:
walker-sheng 2021-09-23 14:37:27 +08:00
parent 14735fb16e
commit 8ceba6ac01
3 changed files with 16 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pom.xml
View File

@ -149,19 +149,17 @@
<configuration> <configuration>
<!--指定生成文档的使用的配置文件,配置文件放在自己的项目中--> <!--指定生成文档的使用的配置文件,配置文件放在自己的项目中-->
<configFile>./src/main/resources/smart-doc.json</configFile> <configFile>./src/main/resources/smart-doc.json</configFile>
<!--指定项目名称-->
<projectName>测试</projectName>
<!--smart-doc实现自动分析依赖树加载第三方依赖的源码，如果一些框架依赖库加载不到导致报错，这时请使用excludes排除掉--> <!--smart-doc实现自动分析依赖树加载第三方依赖的源码，如果一些框架依赖库加载不到导致报错，这时请使用excludes排除掉-->
<excludes> <!-- <excludes>-->
<!--格式为：groupId:artifactId;参考如下--> <!-- &lt;!&ndash;格式为：groupId:artifactId;参考如下&ndash;&gt;-->
<exclude>com.alibaba:fastjson</exclude> <!-- <exclude>com.alibaba:fastjson</exclude>-->
</excludes> <!-- </excludes>-->
<!--自1.0.8版本开始，插件提供includes支持,配置了includes后插件会按照用户配置加载而不是自动加载，因此使用时需要注意--> <!-- &lt;!&ndash;自1.0.8版本开始，插件提供includes支持,配置了includes后插件会按照用户配置加载而不是自动加载，因此使用时需要注意&ndash;&gt;-->
<!--smart-doc能自动分析依赖树加载所有依赖源码，原则上会影响文档构建效率，因此你可以使用includes来让插件加载你配置的组件--> <!-- &lt;!&ndash;smart-doc能自动分析依赖树加载所有依赖源码，原则上会影响文档构建效率，因此你可以使用includes来让插件加载你配置的组件&ndash;&gt;-->
<includes> <!-- <includes>-->
<!--格式为：groupId:artifactId;参考如下--> <!-- &lt;!&ndash;格式为：groupId:artifactId;参考如下&ndash;&gt;-->
<include>com.alibaba:fastjson</include> <!-- <include>com.alibaba:fastjson</include>-->
</includes> <!-- </includes>-->
</configuration> </configuration>
<executions> <executions>
<execution> <execution>

4
src/main/java/club/joylink/rtss/simulation/cbtc/ATS/service/stage/AtsTrainStageHandler.java
View File

@ -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.Simulation;
import club.joylink.rtss.simulation.cbtc.constant.SimulationModule; import club.joylink.rtss.simulation.cbtc.constant.SimulationModule;
import club.joylink.rtss.simulation.cbtc.data.SimulationDataRepository; import club.joylink.rtss.simulation.cbtc.data.SimulationDataRepository;
import club.joylink.rtss.simulation.cbtc.data.map.*; import club.joylink.rtss.simulation.cbtc.data.map.Section;
import club.joylink.rtss.simulation.cbtc.data.support.RoutePath; import club.joylink.rtss.simulation.cbtc.data.map.Stand;
import club.joylink.rtss.simulation.cbtc.data.vo.TrainInfo; import club.joylink.rtss.simulation.cbtc.data.vo.TrainInfo;
import club.joylink.rtss.simulation.cbtc.onboard.ATP.OnboardAtpApiService; import club.joylink.rtss.simulation.cbtc.onboard.ATP.OnboardAtpApiService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;

16
src/main/java/club/joylink/rtss/simulation/cbtc/data/vo/TrainInfo.java
View File

@ -126,11 +126,6 @@ public class TrainInfo extends MapElement {
*/ */
private int ftbRemain; private int ftbRemain;
/**
* 折返
*/
private boolean turnBack;
/** /**
* 优先排进路 * 优先排进路
*/ */
@ -557,11 +552,6 @@ public class TrainInfo extends MapElement {
this.dt = 0; this.dt = 0;
} }
public void startTurnBack(Section endSection) {
this.turnBack = true;
this.planStandTrack = null;
}
public synchronized void change2HeadCode(String destinationCode, String serviceNumber, String tripNumber) { public synchronized void change2HeadCode(String destinationCode, String serviceNumber, String tripNumber) {
this.destinationCode = destinationCode; this.destinationCode = destinationCode;
this.serviceNumber = serviceNumber; this.serviceNumber = serviceNumber;
@ -623,7 +613,6 @@ public class TrainInfo extends MapElement {
} }
public void turnBackInit(Section lastRouteSection) { public void turnBackInit(Section lastRouteSection) {
this.turnBack = true;
this.turnBackStatus = INIT; this.turnBackStatus = INIT;
this.planStandTrack = null; this.planStandTrack = null;
this.planArriveTime = null; this.planArriveTime = null;
@ -631,8 +620,11 @@ public class TrainInfo extends MapElement {
// this.planStandTrack = lastRouteSection.getCode(); // this.planStandTrack = lastRouteSection.getCode();
} }
public boolean isTurnBack() {
return this.turnBackStatus != NON;
}
public void finishTurnBack() { public void finishTurnBack() {
this.turnBack = false;
this.turnBackStatus = NON; this.turnBackStatus = NON;
} }