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

MapSystem->RtsMapFunction修改

Browse Source
This commit is contained in:
joylink_zhangsai 2022-12-01 10:57:45 +08:00
parent 13a7f01a77
commit 993c081dbd
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/club/joylink/rtss/services/mapFunction/RtsMapFunctionServiceImpl.java
View File

@ -251,10 +251,10 @@ public class RtsMapFunctionServiceImpl implements RtsMapFunctionService {
supplier = getSchedulingFunctionSupplier(mapId, systemNameSet, msgList, prefixMsg, simType, dispatcherOptional); supplier = getSchedulingFunctionSupplier(mapId, systemNameSet, msgList, prefixMsg, simType, dispatcherOptional);
break; break;
case ISCS: case ISCS:
supplier = getIscsFunctionSupplier(mapId, systemNameSet, msgList, prefixMsg, simType, dispatcherOptional); supplier = () -> null;
break; break;
case BIG_SCREEN: case BIG_SCREEN:
supplier = getBigScreenFunctionSupplier(mapId, systemNameSet, msgList, simType); supplier = () -> null;
break; break;
case RUN_PLAN_MAKE: case RUN_PLAN_MAKE:
supplier = getRunPlanDesignFunctionSupplier(mapId, systemNameSet, msgList, simType); supplier = getRunPlanDesignFunctionSupplier(mapId, systemNameSet, msgList, simType);
@ -279,10 +279,6 @@ public class RtsMapFunctionServiceImpl implements RtsMapFunctionService {
if (rtsMapFunctionCreateVO != null) { if (rtsMapFunctionCreateVO != null) {
create(rtsMapFunctionCreateVO, 1); create(rtsMapFunctionCreateVO, 1);
} }
rtsMapFunctionCreateVO = getSceneTrainingFunctionSupplier(mapId, systemNameSet, msgList, simType).get();
if (rtsMapFunctionCreateVO != null) {
create(rtsMapFunctionCreateVO, 1);
}
} }
} else if (mapSystem.getType().equals("Exam")) { } else if (mapSystem.getType().equals("Exam")) {
if (!hasExam) { if (!hasExam) {
@ -446,7 +442,7 @@ public class RtsMapFunctionServiceImpl implements RtsMapFunctionService {
private Supplier<RtsMapFunctionCreateVO> getDriverFunctionSupplier(long mapId, Set<String> systemNameSet, List<String> msgList, String msgPrefix, private Supplier<RtsMapFunctionCreateVO> getDriverFunctionSupplier(long mapId, Set<String> systemNameSet, List<String> msgList, String msgPrefix,
Simulation.Type simType, List<MapMemberVO> mapMemberVOS) { Simulation.Type simType, List<MapMemberVO> mapMemberVOS) {
return () -> { return () -> {
String name = "司机仿真"; String name = "模拟驾驶";
if (systemNameSet.contains(name)) { if (systemNameSet.contains(name)) {
msgList.add(String.format("%s已存在，不生成", name)); msgList.add(String.format("%s已存在，不生成", name));
return null; return null;
@ -472,7 +468,7 @@ public class RtsMapFunctionServiceImpl implements RtsMapFunctionService {
Simulation.Type simType, Optional<MapMemberVO> stationSupervisorOptional) { Simulation.Type simType, Optional<MapMemberVO> stationSupervisorOptional) {
//ATS现地工作站 //ATS现地工作站
return () -> { return () -> {
String name = "行值仿真"; String name = "车站仿真";
if (systemNameSet.contains(name)) { if (systemNameSet.contains(name)) {
msgList.add(String.format("%s已存在，不生成", name)); msgList.add(String.format("%s已存在，不生成", name));
return null; return null;
@ -495,7 +491,7 @@ public class RtsMapFunctionServiceImpl implements RtsMapFunctionService {
Simulation.Type simType, Optional<MapMemberVO> dispatcherOptional) { Simulation.Type simType, Optional<MapMemberVO> dispatcherOptional) {
//ATS行调工作站 //ATS行调工作站
return () -> { return () -> {
String name = "行调仿真"; String name = "调度仿真";
if (systemNameSet.contains(name)) { if (systemNameSet.contains(name)) {
msgList.add(String.format("%s已存在，不生成", name)); msgList.add(String.format("%s已存在，不生成", name));
return null; return null;