应急接口fix

songhuangfeng123

2022-08-03 faa658a837ecb01f95618639c4536c91a5c65d1f

应急接口fix

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyPlanController.java

@@ -61,8 +61,8 @@
    /**
     * 应急预案删除/批量删除
     */
    @RequestMapping(value = "/batchDelete/{ids}",method = RequestMethod.GET)
    public ResultVO batchDeleteEmergencyPlan(@PathVariable("ids")String ids){
    @RequestMapping(value = "/batchDelete",method = RequestMethod.POST)
    public ResultVO batchDeleteEmergencyPlan(@RequestBody Long[] ids){
        return emergencyPlanService.batchDeleteEmergencyPlan(ids);
    }
}

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyTeamController.java

@@ -63,8 +63,8 @@
    /**
     * 应急队伍删除/批量删除
     */
    @RequestMapping(value = "/batchDelete/{ids}",method = RequestMethod.GET)
    public ResultVO batchDeleteEmergencyTeam(@PathVariable("ids")String ids){
    @RequestMapping(value = "/batchDelete",method = RequestMethod.POST)
    public ResultVO batchDeleteEmergencyTeam(@RequestBody Long[] ids){
        return emergencyTeamService.batchDeleteEmergencyTeam(ids);
    }


 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanInfo.java

@@ -9,6 +9,16 @@
@TableName("emergency_plan")
public class EmergencyPlanInfo {

    private String authorName;

    public String getAuthorName() {
        return authorName;
    }

    public void setAuthorName(String authorName) {
        this.authorName = authorName;
    }

    @TableId(type = IdType.AUTO)
    private Long id;


 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanInfoDetailDO.java

@@ -9,6 +9,16 @@
@TableName("emergency_plan")
public class EmergencyPlanInfoDetailDO {

    private String authorName;

    public String getAuthorName() {
        return authorName;
    }

    public void setAuthorName(String authorName) {
        this.authorName = authorName;
    }

    @TableId(type = IdType.AUTO)
    private Long id;


 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanTeamInfoDO.java

@@ -9,6 +9,16 @@
@TableName("emergency_plan_team")
public class EmergencyPlanTeamInfoDO {

    private String teamName;

    public String getTeamName() {
        return teamName;
    }

    public void setTeamName(String teamName) {
        this.teamName = teamName;
    }

    @TableId(type = IdType.AUTO)
    private Long id;


 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamInfo.java

@@ -9,6 +9,16 @@
@TableName("emergency_team")
public class EmergencyTeamInfo {

    private String principalName;

    public String getPrincipalName() {
        return principalName;
    }

    public void setPrincipalName(String principalName) {
        this.principalName = principalName;
    }

    @TableId(type = IdType.AUTO)
    private Long id;


 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamInfoDetailDO.java

@@ -10,6 +10,16 @@
@TableName("emergency_team")
public class EmergencyTeamInfoDetailDO {

    private String principalName;

    public String getPrincipalName() {
        return principalName;
    }

    public void setPrincipalName(String principalName) {
        this.principalName = principalName;
    }

    @TableId(type = IdType.AUTO)
    private Long id;


 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyPlanReqDTO.java

@@ -7,6 +7,16 @@

public class EmergencyPlanReqDTO {

    private String authorName;

    public String getAuthorName() {
        return authorName;
    }

    public void setAuthorName(String authorName) {
        this.authorName = authorName;
    }

    private Long id;

    private Integer status;

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyTeamReqDTO.java

@@ -4,6 +4,16 @@

public class EmergencyTeamReqDTO {

    private String principalName;

    public String getPrincipalName() {
        return principalName;
    }

    public void setPrincipalName(String principalName) {
        this.principalName = principalName;
    }

    private Long id;

    private Long principalUid;

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyPlanDepartmentRespDTO.java

@@ -3,6 +3,16 @@

public class EmergencyPlanDepartmentRespDTO {

    private String departmentName;

    public String getDepartmentName() {
        return departmentName;
    }

    public void setDepartmentName(String departmentName) {
        this.departmentName = departmentName;
    }

    private Long id;

    private Long planId;

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyPlanDetailRespDTO.java

@@ -7,6 +7,16 @@

public class EmergencyPlanDetailRespDTO {

    private String authorName;

    public String getAuthorName() {
        return authorName;
    }

    public void setAuthorName(String authorName) {
        this.authorName = authorName;
    }

    private Long id;

    private Integer status;

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyPlanTeamRespDTO.java

@@ -3,6 +3,16 @@

public class EmergencyPlanTeamRespDTO {

    private String teamName;

    public String getTeamName() {
        return teamName;
    }

    public void setTeamName(String teamName) {
        this.teamName = teamName;
    }

    private Long id;

    private Long planId;

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyTeamDetailRespDTO.java

@@ -5,6 +5,16 @@

public class EmergencyTeamDetailRespDTO {

    private String principalName;

    public String getPrincipalName() {
        return principalName;
    }

    public void setPrincipalName(String principalName) {
        this.principalName = principalName;
    }

    private Long id;

    private Long principalUid;

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyPlanService.java

@@ -20,5 +20,5 @@

    ResultVO updateEmergencyPlan(Long uid, EmergencyPlanReqDTO emergencyPlanReqDTO);

    ResultVO batchDeleteEmergencyPlan(String ids);
    ResultVO batchDeleteEmergencyPlan(Long[] ids);
}

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyTeamService.java

@@ -30,7 +30,7 @@

    ResultVO getEmergencyTeamMemberById(Long id);

    ResultVO batchDeleteEmergencyTeam(String ids);
    ResultVO batchDeleteEmergencyTeam(Long[] ids);

    ResultVO getEmergencyTeamMemberByTeamId(Long teamId);
}

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyPlanServiceImpl.java

@@ -1,6 +1,8 @@
package com.gkhy.safePlatform.emergency.service.impl;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.gkhy.safePlatform.account.rpc.apimodel.AccountDepartmentService;
import com.gkhy.safePlatform.account.rpc.apimodel.model.resp.DepInfoRPCRespDTO;
import com.gkhy.safePlatform.commons.enums.ResultCodes;
import com.gkhy.safePlatform.commons.query.PageQuery;
import com.gkhy.safePlatform.commons.utils.BeanCopyUtils;
@@ -17,14 +19,13 @@
import com.gkhy.safePlatform.emergency.query.db.EmergencyPlanDBQuery;
import com.gkhy.safePlatform.emergency.service.EmergencyPlanService;
import com.gkhy.safePlatform.emergency.service.baseService.*;
import org.apache.dubbo.config.annotation.DubboReference;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;

import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.*;
import java.util.stream.Collectors;

@Service("emergencyPlanService")
@@ -44,6 +45,9 @@

    @Autowired
    private EmergencyPlanFileInfoService emergencyPlanFileInfoService;

    @DubboReference(check = false)
    private AccountDepartmentService accountDepartmentService;

    @Override
    public SearchResultVO<List<EmergencyPlanPageRespDTO>> selectEmergencyPlanList(PageQuery<EmergencyPlanQuery> query) {
@@ -171,6 +175,22 @@
            List<EmergencyPlanDepartmentInfoDO> emergencyPlanDepartmentInfoDOList = emergencyPlanDepartmentInfoService.selectEmergencyPlanDepartmentByPlanId(id);
            if (!CollectionUtils.isEmpty(emergencyPlanDepartmentInfoDOList)){
                List<EmergencyPlanDepartmentRespDTO> emergencyTeamDepartmentRespDTOList = BeanCopyUtils.copyBeanList(emergencyPlanDepartmentInfoDOList , EmergencyPlanDepartmentRespDTO.class);

                Map<Long, String> deptPool = new HashMap<>();
                for (EmergencyPlanDepartmentRespDTO emergencyPlanDepartmentRespDTO : emergencyTeamDepartmentRespDTOList) {
                    if (!deptPool.containsKey(emergencyPlanDepartmentRespDTO.getDepartmentId())) {
                        ResultVO<DepInfoRPCRespDTO> rpcResult = accountDepartmentService.getDepInfoByDepId(emergencyPlanDepartmentRespDTO.getDepartmentId());
                        if (rpcResult != null && rpcResult.getCode().equals(ResultCodes.OK.getCode())) {
                            if (rpcResult.getData() != null) {
                                DepInfoRPCRespDTO dep = (DepInfoRPCRespDTO) rpcResult.getData();

                                deptPool.put(dep.getDepId(), dep.getDepName());
                            }
                        }
                    }
                    String depName = deptPool.get(emergencyPlanDepartmentRespDTO.getDepartmentId());
                    emergencyPlanDepartmentRespDTO.setDepartmentName(depName);
                }
                emergencyPlanDetailRespDTO.setDeptList(emergencyTeamDepartmentRespDTOList);
            }
            // 查找对应的应急队伍
@@ -385,13 +405,13 @@
    }

    @Override
    public ResultVO batchDeleteEmergencyPlan(String ids) {
        if (StringUtils.isBlank(ids)) {
    public ResultVO batchDeleteEmergencyPlan(Long[] ids) {

        if (ids == null ||  ids.length==0){
            throw new EmergencyException(EmergencyResultCodes.PLAN_NOT_EXIST);
        } else {
            String[] idArr = ids.split(",");
            for (String id : idArr) {
                deleteEmergencyPlan(Long.valueOf(id));
            for (Long id : ids){
                deleteEmergencyPlan(id);
            }
            return new ResultVO(ResultCodes.OK);
        }

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyTeamServiceImpl.java

@@ -245,13 +245,12 @@
    }

    @Override
    public ResultVO batchDeleteEmergencyTeam(String ids) {
        if (StringUtils.isBlank(ids)){
    public ResultVO batchDeleteEmergencyTeam(Long[] ids) {
        if (ids == null ||  ids.length==0){
            throw new EmergencyException(EmergencyResultCodes.TEAM_NULL);
        }else{
            String[] idArr = ids.split(",");
            for (String id : idArr) {
                deleteEmergencyTeam(Long.valueOf(id));
            for (Long id : ids){
                deleteEmergencyTeam(id);
            }
            return new ResultVO(ResultCodes.OK);
        }

 emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyPlanInfoMapper.xml

@@ -32,6 +32,7 @@
            <if test="status != null ">status,</if>
            <if test="releaseDate != null ">release_date,</if>
            <if test="authorUid != null ">author_uid,</if>
            <if test="authorName != null and authorName != ''">`author_name`,</if>
            <if test="authorDeptId != null ">author_dept_id,</if>
            <if test="associatedDanger != null ">associated_danger,</if>
            <if test="type != null and type != ''">`type`,</if>
@@ -48,6 +49,7 @@
            <if test="status != null ">#{status},</if>
            <if test="releaseDate != null ">#{releaseDate},</if>
            <if test="authorUid != null ">#{authorUid},</if>
            <if test="authorName != null and authorName != ''">#{authorName},</if>
            <if test="authorDeptId != null ">#{authorDeptId},</if>
            <if test="associatedDanger!= null ">#{associatedDanger},</if>
            <if test="type != null and type != ''">#{type},</if>
@@ -65,12 +67,13 @@
        <result column="level" property="level"/>
        <result column="release_date" property="releaseDate"/>
        <result column="author_uid" property="authorUid"/>
        <result column="author_name" property="authorName"/>
        <result column="author_dept_id" property="authorDeptId"/>
        <result column="associated_danger" property="associatedDanger"/>
    </resultMap>

    <select id="selectEmergencyPlanById" resultMap="emergencyPlanInfoDetailDOResult">
        select id ,`name`,`status`,`type`,`level`,release_date ,author_uid ,author_dept_id ,associated_danger from emergency_plan
        select id ,`name`,`status`,`type`,`level`,release_date ,author_uid ,author_dept_id ,associated_danger,author_name from emergency_plan
        where del_flag = 0 and id = #{id}
    </select>

@@ -82,6 +85,7 @@
            <if test="status != null ">status = #{status},</if>
            <if test="releaseDate != null ">release_date = #{releaseDate},</if>
            <if test="authorUid != null ">author_uid = #{authorUid},</if>
            <if test="authorName != null and authorName != ''">author_name =#{authorName},</if>
            <if test="authorDeptId != null ">author_dept_id = #{authorDeptId},</if>
            <if test="associatedDanger != null ">associated_danger = #{associatedDanger},</if>
            <if test="type != null and type != ''">type = #{type},</if>

 emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyPlanTeamInfoMapper.xml

@@ -35,7 +35,17 @@
    </resultMap>

    <select id="selectEmergencyPlanTeamByPlanId" resultMap="emergencyPlanTeamInfoDOResult">
        select id ,plan_id ,team_id  from emergency_plan_team where plan_id=#{planId} and del_flag = 0
    SELECT
        a.id,
        a.plan_id,
        a.team_id,
        b.team_name AS teamName
    FROM
        emergency_plan_team a
        LEFT JOIN emergency_team b ON a.team_id = b.id
    WHERE
        a.plan_id = #{planId}
        AND a.del_flag = 0
    </select>

    <update id = "deleteEmergencyPlanTeamByIds" >

 emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyTeamInfoMapper.xml

@@ -29,6 +29,7 @@
            <if test="createUid != null ">create_uid,</if>
            <if test="updateUid != null ">update_uid,</if>
            <if test="principalUid != null ">principal_uid,</if>
            <if test="principalName != null and principalName != ''">principal_name,</if>
            <if test="principalDepartmentId != null ">principal_department_id,</if>
            <if test="teamLevel != null and teamLevel != ''">team_level,</if>
            <if test="teamName != null and teamName != ''">team_name,</if>
@@ -44,6 +45,7 @@
            <if test="createUid != null ">#{createUid},</if>
            <if test="updateUid != null ">#{updateUid},</if>
            <if test="principalUid != null ">#{principalUid},</if>
            <if test="principalName != null and principalName != ''">#{principalName},</if>
            <if test="principalDepartmentId != null ">#{principalDepartmentId},</if>
            <if test="teamLevel != null and teamLevel != ''">#{teamLevel},</if>
            <if test="teamName != null and teamName != ''">#{teamName},</if>
@@ -57,6 +59,7 @@
               id="emergencyTeamInfoDetailDOResult">
        <id column="id" property="id" jdbcType="BIGINT"/>
        <result column="principal_uid" property="principalUid"/>
        <result column="principal_name" property="principalName"/>
        <result column="principal_department_id" property="principalDepartmentId"/>
        <result column="team_level" property="teamLevel"/>
        <result column="team_name" property="teamName"/>
@@ -66,7 +69,7 @@
    </resultMap>

    <select id="selectEmergencyTeamById" resultMap="emergencyTeamInfoDetailDOResult">
        select id,principal_uid,principal_department_id,`team_level`,`team_name`,`principal_phone`,telephone_number,`team_desc`
        select id,principal_uid,principal_department_id,`team_level`,`team_name`,`principal_phone`,telephone_number,`team_desc`,principal_name
        from emergency_team where del_flag = 0 and id = #{id}
    </select>

@@ -76,6 +79,7 @@
            <if test="gmtModitify != null ">gmt_moditify = #{gmtModitify},</if>
            <if test="updateUid != null ">update_uid = #{updateUid},</if>
            <if test="principalUid != null ">principal_uid = #{principalUid},</if>
            <if test="principalName != null and principalName != ''">principal_name = #{principalName},</if>
            <if test="principalDepartmentId != null ">principal_department_id = #{principalDepartmentId},</if>
            <if test="teamLevel != null and teamLevel != ''">team_level = #{teamLevel},</if>
            <if test="teamName != null and teamName != ''">team_name = #{teamName},</if>

 incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/req/AccidentExpressReqDTO.java

@@ -29,6 +29,7 @@

    private String accidentCause;

    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date occurrenceTime;

    private String occurrencePlace;

 incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/req/AccidentReportReqDTO.java

@@ -36,6 +36,7 @@

    private String accidentCause;

    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date reportDeadline;

    private String accidentLevel;

 incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/req/WorkInjuryDeclarationReqDTO.java

@@ -20,6 +20,7 @@

    private String workInjuryType;

    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date declareDate;

    private BigDecimal lostTime;