mlx

api-common/src/main/java/api/common/pojo/param/system/SceneImportParam.java

@@ -0,0 +1,5 @@
+package api.common.pojo.param.system;
+
+public class SceneImportParam {
+    private String id;  //任务id
+}

api-common/src/main/java/api/common/pojo/po/system/SceneImportPO.java

@@ -3,14 +3,16 @@ package api.common.pojo.po.system;
 import api.common.pojo.common.CommonPO;
 import lombok.*;
 
+import java.io.Serializable;
 import java.util.List;
 
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 @Data
+@Getter
 @AllArgsConstructor
 @NoArgsConstructor
-public class SceneImportPO extends CommonPO {
+public class SceneImportPO extends CommonPO implements Serializable {
 
     private String id;  //任务id
     private List<String> idList;  //任务id

simulation-resource-server/src/main/java/com/css/simulation/resource/system/mapper/SceneImportMapper.java

@@ -20,47 +20,41 @@ public interface SceneImportMapper {
     void update(SceneImportPO po);
 
     void updateStatus(SceneImportPO po);
+
     void updateInfo(SceneImportPO po);
 
     SceneImportPO querySceneImportByTaskId(String id);
-    void deleteImportTask(SceneImportPO po);
 
-    @Delete("")
-    void deleteSceneByTaskId(String taskId);
-
-    @Select("select scene_type\n" +
-            "from scene_import_task\n" +
-            "where id = #{taskId}")
-    String selectSceneTypeByTaskId(@Param("taskId") String taskId);
+    void deleteImportTask(SceneImportPO po);
 
     @Update("update scene_natural\n" +
             "set is_deleted = '1',\n" +
-            "    modify_user_id = '#{po.modifyUseId}',\n" +
-            "    modify_time = '#{po.modifyTime}'\n" +
+            "    modify_user_id = #{po.modifyUserId},\n" +
+            "    modify_time = #{po.modifyTime}\n" +
             "where natural_name in (select scene_names\n" +
             "                       from scene_import_task\n" +
-            "                       where id = '#{po.taskId}'\n" +
+            "                       where id = #{po.id}\n" +
             ")")
-    void deleteNaturalByTaskId(@Param("po")SceneImportPO sceneImportPO);
+    void deleteNaturalByTaskId(@Param("po") SceneImportPO sceneImportPO);
 
     @Update("update scene_standards_regulations\n" +
             "set is_deleted = '1',\n" +
-            "    modify_user_id = '#{po.modifyUseId}',\n" +
-            "    modify_time = '#{po.modifyTime}'\n" +
+            "    modify_user_id = #{po.modifyUserId},\n" +
+            "    modify_time = #{po.modifyTime}\n" +
             "where scene_name in (select scene_names\n" +
             "                       from scene_import_task\n" +
-            "                       where id = '#{po.taskId}'\n" +
+            "                       where id = #{po.id}\n" +
             ")")
-    void deleteStandardsByTaskId(@Param("po")SceneImportPO sceneImportPO);
+    void deleteStandardsByTaskId(@Param("po") SceneImportPO sceneImportPO);
 
     @Update("update scene_accident\n" +
             "set is_deleted = '1',\n" +
-            "    modify_user_id = '#{po.modifyUseId}',\n" +
-            "    modify_time = '#{po.modifyTime}'\n" +
+            "    modify_user_id = #{po.modifyUserId},\n" +
+            "    modify_time = #{po.modifyTime}\n" +
             "where scene_name in (select scene_names\n" +
             "                       from scene_import_task\n" +
-            "                       where id = '#{po.taskId}'\n" +
+            "                       where id = #{po.id}\n" +
             ")")
-    void deleteAccidentByTaskId(@Param("po")SceneImportPO sceneImportPO);
+    void deleteAccidentByTaskId(@Param("po") SceneImportPO sceneImportPO);
 
 }

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

@@ -117,43 +117,43 @@ public class SceneImportService {
         String sceneType = sceneImportPO.getSceneType();
         //获取场景id的list集合
         String sceneNames = sceneImportPO.getSceneNames();
-        if(ObjectUtil.isNull(sceneNames)){
+        if (ObjectUtil.isNull(sceneNames)) {
             sceneImportMapper.deleteImportTask(sceneImportPO);
-        }else{
-        String[] listIds = sceneNames.split(",");
-        //2 根据任务id删除相关联的所有同名任务
-        if (DictConstants.SCENE_NATURAL.equals(sceneType)) {
-            sceneImportMapper.deleteNaturalByTaskId(sceneImportPO);
-            SceneNaturalPO sceneNaturalPO = new SceneNaturalPO();
-            for (String id : listIds) {
-                sceneNaturalPO.setNaturalName(id);
-                sceneNaturalService.deleteSceneNatural(sceneNaturalPO);
-            }
-        } else if (DictConstants.SCENE_STANDARD.equals(sceneType)) {
-            sceneImportMapper.deleteStandardsByTaskId(sceneImportPO);
-            StandardsRegulationsPO standardsRegulationsPO = new StandardsRegulationsPO();
-            for (String id : listIds) {
-                standardsRegulationsPO.setSceneName(id);
-                standardsRegulationsService.deleteStandardsRegulations(standardsRegulationsPO);
-            }
-        } else if (DictConstants.SCENE_ACCIDENT.equals(sceneType)) {
-            sceneImportMapper.deleteAccidentByTaskId(sceneImportPO);
-            SceneAccidentPO sceneAccidentPO = new SceneAccidentPO();
-            for (String id : listIds) {
-                sceneAccidentPO.setSceneName(id);
-                sceneAccidentService.deleteSceneAccidentList(sceneAccidentPO);
-            }
-        } else if (DictConstants.SCENE_GENERAL.equals(sceneType)) {
+        } else {
+            String[] listIds = sceneNames.split(",");
+            //2 根据任务id删除相关联的所有同名任务
+            if (DictConstants.SCENE_NATURAL.equals(sceneType)) {
+                sceneImportMapper.deleteNaturalByTaskId(sceneImportPO);
+                SceneNaturalPO sceneNaturalPO = new SceneNaturalPO();
+                for (String id : listIds) {
+                    sceneNaturalPO.setNaturalName(id);
+                    sceneNaturalService.deleteSceneNatural(sceneNaturalPO);
+                }
+            } else if (DictConstants.SCENE_STANDARD.equals(sceneType)) {
+                sceneImportMapper.deleteStandardsByTaskId(sceneImportPO);
+                StandardsRegulationsPO standardsRegulationsPO = new StandardsRegulationsPO();
+                for (String id : listIds) {
+                    standardsRegulationsPO.setSceneName(id);
+                    standardsRegulationsService.deleteStandardsRegulations(standardsRegulationsPO);
+                }
+            } else if (DictConstants.SCENE_ACCIDENT.equals(sceneType)) {
+                sceneImportMapper.deleteAccidentByTaskId(sceneImportPO);
+                SceneAccidentPO sceneAccidentPO = new SceneAccidentPO();
+                for (String id : listIds) {
+                    sceneAccidentPO.setSceneName(id);
+                    sceneAccidentService.deleteSceneAccidentList(sceneAccidentPO);
+                }
+            } else if (DictConstants.SCENE_GENERAL.equals(sceneType)) {
 //            sceneImportMapper.deleteNaturalByTaskId(sceneImportPO);
-            sceneImportMapper.deleteImportTask(sceneImportPO);
-            SceneGeneralTemplatePO po = new SceneGeneralTemplatePO();
-            for (String id : listIds) {
-                po.setSceneId(id);
-                sceneGeneralTemplateService.deleteSceneGeneralTemplateById(po);
+                sceneImportMapper.deleteImportTask(sceneImportPO);
+                SceneGeneralTemplatePO po = new SceneGeneralTemplatePO();
+                for (String id : listIds) {
+                    po.setSceneId(id);
+                    sceneGeneralTemplateService.deleteSceneGeneralTemplateById(po);
+                }
+            } else {
+                throw new RuntimeException("场景类型错误：" + sceneType);
             }
-        } else {
-            throw new RuntimeException("场景类型错误：" + sceneType);
-        }
         }
     }
 }