commit

simulation-resource-server/src/main/java/com/css/simulation/resource/server/app/service/SceneAccidentService.java

@@ -448,6 +448,12 @@ public class SceneAccidentService {
                 if (StringUtil.isNotEmpty(sceneGeneralizationIdsString)) {
                     sceneGeneralizationIds = CollectionUtil.sequenceStringToList(sceneGeneralizationIdsString, ",");
                 }
+                final String sceneReferenceLibIds = index.getSceneReferenceLibIds();
+                List<String> sceneReferenceLibIdList = new ArrayList<>();
+                if (StringUtil.isNotEmpty(sceneReferenceLibIds)) {
+                    sceneReferenceLibIdList = CollectionUtil.sequenceStringToList(sceneReferenceLibIds, ",");
+                }
+
                 final Iterator<String> iterator = sceneTrafficIds.iterator();
                 while (iterator.hasNext()) {
                     final String sceneId = iterator.next();
@@ -459,8 +465,8 @@ public class SceneAccidentService {
                         });
                     }
                 }
-//                index.setSceneNum(sceneNaturalIds.size() + sceneTrafficIds.size() + sceneStatueIds.size() + sceneGeneralizationIds.size());
-                index.setSceneNum(index.getSceneNum() - deleteNum.get());
+                index.setSceneNum(sceneNaturalIds.size() + sceneTrafficIds.size() + sceneStatueIds.size() + sceneGeneralizationIds.size() + sceneReferenceLibIdList.size());
+//                index.setSceneNum(index.getSceneNum() - deleteNum.get());
                 index.setSceneNaturalIds(CollectionUtil.listToSequence(sceneNaturalIds));
                 index.setModifyTime(TimeUtil.getNowForMysql());
                 index.setModifyUserId(AuthUtil.getCurrentUserId());

simulation-resource-server/src/main/java/com/css/simulation/resource/server/app/service/SceneImportService.java

@@ -40,6 +40,8 @@ public class SceneImportService {
     @Resource
     private SceneAccidentService sceneAccidentService;
     @Resource
+    private SceneReferenceLibService sceneReferenceLibService;
+    @Resource
     private SceneGeneralTemplateService sceneGeneralTemplateService;
 
     public SceneImportPO saveTask(SceneImportPO po) {
@@ -111,7 +113,7 @@ public class SceneImportService {
         String sceneNameSequenceString = sceneImportPO.getSceneNames(); // 场景名称
         sceneImportMapper.deleteImportTask(sceneImportPO);
         if (StringUtil.isNotEmpty(sceneNameSequenceString)) {
-             List<String> sceneNames = CollectionUtil.sequenceStringToList(sceneNameSequenceString, ",");
+            List<String> sceneNames = CollectionUtil.sequenceStringToList(sceneNameSequenceString, ",");
             //2 根据任务id删除相关联的所有同名任务
             if (DictConstants.SCENE_NATURAL.equals(sceneType)) {
                 sceneNaturalService.deleteSceneNatural(sceneNames);
@@ -119,6 +121,8 @@ public class SceneImportService {
                 sceneStandardsService.deleteStandardsRegulations(sceneNames);
             } else if (DictConstants.SCENE_ACCIDENT.equals(sceneType)) {
                 sceneAccidentService.deleteSceneAccidentList(sceneNames);
+            } else if (DictConstants.SCENE_REFERENCE_LIB.equals(sceneType)) {
+                sceneReferenceLibService.batchDeleteSceneReference(sceneNames);
             } else if (DictConstants.SCENE_GENERAL.equals(sceneType)) {
                 SceneGeneralTemplatePO po = new SceneGeneralTemplatePO();
                 for (String id : sceneNames) {

simulation-resource-server/src/main/java/com/css/simulation/resource/server/app/service/SceneNaturalService.java

@@ -437,6 +437,12 @@ public class SceneNaturalService {
                 if (api.common.util.StringUtil.isNotEmpty(sceneGeneralizationIdsString)) {
                     sceneGeneralizationIds = CollectionUtil.sequenceStringToList(sceneGeneralizationIdsString, ",");
                 }
+                final String sceneReferenceLibIds = index.getSceneReferenceLibIds();
+                List<String> sceneReferenceLibIdList = new ArrayList<>();
+                if (api.common.util.StringUtil.isNotEmpty(sceneReferenceLibIds)) {
+                    sceneReferenceLibIdList = CollectionUtil.sequenceStringToList(sceneReferenceLibIds, ",");
+                }
+
                 final Iterator<String> iterator = sceneNaturalIds.iterator();
                 while (iterator.hasNext()) {
                     final String sceneId = iterator.next();
@@ -448,7 +454,8 @@ public class SceneNaturalService {
                         });
                     }
                 }
-                index.setSceneNum(index.getSceneNum() - deleteNum.get());
+                index.setSceneNum(sceneNaturalIds.size() + sceneTrafficIds.size() + sceneStatueIds.size() + sceneGeneralizationIds.size() + sceneReferenceLibIdList.size());
+//                index.setSceneNum(index.getSceneNum() - deleteNum.get());
                 index.setSceneNaturalIds(CollectionUtil.listToSequence(sceneNaturalIds));
                 index.setModifyTime(TimeUtil.getNowForMysql());
                 index.setModifyUserId(AuthUtil.getCurrentUserId());

simulation-resource-server/src/main/java/com/css/simulation/resource/server/app/service/SceneReferenceLibService.java

@@ -456,9 +456,9 @@ public class SceneReferenceLibService {
                         );
                     }
                 }
-//                index.setSceneNum(sceneReferenceLibIds.size() + sceneNaturalIds.size() + sceneTrafficIds.size() +
-//                        sceneStatueIds.size() + sceneGeneralizationIds.size());
-                index.setSceneNum(index.getSceneNum() - deleteNum.get());
+                index.setSceneNum(sceneReferenceLibIds.size() + sceneNaturalIds.size() + sceneTrafficIds.size() +
+                        sceneStatueIds.size() + sceneGeneralizationIds.size());
+//                index.setSceneNum(index.getSceneNum() - deleteNum.get());
                 index.setSceneReferenceLibIds(CollectionUtil.listToSequence(sceneReferenceLibIds));
                 index.setModifyTime(TimeUtil.getNowForMysql());
                 index.setModifyUserId(AuthUtil.getCurrentUserId());

simulation-resource-server/src/main/java/com/css/simulation/resource/server/app/service/SceneStandardsService.java

@@ -248,6 +248,11 @@ public class SceneStandardsService {
                 if (StringUtil.isNotEmpty(sceneGeneralizationIdsString)) {
                     sceneGeneralizationIds = CollectionUtil.sequenceStringToList(sceneGeneralizationIdsString, ",");
                 }
+                final String sceneReferenceLibIds = index.getSceneReferenceLibIds();
+                List<String> sceneReferenceLibIdList = new ArrayList<>();
+                if (StringUtil.isNotEmpty(sceneReferenceLibIds)) {
+                    sceneReferenceLibIdList = CollectionUtil.sequenceStringToList(sceneReferenceLibIds, ",");
+                }
                 final Iterator<String> iterator = sceneStatueIds.iterator();
                 while (iterator.hasNext()) {
                     final String sceneId = iterator.next();
@@ -257,8 +262,8 @@ public class SceneStandardsService {
                         testPackages.forEach(testPackage -> testPackage.setSceneNum(testPackage.getSceneNum() - 1));
                     }
                 }
-//                index.setSceneNum(sceneNaturalIds.size() + sceneTrafficIds.size() + sceneStatueIds.size() + sceneGeneralizationIds.size());
-                index.setSceneNum(index.getSceneNum() - deleteNum.get());
+                index.setSceneNum(sceneNaturalIds.size() + sceneTrafficIds.size() + sceneStatueIds.size() + sceneGeneralizationIds.size() + sceneReferenceLibIdList.size());
+//                index.setSceneNum(index.getSceneNum() - deleteNum.get());
                 index.setSceneNaturalIds(CollectionUtil.listToSequence(sceneNaturalIds));
                 index.setModifyTime(TimeUtil.getNowForMysql());
                 index.setModifyUserId(AuthUtil.getCurrentUserId());