修改数据处理接口;修改大铁地图功能分组

This commit is contained in:
joylink_zhangsai 2023-01-11 10:47:12 +08:00
parent 90238254ee
commit 8fb8671300

View File

@ -237,10 +237,18 @@ public class RtsMapFunctionServiceImpl implements RtsMapFunctionService {
MapPrdTypeEnum prdType = MapPrdTypeEnum.getMapPrdTypeEnumByCode(mapSystem.getPrdType());
switch (prdType) {
case LOCAL:
supplier = getStationFunctionSupplier(mapSystem.getMapId(), systemNameSet, msgList, prefixMsg, simType, stationOptional);
if (Simulation.Type.METRO == simType) {
supplier = getStationFunctionSupplier(mapSystem.getMapId(), systemNameSet, msgList, prefixMsg, simType, stationOptional);
} else {
supplier = getRailStationFunctionSupplier(mapSystem.getMapId(), systemNameSet, msgList, prefixMsg, simType, stationOptional);
}
break;
case CENTER:
supplier = getDispatcherFunctionSupplier(mapId, systemNameSet, msgList, prefixMsg, simType, dispatcherOptional);
if (Simulation.Type.METRO == simType) {
supplier = getDispatcherFunctionSupplier(mapId, systemNameSet, msgList, prefixMsg, simType, dispatcherOptional);
} else {
supplier = getRailDispatcherFunctionSupplier(mapId, systemNameSet, msgList, prefixMsg, simType, dispatcherOptional);
}
break;
case JOINT:
supplier = getJointFunctionSupplier(mapId, systemNameSet, msgList, prefixMsg, simType, dispatcherOptional);
@ -552,7 +560,6 @@ public class RtsMapFunctionServiceImpl implements RtsMapFunctionService {
private Supplier<RtsMapFunctionCreateVO> getDispatcherFunctionSupplier(long mapId, Set<String> systemNameSet, List<String> msgList, String msgPrefix,
Simulation.Type simType, Optional<MapMemberVO> dispatcherOptional) {
//ATS行调工作站
return () -> {
String name = "调度仿真";
String desc = "模拟真实行车调度员岗位的操作系统,用于调度员完成调度和运营作业。调度员通过调度终端屏幕," +
@ -615,7 +622,6 @@ public class RtsMapFunctionServiceImpl implements RtsMapFunctionService {
private Supplier<RtsMapFunctionCreateVO> getRailStationFunctionSupplier(long mapId, Set<String> systemNameSet, List<String> msgList, String msgPrefix,
Simulation.Type simType, Optional<MapMemberVO> stationSupervisorOptional) {
//车站
return () -> {
String name = "车站";
String desc = "模拟列车值班员工作站,用于完成铁路运输接发列车工作、铁路运输行车指挥协调、组织管理。仿真包括:联锁操作终端、车务终端、车务管理终端等终端。";
@ -634,13 +640,12 @@ public class RtsMapFunctionServiceImpl implements RtsMapFunctionService {
.build();
Map<SimulationWorkParamVO.Item, String> itemMap = new HashMap<>();
itemMap.put(SimulationWorkParamVO.Item.DEFAULT_MEMBER, stationSupervisorOptional.get().getId());
return buildCreateVO(mapId, name, desc, simType, null, itemMap, domConfig);
return buildCreateVO(mapId, name, desc, simType, Group.SIMULATION, itemMap, domConfig);
};
}
private Supplier<RtsMapFunctionCreateVO> getRailDispatcherFunctionSupplier(long mapId, Set<String> systemNameSet, List<String> msgList, String msgPrefix,
Simulation.Type simType, Optional<MapMemberVO> dispatcherOptional) {
//调度台
return () -> {
String name = "调度台";
String desc = "模拟列车调度员工作站,具有运行计划的管理、阶段计划下达、调度命令下达等功能。";
@ -659,7 +664,7 @@ public class RtsMapFunctionServiceImpl implements RtsMapFunctionService {
.build();
Map<SimulationWorkParamVO.Item, String> itemMap = new HashMap<>();
itemMap.put(SimulationWorkParamVO.Item.DEFAULT_MEMBER, dispatcherOptional.get().getId());
return buildCreateVO(mapId, name, desc, simType, null, itemMap, domConfig);
return buildCreateVO(mapId, name, desc, simType, Group.SIMULATION, itemMap, domConfig);
};
}