tree

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

@@ -2,6 +2,7 @@ package com.yeejoin.amos.fas.business.controller;
 
 
 import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.fas.business.dao.mapper.EmergencyTaskRoleMapper;
 import com.yeejoin.amos.fas.business.feign.JcsFeign;
 import com.yeejoin.amos.fas.business.service.intfc.IDictService;
 import com.yeejoin.amos.fas.business.service.intfc.IEmergencyTaskService;
@@ -10,10 +11,7 @@ import com.yeejoin.amos.fas.common.enums.PlanTypeEnum;
 import com.yeejoin.amos.fas.core.common.request.CommonPageable;
 import com.yeejoin.amos.fas.core.util.CommonResponse;
 import com.yeejoin.amos.fas.core.util.CommonResponseUtil;
-import com.yeejoin.amos.fas.dao.entity.Dict;
-import com.yeejoin.amos.fas.dao.entity.EmergencyRelation;
-import com.yeejoin.amos.fas.dao.entity.EmergencyRelationTree;
-import com.yeejoin.amos.fas.dao.entity.EmergencyTaskContent;
+import com.yeejoin.amos.fas.dao.entity.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
@@ -47,25 +45,29 @@ public class EmergencyTaskController extends BaseController{
     @Autowired
     private RedisTemplate redisTemplate;
 
+    @Autowired
+    private EmergencyTaskRoleMapper emergencyTaskRoleMapper;
+
     @ApiOperation(httpMethod = "GET",value = "岗位人员树", notes = "岗位人员树")
     @RequestMapping(value = "/tree", method = RequestMethod.GET)
     public CommonResponse tree(){
         Dict dict = new Dict();
         dict.setDictCode("YJZC");
         //查询应急角色
-        List<Dict> dictList = dictService.getDictList(dict);
+//        List<Dict> dictList = dictService.getDictList(dict);
+        List<EmergencyTaskRole> emergencyTaskRoles = emergencyTaskRoleMapper.selectList();
         List<EmergencyRelationTree> list = new ArrayList<>();
         List<EmergencyRelationTree> root = new ArrayList<>();
         List<EmergencyRelationTree> treeNodes = iEmergencyTaskService.treeList();
 
         //组装对应人员节点
-        dictList.forEach(e->{
+        emergencyTaskRoles.forEach(e->{
             EmergencyRelationTree tree = new EmergencyRelationTree();
             tree.setId(e.getId());
-            tree.setName(e.getDictName());
+            tree.setName(e.getName());
             tree.setType("0");
             tree.setSequenceNbr(String.valueOf(e.getId()));
-            tree.setCode(e.getDictValue());
+            tree.setCode(e.getCode());
             tree.setChildren(treeNodes.stream().filter(t->t.getObligationId().equals(e.getId())).collect(Collectors.toList()));
             list.add(tree);
         });

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

@@ -35,6 +35,10 @@ public class EmergencyTaskRoleController extends BaseController {
         if (null == emergencyTaskRole) {
             return CommonResponseUtil2.failure("参数有误");
         }
+        int i = emergencyTaskRoleMapper.countByCode(emergencyTaskRole.getCode());
+        if (i > 0) {
+            return CommonResponseUtil2.failure("角色编码已存在");
+        }
         AgencyUserModel curUser = getUserInfo();
         emergencyTaskRole.setCreater(curUser.getUserId());
         ReginParams reginParams = getSelectedOrgInfo();
@@ -62,13 +66,21 @@ public class EmergencyTaskRoleController extends BaseController {
 
     @Permission
     @ApiOperation(value = "详情", notes = "详情")
-    @GetMapping(value = "/{id}", produces = "application/json;charset=UTF-8")
-    public ResponseModel createPlan(@PathVariable(value = "id") Long id) {
+    @GetMapping(value = "/getById", produces = "application/json;charset=UTF-8")
+    public ResponseModel getById(@RequestParam(value = "id") Long id) {
         EmergencyTaskRole emergencyTaskRole = emergencyTaskRoleMapper.selectById(id);
         return CommonResponseUtil2.success(emergencyTaskRole);
     }
 
     @Permission
+    @ApiOperation(value = "根据角色编码查信息", notes = "根据角色编码查信息")
+    @GetMapping(value = "/getByCode", produces = "application/json;charset=UTF-8")
+    public ResponseModel getByCode(@RequestParam(value = "code") String code) {
+        EmergencyTaskRole emergencyTaskRole = emergencyTaskRoleMapper.selectByCode(code);
+        return CommonResponseUtil2.success(emergencyTaskRole);
+    }
+
+    @Permission
     @ApiOperation(value = "根据批次号获取预案的消息等记录", notes = "根据批次号获取预案的消息等记录")
     @PostMapping(value = "/getInfoByPage")
     public ResponseModel<Page<EmergencyTaskRole>> getInfoByPage(@RequestBody EmergencyTaskRole emergencyTaskRole,
@@ -85,8 +97,8 @@ public class EmergencyTaskRoleController extends BaseController {
 
     @Permission
     @ApiOperation(value = "根据ID删除数据", notes = "根据ID删除数据")
-    @DeleteMapping(value = "/{id}", produces = "application/json;charset=UTF-8")
-    public ResponseModel deleteById(@PathVariable(value = "id") Long id) {
+    @DeleteMapping(value = "/deleteById", produces = "application/json;charset=UTF-8")
+    public ResponseModel deleteById(@RequestParam(value = "id") Long id) {
         emergencyTaskRoleMapper.deleteById(id);
         return CommonResponseUtil2.success();
     }

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

@@ -12,6 +12,8 @@ public interface EmergencyTaskRoleMapper extends BaseMapper<EmergencyTaskRole> {
 
     void save(EmergencyTaskRole emergencyTaskRole);
 
+    int countByCode(String code);
+
     int updateById(EmergencyTaskRole emergencyTaskRole);
 
     EmergencyTaskRole selectById(Long id);
@@ -23,4 +25,8 @@ public interface EmergencyTaskRoleMapper extends BaseMapper<EmergencyTaskRole> {
                                           EmergencyTaskRole emergencyTaskRole);
 
     int deleteById(Long id);
+
+    EmergencyTaskRole selectByCode(String code);
+
+    List<EmergencyTaskRole> selectList();
 }

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

@@ -47,4 +47,16 @@
         WHERE
             `id` = #{id}
     </delete>
+
+    <select id="countByCode" resultType="int">
+        select count(1) from c_emergency_task_role where is_delete = 0 and code = #{code}
+    </select>
+
+    <select id="selectByCode" resultType="com.yeejoin.amos.fas.dao.entity.EmergencyTaskRole">
+        select * from c_emergency_task_role where is_delete = 0 and code = #{code}
+    </select>
+
+    <select id="selectList" resultType="com.yeejoin.amos.fas.dao.entity.EmergencyTaskRole">
+        select * from c_emergency_task_role where is_delete = 0 order by sort desc
+    </select>
 </mapper>
\ No newline at end of file