mlx

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

@@ -377,14 +377,14 @@ public class SceneAccidentService {
         //2 根据场景名称查询出同名的所有场景id，包括公有和私有
         List<String> sceneIdList = sceneAccidentMapper.selectIdByName(sceneName);
         for (String sceneId : sceneIdList) {
-            //3 将所有场景测试包指标中的该场景删除
+            //3 将所有包含该场景的场景测试包状态为已禁用
+            scenePackageMapper.updateIsUnavailableByAccidentId("1", sceneId);
+            //4 将所有场景测试包指标中的该场景删除
             SceneDeleteParam param = new SceneDeleteParam();
             param.setModifyTime(TimeUtil.getNowForMysql());
             param.setSceneJtId(sceneId);
             param.setModifyUserId(AuthUtil.getCurrentUserId());
             scenePackageSublistMapper.updateScenePackageSublistById(param);
-            //4 将所有包含该场景的场景测试包状态为已禁用
-            scenePackageMapper.updateIsUnavailableByAccidentId("1", sceneId);
         }
         //5 将所有场景包中的该场景删除
         systemScenePackageSublistMapper.deleteBySceneName(sceneName);

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

@@ -358,14 +358,14 @@ public class SceneNaturalService {
         //2 根据场景名称查询出同名的所有场景id，包括公有和私有
         List<String> sceneIdList = sceneNaturalMapper.selectIdByName(sceneName);
         for (String sceneId : sceneIdList) {
+            //4 将所有包含该场景的场景测试包状态为已禁用
+            scenePackageMapper.updateIsUnavailableByNaturalId("1", sceneId);
             //3 将所有场景测试包指标中的该场景删除
             SceneDeleteParam param = new SceneDeleteParam();
             param.setModifyTime(TimeUtil.getNowForMysql());
             param.setSceneZrId(sceneId);
             param.setModifyUserId(AuthUtil.getCurrentUserId());
             scenePackageSublistMapper.updateScenePackageSublistById(param);
-            //4 将所有包含该场景的场景测试包状态为已禁用
-            scenePackageMapper.updateIsUnavailableByNaturalId("1", sceneId);
         }
         //5 将所有场景包中的该场景删除
         systemScenePackageSublistMapper.deleteBySceneName(sceneName);

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/service/StandardsRegulationsService.java

@@ -175,14 +175,15 @@ public class StandardsRegulationsService {
         //2 根据场景名称查询出同名的所有场景id，包括公有和私有
         List<String> sceneIdList = standardsRegulationsMapper.selectIdByName(sceneName);
         for (String sceneId : sceneIdList) {
+            //4 将所有包含该场景的场景测试包状态为已禁用
+            scenePackageMapper.updateIsUnavailableByStandardsId("1", sceneId);
             //3 将所有场景测试包指标中的该场景删除
             SceneDeleteParam param = new SceneDeleteParam();
             param.setModifyTime(TimeUtil.getNowForMysql());
             param.setSceneBzId(sceneId);
             param.setModifyUserId(AuthUtil.getCurrentUserId());
             scenePackageSublistMapper.updateScenePackageSublistById(param);
-            //4 将所有包含该场景的场景测试包状态为已禁用
-            scenePackageMapper.updateIsUnavailableByStandardsId("1", sceneId);
+
         }
         //5 将所有场景包中的该场景删除
         systemScenePackageSublistMapper.deleteBySceneName(sceneName);