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

Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2

Browse Source
This commit is contained in:
weizhihong 2023-01-10 11:13:08 +08:00
commit 5900b906ca
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/club/joylink/rtss/controller/DataHandleController.java
View File

@ -86,6 +86,12 @@ public class DataHandleController {
} }
private void confirmDefaultOrgExist() { private void confirmDefaultOrgExist() {
OrgExample orgExample = new OrgExample();
orgExample.createCriteria().andNameEqualTo("默认组织");
if (orgDAO.countByExample(orgExample) != 0) {
return;
}
Org org = new Org(); Org org = new Org();
org.setName("默认组织"); org.setName("默认组织");
org.setProjectCode(Project.DEFAULT.name()); org.setProjectCode(Project.DEFAULT.name());

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

@ -261,8 +261,8 @@ public class RtsMapFunctionServiceImpl implements RtsMapFunctionService {
supplier = getRunPlanDesignFunctionSupplier(mapId, systemNameSet, msgList, simType); supplier = getRunPlanDesignFunctionSupplier(mapId, systemNameSet, msgList, simType);
break; break;
case DEPOT_IL: case DEPOT_IL:
// supplier = getDepotILFunctionSupplier(mapId, systemNameSet, msgList, prefixMsg, simType, mapMemberVOS); supplier = getDepotILFunctionSupplier(mapId, systemNameSet, msgList, prefixMsg, simType, mapMemberVOS);
supplier = () -> null; // supplier = () -> null;
break; break;
case YJDDZH: case YJDDZH:
supplier = getEmergencyFunctionSupplier(mapId, systemNameSet, msgList, Simulation.Type.EMERGENCY); supplier = getEmergencyFunctionSupplier(mapId, systemNameSet, msgList, Simulation.Type.EMERGENCY);
@ -704,7 +704,7 @@ public class RtsMapFunctionServiceImpl implements RtsMapFunctionService {
private Supplier<RtsMapFunctionCreateVO> getDepotILFunctionSupplier(long mapId, Set<String> systemNameSet, List<String> msgList, String msgPrefix, private Supplier<RtsMapFunctionCreateVO> getDepotILFunctionSupplier(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;