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:
joylink_zhangsai 2021-07-05 17:41:22 +08:00
parent 8099ee57e9
commit 35d6139ed6
3 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/club/joylink/rtss/simulation/cbtc/ATS/service/AtsTrainService.java
View File

@ -474,8 +474,16 @@ public class AtsTrainService {
log.error("地图[{}}]目的地码[{}]不存在", simulation.getBuildParams().getMap().getName(), destinationCode); log.error("地图[{}}]目的地码[{}]不存在", simulation.getBuildParams().getMap().getName(), destinationCode);
return; return;
} }
if (headSection.equals(destDefinition.getSection())) //列车已到达目的地区段 Section destSection = destDefinition.getSection();
return; if (headSection.equals(destSection)) { //列车已到达目的地区段
VirtualRealityTrain vrTrain = repository.getOnlineTrainBy(train.getGroupNumber());
if (vrTrain.isStopAtThePosition(new SectionPosition(destSection, destSection.getStopPointByDirection(trainRight)))) {
if (repository.getConfig().isSetManualWhenHeadTrainArriveTarget()) {
setManualTrain(simulation, vrTrain.getGroupNumber());
}
return;
}
}
if (targetSection != null) { if (targetSection != null) {
SectionPosition targetPosition = new SectionPosition(targetSection, targetSection.getStopPointByDirection(trainRight)); SectionPosition targetPosition = new SectionPosition(targetSection, targetSection.getStopPointByDirection(trainRight));
// TODO: 2021/5/28 这里列车越过目标停车点的判断逻辑不严谨，如果开过头并换端了，以此逻辑判断并不正确 // TODO: 2021/5/28 这里列车越过目标停车点的判断逻辑不严谨，如果开过头并换端了，以此逻辑判断并不正确

4
src/main/java/club/joylink/rtss/simulation/cbtc/data/map/MapConfig.java
View File

@ -210,6 +210,9 @@ public class MapConfig {
/** 转换轨进路只能通过故障解锁来取消 */ /** 转换轨进路只能通过故障解锁来取消 */
private boolean transferRouteCanOnlyFaultUnlock; private boolean transferRouteCanOnlyFaultUnlock;
/** 头码车抵达目的地后变为人工车 */
private boolean setManualWhenHeadTrainArriveTarget;
private Set<SimulationMember.Type> needConfirmConnectMembers = private Set<SimulationMember.Type> needConfirmConnectMembers =
Stream.of(DISPATCHER, STATION_SUPERVISOR, MAINTAINER, ELECTRIC_DISPATCHER).collect(Collectors.toSet()); Stream.of(DISPATCHER, STATION_SUPERVISOR, MAINTAINER, ELECTRIC_DISPATCHER).collect(Collectors.toSet());
@ -259,6 +262,7 @@ public class MapConfig {
setFiguresOfServiceNumber(configVO.getFiguresOfServiceNumber()); setFiguresOfServiceNumber(configVO.getFiguresOfServiceNumber());
setCheckDirectionWhenSetHead(configVO.isCheckDirectionWhenSetHead()); setCheckDirectionWhenSetHead(configVO.isCheckDirectionWhenSetHead());
setTransferRouteCanOnlyFaultUnlock(configVO.isTransferRouteCanOnlyFaultUnlock()); setTransferRouteCanOnlyFaultUnlock(configVO.isTransferRouteCanOnlyFaultUnlock());
setSetManualWhenHeadTrainArriveTarget(configVO.isSetManualWhenHeadTrainArriveTarget());
} }
} }

3
src/main/java/club/joylink/rtss/vo/map/RealLineConfigVO.java
View File

@ -199,6 +199,9 @@ public class RealLineConfigVO {
/** 转换轨进路只能通过故障解锁来取消 */ /** 转换轨进路只能通过故障解锁来取消 */
private boolean transferRouteCanOnlyFaultUnlock; private boolean transferRouteCanOnlyFaultUnlock;
/** 头码车抵达目的地后变为人工车 */
private boolean setManualWhenHeadTrainArriveTarget;
public static RealLineConfigVO parseJsonStr(String configData) { public static RealLineConfigVO parseJsonStr(String configData) {
if (StringUtils.hasText(configData)) { if (StringUtils.hasText(configData)) {
return JsonUtils.read(configData, RealLineConfigVO.class); return JsonUtils.read(configData, RealLineConfigVO.class);