下拉API修改

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/EmergencyTaskRoleController.java

 package com.yeejoin.amos.fas.business.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.fas.business.dao.mapper.EmergencyTaskMapper;
 import com.yeejoin.amos.fas.business.dao.mapper.EmergencyTaskRoleMapper;
 import com.yeejoin.amos.fas.business.vo.ReginParams;
 import com.yeejoin.amos.fas.config.Permission;
@@ -25,6 +26,9 @@ public class EmergencyTaskRoleController extends BaseController {
     @Autowired
     private EmergencyTaskRoleMapper emergencyTaskRoleMapper;
 
+    @Autowired
+    private EmergencyTaskMapper emergencyTaskMapper;
+
     /**
      * 创建数字预案
      */
@@ -99,6 +103,11 @@ public class EmergencyTaskRoleController extends BaseController {
     @ApiOperation(value = "根据ID删除数据", notes = "根据ID删除数据")
     @DeleteMapping(value = "/deleteById", produces = "application/json;charset=UTF-8")
     public ResponseModel deleteById(@RequestParam(value = "id") Long id) {
+        int total = emergencyTaskMapper.getEmergencyTaskCount(id, null);
+        if (total > 0) {
+            return CommonResponseUtil2.failure("已有应急任务，不能删除！");
+        }
+        emergencyTaskRoleMapper.deleteRelationByRoleId(id);
         emergencyTaskRoleMapper.deleteById(id);
         return CommonResponseUtil2.success();
     }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/PlanClassifyTreeController.java

@@ -5,6 +5,7 @@ import com.yeejoin.amos.fas.business.vo.PlanClassifyTreeVo;
 import com.yeejoin.amos.fas.business.vo.ReginParams;
 import com.yeejoin.amos.fas.core.util.CommonResponseUtil2;
 import com.yeejoin.amos.fas.core.util.ResponseModel;
+import com.yeejoin.amos.fas.dao.entity.EmergencyRelationTree;
 import com.yeejoin.amos.fas.dao.entity.PlanClassifyTree;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import io.swagger.annotations.Api;
@@ -12,7 +13,9 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.List;
 
 @RestController
 @RequestMapping("/api/planClassifyTree")
@@ -64,6 +67,14 @@ public class PlanClassifyTreeController extends BaseController {
 			e.printStackTrace();
 			System.out.println(e.getStackTrace().toString());
 		}
-		return CommonResponseUtil2.success(list);
+		//增加根节点
+		PlanClassifyTreeVo tree = new PlanClassifyTreeVo();
+		tree.setId(0);
+		tree.setClassifyName("全部");
+		tree.setPlanType("");
+		tree.setChildren(list);
+		List<PlanClassifyTreeVo> root = new ArrayList<>();
+		root.add(tree);
+		return CommonResponseUtil2.success(root);
 	}
 }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/mapper/EmergencyTaskRoleMapper.java

@@ -26,6 +26,8 @@ public interface EmergencyTaskRoleMapper extends BaseMapper<EmergencyTaskRole> {
 
     int deleteById(Long id);
 
+    int deleteRelationByRoleId(Long roleId);
+
     EmergencyTaskRole selectByCode(String code);
 
     List<EmergencyTaskRole> selectList();

YeeAmosFireAutoSysStart/src/main/resources/db/mapper/EmergencyTaskRoleMapper.xml

@@ -71,4 +71,11 @@
         order by id ASC
          limit 1
     </select>
+
+    <delete id="deleteRelationByRoleId">
+        delete from
+            c_emergency_relation
+        WHERE
+            `obligationId` = #{roleId}
+    </delete>
 </mapper>
\ No newline at end of file

YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_emergency_task.xml

@@ -120,8 +120,8 @@
     </insert>
 
     <insert id="saveTaskConfig" parameterType="com.yeejoin.amos.fas.dao.entity.EmergencyTaskContent">
-        INSERT INTO `c_emergency_task_content`(id, `content`, `code`, `obligationId`, `create_date`, `obligation_name`, `step_code`, `role_code`,`button_json`, `task_num`,`is_must`, `plan_type`)
-        VALUES (#{id}, #{content}, #{code}, #{obligationId},  #{createDate},#{obligationName}, #{stepCode}, #{roleCode}, #{buttonJson},#{taskNum}, #{isMust} ,#{planType} );
+        INSERT INTO `c_emergency_task_content`(`content`, `code`, `obligation_id`, `create_date`, `obligation_name`, `step_code`, `role_code`,`button_json`, `task_num`,`is_must`, `plan_type`)
+        VALUES (#{content}, #{code}, #{obligationId},  #{createDate},#{obligationName}, #{stepCode}, #{roleCode}, #{buttonJson},#{taskNum}, #{isMust} ,#{planType} );
     </insert>
 
     <select id="getContentList" resultType="com.yeejoin.amos.fas.business.vo.EmergencyTaskContentVo">