root vor 2 Jahren
Ursprung
Commit
c4eba07efd

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

@@ -3,7 +3,10 @@ package com.css.simulation.resource.system.service;
 import api.common.pojo.constants.DictConstants;
 import api.common.pojo.constants.LogConstants;
 import api.common.pojo.param.system.SceneImportPageParam;
+import api.common.pojo.po.scene.SceneAccidentPO;
 import api.common.pojo.po.scene.SceneGeneralTemplatePO;
+import api.common.pojo.po.scene.SceneNaturalPO;
+import api.common.pojo.po.scene.StandardsRegulationsPO;
 import api.common.pojo.po.system.SceneImportPO;
 import api.common.util.ObjectUtil;
 import api.common.util.StringUtil;
@@ -12,14 +15,16 @@ import com.css.simulation.resource.common.utils.AuthUtil;
 import com.css.simulation.resource.common.utils.PageUtil;
 import com.css.simulation.resource.common.utils.PoUtil;
 import com.css.simulation.resource.log.service.LogService;
+import com.css.simulation.resource.scene.service.SceneAccidentService;
 import com.css.simulation.resource.scene.service.SceneGeneralTemplateService;
+import com.css.simulation.resource.scene.service.SceneNaturalService;
+import com.css.simulation.resource.scene.service.StandardsRegulationsService;
 import com.css.simulation.resource.system.mapper.SceneImportMapper;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -28,13 +33,20 @@ import java.util.Map;
 public class SceneImportService {
 
     @Resource
-    DictService dictService;
+    private DictService dictService;
     @Resource
-    LogService logService;
+    private LogService logService;
     @Resource
-    SceneImportMapper sceneImportMapper;
+    private SceneImportMapper sceneImportMapper;
     @Resource
-    SceneGeneralTemplateService sceneGeneralTemplateService;
+    private SceneNaturalService sceneNaturalService;
+    @Resource
+    private StandardsRegulationsService standardsRegulationsService;
+    @Resource
+    private SceneAccidentService sceneAccidentService;
+    @Resource
+    private SceneGeneralTemplateService sceneGeneralTemplateService;
+
 
     public SceneImportPO saveTask(SceneImportPO po) {
         // 名称校验
@@ -95,30 +107,45 @@ public class SceneImportService {
 
     public void deleteTask(String taskId) {
         //1 根据任务 id 查询场景类型
-       // String sceneType = sceneImportMapper.selectSceneTypeByTaskId(taskId);
+        // String sceneType = sceneImportMapper.selectSceneTypeByTaskId(taskId);
         //根据任务id查询类型和场景ids
-        SceneImportPO  sceneImportPO=sceneImportMapper.querySceneImportByTaskId(taskId);
+        SceneImportPO sceneImportPO = sceneImportMapper.querySceneImportByTaskId(taskId);
         sceneImportPO.setId(taskId);
         sceneImportPO.setModifyTime(TimeUtil.getNowForMysql());
         sceneImportPO.setModifyUserId(AuthUtil.getCreateUserId());
         //获取场景类型
-        String sceneType=sceneImportPO.getSceneType();
+        String sceneType = sceneImportPO.getSceneType();
         //获取场景id的list集合
-        String sceneNames=sceneImportPO.getSceneNames();
-        List<String> listIds= Arrays.asList(sceneNames.split(","));
+        String sceneNames = sceneImportPO.getSceneNames();
+        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);
+            SceneGeneralTemplatePO po = new SceneGeneralTemplatePO();
+            for (String id : listIds) {
+                po.setSceneId(id);
                 sceneGeneralTemplateService.deleteSceneGeneralTemplateById(po);
             }
         } else {