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

ZC非通信车占用移动授权逻辑bug修改

Browse Source
This commit is contained in:
walker-sheng 2021-01-28 19:08:40 +08:00
parent a89d0735f7
commit 917705eea8
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/club/joylink/rtss/simulation/cbtc/ATP/ground/ZCLogicLoop.java
View File

@ -172,9 +172,12 @@ public class ZCLogicLoop {
break; break;
} }
//非通信车占用区段 //非通信车占用区段
if (temp.isNonCbtcOccupy() && !temp.isSwitchTrack()) { if (temp.isNonCbtcOccupy()) {
deviceEnd = new MovementAuthority.End(section, SectionPosition headPosition1 = train.getHeadPosition();
MovementAuthority.EndType.NCT_OCCUPIED_IN_FRONT_OF_SECTION); if (!temp.isSamePhysical(headPosition1.getSection().getCode())) {
deviceEnd = new MovementAuthority.End(section,
MovementAuthority.EndType.NCT_OCCUPIED_IN_FRONT_OF_SECTION);
}
break; break;
} }
section = temp; section = temp;

2
src/main/java/club/joylink/rtss/simulation/cbtc/SimulationMainThread.java
View File

@ -669,7 +669,7 @@ public class SimulationMainThread {
Set<String> users = simulation.getSimulationUserIds(); Set<String> users = simulation.getSimulationUserIds();
SocketMessageVO<Boolean> message = SocketMessageFactory.build( SocketMessageVO<Boolean> message = SocketMessageFactory.build(
WebSocketMessageType.Simulation_Reset, WebSocketMessageType.Simulation_Reset,
simulation.getGroup(), false); simulation.getGroup(), true);
this.stompMessageService.sendToUser(users, message); this.stompMessageService.sendToUser(users, message);
} }

5
src/main/java/club/joylink/rtss/simulation/cbtc/data/support/MovementAuthority.java
View File

@ -42,7 +42,10 @@ public class MovementAuthority {
} }
public String debugStr() { public String debugStr() {
return String.format("移动授权终点[类型:%s|位置:%s]", end.type, end.getEndPosition()); return String.format("移动授权终点[类型:%s|设备:%s|baseSection:%s|位置:%s]", end.type,
end.device.debugStr(),
end.baseSection != null ? end.baseSection.debugStr() : "null",
end.getEndPosition());
} }
@Getter @Getter