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:
weizhihong 2023-11-27 17:56:27 +08:00
parent 28c74a75cd
commit 700d95e4a7
3 changed files with 539 additions and 492 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1019
src/main/java/club/joylink/rtss/controller/simulation/SimulationV1Controller.java
View File

File diff suppressed because it is too large Load Diff

3
src/main/java/club/joylink/rtss/simulation/cbtc/data/SimulationDataRepository.java
View File

@ -310,6 +310,9 @@ public class SimulationDataRepository {
public MapElement getByCode(String code) { public MapElement getByCode(String code) {
MapElement mapElement = this.deviceMap.get(code); MapElement mapElement = this.deviceMap.get(code);
if (Objects.isNull(mapElement)) {
mapElement = this.vrDeviceMap.get(code);
}
if (Objects.isNull(mapElement)) { if (Objects.isNull(mapElement)) {
throw new SimulationException(SimulationExceptionType.System_Fault, throw new SimulationException(SimulationExceptionType.System_Fault,
String.format("地图数据异常：不存在code为[%s]的数据", code)); String.format("地图数据异常：不存在code为[%s]的数据", code));

9
src/main/java/club/joylink/rtss/simulation/cbtc/member/MemberManager.java
View File

@ -314,15 +314,18 @@ public class MemberManager {
} }
// 删除在原始数据中不存在的成员 // 删除在原始数据中不存在的成员
List<SimulationMember> members = simulation.getSimulationMembers(); List<SimulationMember> members = simulation.getSimulationMembers();
Map<String, SimulationMember> simMemberMap = new HashMap<>(members.size());
for (SimulationMember m : members) { for (SimulationMember m : members) {
if (!originMemberMap.containsKey(m.getId())) { simMemberMap.put(m.getId(), m);
simulation.removeSimulationMember(m.getId()); if (originMemberMap.containsKey(m.getId())) {
continue;
} }
simulation.removeSimulationMember(m.getId());
} }
// 加入额外的成员 // 加入额外的成员
if (!CollectionUtils.isEmpty(memberPOS)) { if (!CollectionUtils.isEmpty(memberPOS)) {
for (SimulationMemberPO p : memberPOS) { for (SimulationMemberPO p : memberPOS) {
if (originMemberMap.containsKey(p.getId())) { if (simMemberMap.containsKey(p.getId())) {
continue; continue;
} }
MapElement mapElement = null; MapElement mapElement = null;