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:
joylink_zhangsai 2023-01-10 09:17:53 +08:00
parent fe68e825a5
commit cb02486a7b
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() {
OrgExample orgExample = new OrgExample();
orgExample.createCriteria().andNameEqualTo("默认组织");
if (orgDAO.countByExample(orgExample) != 0) {
return;
}
Org org = new Org();
org.setName("默认组织");
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);
break;
case DEPOT_IL:
// supplier = getDepotILFunctionSupplier(mapId, systemNameSet, msgList, prefixMsg, simType, mapMemberVOS);
supplier = () -> null;
supplier = getDepotILFunctionSupplier(mapId, systemNameSet, msgList, prefixMsg, simType, mapMemberVOS);
// supplier = () -> null;
break;
case YJDDZH:
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,
Simulation.Type simType, List<MapMemberVO> mapMemberVOS) {
return () -> {
String name = "车辆段联锁";
String name = "车辆段调度";
if (systemNameSet.contains(name)) {
msgList.add(String.format("%s已存在，不生成", name));
return null;