应急预案新增+详情

songhuangfeng123

2022-07-07 0ce7df5c83217a0561ef71e927444ae8f52c2a47

应急预案新增+详情

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

@@ -4,6 +4,7 @@
import com.gkhy.safePlatform.commons.utils.PageUtils;
import com.gkhy.safePlatform.commons.vo.ResultVO;
import com.gkhy.safePlatform.emergency.model.dto.req.EmergencyPlanReqDTO;
import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyPlanDetailRespDTO;
import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyPlanPageRespDTO;
import com.gkhy.safePlatform.emergency.query.EmergencyPlanQuery;
import com.gkhy.safePlatform.emergency.service.EmergencyPlanService;
@@ -30,12 +31,19 @@
    }

    /**
     * 新增应急预案
     * 应急预案新增
     */
    @RequestMapping(value = "/add",method = RequestMethod.POST)
    public ResultVO<String> add(Principal principal, @RequestBody EmergencyPlanReqDTO emergencyPlanReqDTO) {
    public ResultVO addEmergencyPlan(Principal principal, @RequestBody EmergencyPlanReqDTO emergencyPlanReqDTO) {
        String uid = principal.getName();
        return emergencyPlanService.add(Long.valueOf(uid), emergencyPlanReqDTO);
        return emergencyPlanService.addEmergencyPlan(Long.valueOf(uid), emergencyPlanReqDTO);
    }

    /**
     * 应急预案详情
     */
    @RequestMapping(value = "/info/{id}",method = RequestMethod.GET)
    public ResultVO<EmergencyPlanDetailRespDTO> getEmergencyPlanById(@PathVariable("id")Long id){
        return emergencyPlanService.getEmergencyPlanById(id);
    }
}

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

对比新文件
@@ -0,0 +1,106 @@
package com.gkhy.safePlatform.emergency.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;

import java.util.Date;

@TableName("emergency_plan_area")
public class EmergencyPlanAreaInfo {

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

    private Boolean delFlag;

    private Date gmtCreate;

    private Date gmtModitify;

    private Long createUid;

    private Long updateUid;

    private Long planId;

    private Long areaId;

    public Long getId() {
        return id;
    }

    public void setId(Long id) {
        this.id = id;
    }

    public Boolean getDelFlag() {
        return delFlag;
    }

    public void setDelFlag(Boolean delFlag) {
        this.delFlag = delFlag;
    }

    public Date getGmtCreate() {
        return gmtCreate;
    }

    public void setGmtCreate(Date gmtCreate) {
        this.gmtCreate = gmtCreate;
    }

    public Date getGmtModitify() {
        return gmtModitify;
    }

    public void setGmtModitify(Date gmtModitify) {
        this.gmtModitify = gmtModitify;
    }

    public Long getCreateUid() {
        return createUid;
    }

    public void setCreateUid(Long createUid) {
        this.createUid = createUid;
    }

    public Long getUpdateUid() {
        return updateUid;
    }

    public void setUpdateUid(Long updateUid) {
        this.updateUid = updateUid;
    }

    public Long getPlanId() {
        return planId;
    }

    public void setPlanId(Long planId) {
        this.planId = planId;
    }

    public Long getAreaId() {
        return areaId;
    }

    public void setAreaId(Long areaId) {
        this.areaId = areaId;
    }

    @Override
    public String toString() {
        return "EmergencyPlanAreaInfo{" +
                "id=" + id +
                ", delFlag=" + delFlag +
                ", gmtCreate=" + gmtCreate +
                ", gmtModitify=" + gmtModitify +
                ", createUid=" + createUid +
                ", updateUid=" + updateUid +
                ", planId=" + planId +
                ", areaId=" + areaId +
                '}';
    }
}

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

对比新文件
@@ -0,0 +1,51 @@
package com.gkhy.safePlatform.emergency.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;

import java.util.Date;

@TableName("emergency_plan_area")
public class EmergencyPlanAreaInfoDO {

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

    private Long planId;

    private Long areaId;

    public Long getId() {
        return id;
    }

    public void setId(Long id) {
        this.id = id;
    }

    public Long getPlanId() {
        return planId;
    }

    public void setPlanId(Long planId) {
        this.planId = planId;
    }

    public Long getAreaId() {
        return areaId;
    }

    public void setAreaId(Long areaId) {
        this.areaId = areaId;
    }

    @Override
    public String toString() {
        return "EmergencyPlanAreaInfo{" +
                "id=" + id +
                ", planId=" + planId +
                ", areaId=" + areaId +
                '}';
    }
}

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

对比新文件
@@ -0,0 +1,106 @@
package com.gkhy.safePlatform.emergency.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;

import java.util.Date;

@TableName("emergency_plan_department")
public class EmergencyPlanDepartmentInfo {

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

    private Boolean delFlag;

    private Date gmtCreate;

    private Date gmtModitify;

    private Long createUid;

    private Long updateUid;

    private Long planId;

    private Long departmentId;

    public Long getId() {
        return id;
    }

    public void setId(Long id) {
        this.id = id;
    }

    public Boolean getDelFlag() {
        return delFlag;
    }

    public void setDelFlag(Boolean delFlag) {
        this.delFlag = delFlag;
    }

    public Date getGmtCreate() {
        return gmtCreate;
    }

    public void setGmtCreate(Date gmtCreate) {
        this.gmtCreate = gmtCreate;
    }

    public Date getGmtModitify() {
        return gmtModitify;
    }

    public void setGmtModitify(Date gmtModitify) {
        this.gmtModitify = gmtModitify;
    }

    public Long getCreateUid() {
        return createUid;
    }

    public void setCreateUid(Long createUid) {
        this.createUid = createUid;
    }

    public Long getUpdateUid() {
        return updateUid;
    }

    public void setUpdateUid(Long updateUid) {
        this.updateUid = updateUid;
    }

    public Long getPlanId() {
        return planId;
    }

    public void setPlanId(Long planId) {
        this.planId = planId;
    }

    public Long getDepartmentId() {
        return departmentId;
    }

    public void setDepartmentId(Long departmentId) {
        this.departmentId = departmentId;
    }

    @Override
    public String toString() {
        return "EmergencyPlanAreaInfo{" +
                "id=" + id +
                ", delFlag=" + delFlag +
                ", gmtCreate=" + gmtCreate +
                ", gmtModitify=" + gmtModitify +
                ", createUid=" + createUid +
                ", updateUid=" + updateUid +
                ", planId=" + planId +
                ", departmentId=" + departmentId +
                '}';
    }
}

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

对比新文件
@@ -0,0 +1,51 @@
package com.gkhy.safePlatform.emergency.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;

import java.util.Date;

@TableName("emergency_plan_department")
public class EmergencyPlanDepartmentInfoDO {

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

    private Long planId;

    private Long departmentId;

    public Long getId() {
        return id;
    }

    public void setId(Long id) {
        this.id = id;
    }

    public Long getPlanId() {
        return planId;
    }

    public void setPlanId(Long planId) {
        this.planId = planId;
    }

    public Long getDepartmentId() {
        return departmentId;
    }

    public void setDepartmentId(Long departmentId) {
        this.departmentId = departmentId;
    }

    @Override
    public String toString() {
        return "EmergencyPlanAreaInfo{" +
                "id=" + id +
                ", planId=" + planId +
                ", departmentId=" + departmentId +
                '}';
    }
}

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

对比新文件
@@ -0,0 +1,117 @@
package com.gkhy.safePlatform.emergency.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;

import java.util.Date;

@TableName("emergency_plan_file")
public class EmergencyPlanFileInfo {

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

    private Boolean delFlag;

    private Date gmtCreate;

    private Date gmtModitify;

    private Long createUid;

    private Long updateUid;

    private Long planId;

    private String fileUrl;

    private String fileName;

    public Long getId() {
        return id;
    }

    public void setId(Long id) {
        this.id = id;
    }

    public Boolean getDelFlag() {
        return delFlag;
    }

    public void setDelFlag(Boolean delFlag) {
        this.delFlag = delFlag;
    }

    public Date getGmtCreate() {
        return gmtCreate;
    }

    public void setGmtCreate(Date gmtCreate) {
        this.gmtCreate = gmtCreate;
    }

    public Date getGmtModitify() {
        return gmtModitify;
    }

    public void setGmtModitify(Date gmtModitify) {
        this.gmtModitify = gmtModitify;
    }

    public Long getCreateUid() {
        return createUid;
    }

    public void setCreateUid(Long createUid) {
        this.createUid = createUid;
    }

    public Long getUpdateUid() {
        return updateUid;
    }

    public void setUpdateUid(Long updateUid) {
        this.updateUid = updateUid;
    }

    public Long getPlanId() {
        return planId;
    }

    public void setPlanId(Long planId) {
        this.planId = planId;
    }

    public String getFileUrl() {
        return fileUrl;
    }

    public void setFileUrl(String fileUrl) {
        this.fileUrl = fileUrl;
    }

    public String getFileName() {
        return fileName;
    }

    public void setFileName(String fileName) {
        this.fileName = fileName;
    }

    @Override
    public String toString() {
        return "EmergencyTeamFileInfo{" +
                "id=" + id +
                ", delFlag=" + delFlag +
                ", gmtCreate=" + gmtCreate +
                ", gmtModitify=" + gmtModitify +
                ", createUid='" + createUid + '\'' +
                ", updateUid='" + updateUid + '\'' +
                ", planId=" + planId +
                ", fileUrl='" + fileUrl + '\'' +
                ", fileName='" + fileName + '\'' +
                '}';
    }
}

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

对比新文件
@@ -0,0 +1,62 @@
package com.gkhy.safePlatform.emergency.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;

import java.util.Date;

@TableName("emergency_plan_file")
public class EmergencyPlanFileInfoDO {

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

    private Long planId;

    private String fileUrl;

    private String fileName;

    public Long getId() {
        return id;
    }

    public void setId(Long id) {
        this.id = id;
    }

    public Long getPlanId() {
        return planId;
    }

    public void setPlanId(Long planId) {
        this.planId = planId;
    }

    public String getFileUrl() {
        return fileUrl;
    }

    public void setFileUrl(String fileUrl) {
        this.fileUrl = fileUrl;
    }

    public String getFileName() {
        return fileName;
    }

    public void setFileName(String fileName) {
        this.fileName = fileName;
    }

    @Override
    public String toString() {
        return "EmergencyTeamFileInfo{" +
                "id=" + id +
                ", planId=" + planId +
                ", fileUrl='" + fileUrl + '\'' +
                ", fileName='" + fileName + '\'' +
                '}';
    }
}

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

@@ -22,7 +22,7 @@

    private Long updateUid;

    private Byte statue;
    private Integer status;

    private Date releaseDate;

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

    private Long authorDeptId;

    private Byte associatedDanger;
    private Boolean associatedDanger;

    private String type;

@@ -86,12 +86,12 @@
        this.updateUid = updateUid;
    }

    public Byte getStatue() {
        return statue;
    public Integer getStatus() {
        return status;
    }

    public void setStatue(Byte statue) {
        this.statue = statue;
    public void setStatus(Integer status) {
        this.status = status;
    }

    public Date getReleaseDate() {
@@ -118,11 +118,11 @@
        this.authorDeptId = authorDeptId;
    }

    public Byte getAssociatedDanger() {
    public Boolean getAssociatedDanger() {
        return associatedDanger;
    }

    public void setAssociatedDanger(Byte associatedDanger) {
    public void setAssociatedDanger(Boolean associatedDanger) {
        this.associatedDanger = associatedDanger;
    }

@@ -159,7 +159,7 @@
                ", gmtModitify=" + gmtModitify +
                ", createUid='" + createUid + '\'' +
                ", updateUid='" + updateUid + '\'' +
                ", statue=" + statue +
                ", status=" + status +
                ", releaseDate=" + releaseDate +
                ", authorUid='" + authorUid + '\'' +
                ", authorDeptId=" + authorDeptId +

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

@@ -12,7 +12,7 @@
    @TableId(type = IdType.AUTO)
    private Long id;

    private Byte status;
    private Integer status;

    private Date releaseDate;

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

    private Long authorDeptId;

    private Byte associatedDanger;
    private Boolean associatedDanger;

    private String type;

@@ -36,11 +36,11 @@
        this.id = id;
    }

    public Byte getStatus() {
    public Integer getStatus() {
        return status;
    }

    public void setStatus(Byte status) {
    public void setStatus(Integer status) {
        this.status = status;
    }

@@ -68,11 +68,11 @@
        this.authorDeptId = authorDeptId;
    }

    public Byte getAssociatedDanger() {
    public Boolean getAssociatedDanger() {
        return associatedDanger;
    }

    public void setAssociatedDanger(Byte associatedDanger) {
    public void setAssociatedDanger(Boolean associatedDanger) {
        this.associatedDanger = associatedDanger;
    }


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

@@ -12,7 +12,7 @@

    private String name ;

    private Byte status ;
    private Integer status ;

    private String type;

@@ -37,11 +37,11 @@
        this.name = name;
    }

    public Byte getStatus() {
    public Integer getStatus() {
        return status;
    }

    public void setStatus(Byte status) {
    public void setStatus(Integer status) {
        this.status = status;
    }


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

对比新文件
@@ -0,0 +1,106 @@
package com.gkhy.safePlatform.emergency.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;

import java.util.Date;

@TableName("emergency_plan_team")
public class EmergencyPlanTeamInfo {

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

    private Boolean delFlag;

    private Date gmtCreate;

    private Date gmtModitify;

    private Long createUid;

    private Long updateUid;

    private Long planId;

    private Long teamId;

    public Long getId() {
        return id;
    }

    public void setId(Long id) {
        this.id = id;
    }

    public Boolean getDelFlag() {
        return delFlag;
    }

    public void setDelFlag(Boolean delFlag) {
        this.delFlag = delFlag;
    }

    public Date getGmtCreate() {
        return gmtCreate;
    }

    public void setGmtCreate(Date gmtCreate) {
        this.gmtCreate = gmtCreate;
    }

    public Date getGmtModitify() {
        return gmtModitify;
    }

    public void setGmtModitify(Date gmtModitify) {
        this.gmtModitify = gmtModitify;
    }

    public Long getCreateUid() {
        return createUid;
    }

    public void setCreateUid(Long createUid) {
        this.createUid = createUid;
    }

    public Long getUpdateUid() {
        return updateUid;
    }

    public void setUpdateUid(Long updateUid) {
        this.updateUid = updateUid;
    }

    public Long getPlanId() {
        return planId;
    }

    public void setPlanId(Long planId) {
        this.planId = planId;
    }

    public Long getTeamId() {
        return teamId;
    }

    public void setTeamId(Long teamId) {
        this.teamId = teamId;
    }

    @Override
    public String toString() {
        return "EmergencyPlanAreaInfo{" +
                "id=" + id +
                ", delFlag=" + delFlag +
                ", gmtCreate=" + gmtCreate +
                ", gmtModitify=" + gmtModitify +
                ", createUid=" + createUid +
                ", updateUid=" + updateUid +
                ", planId=" + planId +
                ", teamId=" + teamId +
                '}';
    }
}

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

对比新文件
@@ -0,0 +1,51 @@
package com.gkhy.safePlatform.emergency.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;

import java.util.Date;

@TableName("emergency_plan_team")
public class EmergencyPlanTeamInfoDO {

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

    private Long planId;

    private Long teamId;

    public Long getId() {
        return id;
    }

    public void setId(Long id) {
        this.id = id;
    }

    public Long getPlanId() {
        return planId;
    }

    public void setPlanId(Long planId) {
        this.planId = planId;
    }

    public Long getTeamId() {
        return teamId;
    }

    public void setTeamId(Long teamId) {
        this.teamId = teamId;
    }

    @Override
    public String toString() {
        return "EmergencyPlanAreaInfo{" +
                "id=" + id +
                ", planId=" + planId +
                ", teamId=" + teamId +
                '}';
    }
}

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/EmergencyPlanStatus.java

对比新文件
@@ -0,0 +1,23 @@
package com.gkhy.safePlatform.emergency.enums;

public enum EmergencyPlanStatus {

    START(1),
    FIRST_LEVEL_APPROEAL(2),
    SECOND_LEVEL_APPROEAL(3),
    END(4);

    private Integer status;

    public Integer getStatus() {
        return status;
    }

    public void setStatus(Integer status) {
        this.status = status;
    }

    EmergencyPlanStatus(Integer status) {
        this.status = status;
    }
}

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/EmergencyResultCodes.java

@@ -30,6 +30,8 @@

    TEAM_USER_NOT_EXIST("T1010" , "应急队伍人员不存在"),

    PLAN_NOT_EXIST("P1001" , "应急预案不存在"),





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

对比新文件
@@ -0,0 +1,44 @@
package com.gkhy.safePlatform.emergency.model.dto.req;


public class EmergencyPlanAreaReqDTO {

    private Long id;

    private Long planId;

    private Long areaId;

    public Long getId() {
        return id;
    }

    public void setId(Long id) {
        this.id = id;
    }

    public Long getPlanId() {
        return planId;
    }

    public void setPlanId(Long planId) {
        this.planId = planId;
    }

    public Long getAreaId() {
        return areaId;
    }

    public void setAreaId(Long areaId) {
        this.areaId = areaId;
    }

    @Override
    public String toString() {
        return "EmergencyPlanAreaInfo{" +
                "id=" + id +
                ", planId=" + planId +
                ", areaId=" + areaId +
                '}';
    }
}

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

对比新文件
@@ -0,0 +1,44 @@
package com.gkhy.safePlatform.emergency.model.dto.req;


public class EmergencyPlanDepartmentReqDTO {

    private Long id;

    private Long planId;

    private Long departmentId;

    public Long getId() {
        return id;
    }

    public void setId(Long id) {
        this.id = id;
    }

    public Long getPlanId() {
        return planId;
    }

    public void setPlanId(Long planId) {
        this.planId = planId;
    }

    public Long getDepartmentId() {
        return departmentId;
    }

    public void setDepartmentId(Long departmentId) {
        this.departmentId = departmentId;
    }

    @Override
    public String toString() {
        return "EmergencyPlanAreaInfo{" +
                "id=" + id +
                ", planId=" + planId +
                ", departmentId=" + departmentId +
                '}';
    }
}

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

对比新文件
@@ -0,0 +1,55 @@
package com.gkhy.safePlatform.emergency.model.dto.req;


public class EmergencyPlanFileReqDTO {

    private Long id;

    private Long planId;

    private String fileUrl;

    private String fileName;

    public Long getId() {
        return id;
    }

    public void setId(Long id) {
        this.id = id;
    }

    public Long getPlanId() {
        return planId;
    }

    public void setPlanId(Long planId) {
        this.planId = planId;
    }

    public String getFileUrl() {
        return fileUrl;
    }

    public void setFileUrl(String fileUrl) {
        this.fileUrl = fileUrl;
    }

    public String getFileName() {
        return fileName;
    }

    public void setFileName(String fileName) {
        this.fileName = fileName;
    }

    @Override
    public String toString() {
        return "EmergencyTeamFileInfo{" +
                "id=" + id +
                ", planId=" + planId +
                ", fileUrl='" + fileUrl + '\'' +
                ", fileName='" + fileName + '\'' +
                '}';
    }
}

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

@@ -1,4 +1,156 @@
package com.gkhy.safePlatform.emergency.model.dto.req;

import java.util.Date;
import java.util.List;

public class EmergencyPlanReqDTO {

    private Long id;

    private Integer status;

    private Date releaseDate;

    private Long authorUid;

    private Long authorDeptId;

    private Boolean associatedDanger;

    private String type;

    private String level;

    private String name ;

    private List<EmergencyPlanAreaReqDTO> areaList;

    private List<EmergencyPlanDepartmentReqDTO> deptList;

    private List<EmergencyPlanFileReqDTO> fileList;

    private List<EmergencyPlanTeamReqDTO> teamList;

    public Long getId() {
        return id;
    }

    public void setId(Long id) {
        this.id = id;
    }

    public Integer getStatus() {
        return status;
    }

    public void setStatus(Integer status) {
        this.status = status;
    }

    public Date getReleaseDate() {
        return releaseDate;
    }

    public void setReleaseDate(Date releaseDate) {
        this.releaseDate = releaseDate;
    }

    public Long getAuthorUid() {
        return authorUid;
    }

    public void setAuthorUid(Long authorUid) {
        this.authorUid = authorUid;
    }

    public Long getAuthorDeptId() {
        return authorDeptId;
    }

    public void setAuthorDeptId(Long authorDeptId) {
        this.authorDeptId = authorDeptId;
    }

    public Boolean getAssociatedDanger() {
        return associatedDanger;
    }

    public void setAssociatedDanger(Boolean associatedDanger) {
        this.associatedDanger = associatedDanger;
    }

    public String getType() {
        return type;
    }

    public void setType(String type) {
        this.type = type;
    }

    public String getLevel() {
        return level;
    }

    public void setLevel(String level) {
        this.level = level;
    }

    public String getName() {
        return name;
    }

    public void setName(String name) {
        this.name = name;
    }

    public List<EmergencyPlanAreaReqDTO> getAreaList() {
        return areaList;
    }

    public void setAreaList(List<EmergencyPlanAreaReqDTO> areaList) {
        this.areaList = areaList;
    }

    public List<EmergencyPlanDepartmentReqDTO> getDeptList() {
        return deptList;
    }

    public void setDeptList(List<EmergencyPlanDepartmentReqDTO> deptList) {
        this.deptList = deptList;
    }

    public List<EmergencyPlanFileReqDTO> getFileList() {
        return fileList;
    }

    public void setFileList(List<EmergencyPlanFileReqDTO> fileList) {
        this.fileList = fileList;
    }

    public List<EmergencyPlanTeamReqDTO> getTeamList() {
        return teamList;
    }

    public void setTeamList(List<EmergencyPlanTeamReqDTO> teamList) {
        this.teamList = teamList;
    }

    @Override
    public String toString() {
        return "EmergencyPlanReqDTO{" +
                "id=" + id +
                ", status=" + status +
                ", releaseDate=" + releaseDate +
                ", authorUid=" + authorUid +
                ", authorDeptId=" + authorDeptId +
                ", associatedDanger=" + associatedDanger +
                ", type='" + type + '\'' +
                ", level='" + level + '\'' +
                ", name='" + name + '\'' +
                ", areaList=" + areaList +
                ", deptList=" + deptList +
                ", fileList=" + fileList +
                ", teamList=" + teamList +
                '}';
    }
}

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

对比新文件
@@ -0,0 +1,44 @@
package com.gkhy.safePlatform.emergency.model.dto.req;


public class EmergencyPlanTeamReqDTO {

    private Long id;

    private Long planId;

    private Long teamId;

    public Long getId() {
        return id;
    }

    public void setId(Long id) {
        this.id = id;
    }

    public Long getPlanId() {
        return planId;
    }

    public void setPlanId(Long planId) {
        this.planId = planId;
    }

    public Long getTeamId() {
        return teamId;
    }

    public void setTeamId(Long teamId) {
        this.teamId = teamId;
    }

    @Override
    public String toString() {
        return "EmergencyPlanAreaInfo{" +
                "id=" + id +
                ", planId=" + planId +
                ", teamId=" + teamId +
                '}';
    }
}

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

对比新文件
@@ -0,0 +1,44 @@
package com.gkhy.safePlatform.emergency.model.dto.resp;


public class EmergencyPlanAreaRespDTO {

    private Long id;

    private Long planId;

    private Long areaId;

    public Long getId() {
        return id;
    }

    public void setId(Long id) {
        this.id = id;
    }

    public Long getPlanId() {
        return planId;
    }

    public void setPlanId(Long planId) {
        this.planId = planId;
    }

    public Long getAreaId() {
        return areaId;
    }

    public void setAreaId(Long areaId) {
        this.areaId = areaId;
    }

    @Override
    public String toString() {
        return "EmergencyPlanAreaRespDTO{" +
                "id=" + id +
                ", planId=" + planId +
                ", areaId=" + areaId +
                '}';
    }
}

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

对比新文件
@@ -0,0 +1,44 @@
package com.gkhy.safePlatform.emergency.model.dto.resp;


public class EmergencyPlanDepartmentRespDTO {

    private Long id;

    private Long planId;

    private Long departmentId;

    public Long getId() {
        return id;
    }

    public void setId(Long id) {
        this.id = id;
    }

    public Long getPlanId() {
        return planId;
    }

    public void setPlanId(Long planId) {
        this.planId = planId;
    }

    public Long getDepartmentId() {
        return departmentId;
    }

    public void setDepartmentId(Long areaId) {
        this.departmentId = areaId;
    }

    @Override
    public String toString() {
        return "EmergencyPlanAreaRespDTO{" +
                "id=" + id +
                ", planId=" + planId +
                ", departmentId=" + departmentId +
                '}';
    }
}

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

对比新文件
@@ -0,0 +1,159 @@
package com.gkhy.safePlatform.emergency.model.dto.resp;

import com.fasterxml.jackson.annotation.JsonFormat;

import java.util.Date;
import java.util.List;

public class EmergencyPlanDetailRespDTO {

    private Long id;

    private Integer status;

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

    private Long authorUid;

    private Long authorDeptId;

    private Boolean associatedDanger;

    private String type;

    private String level;

    private String name ;

    private List<EmergencyPlanAreaRespDTO> areaList;

    private List<EmergencyPlanDepartmentRespDTO> deptList;

    private List<EmergencyPlanFileRespDTO> fileList;

    private List<EmergencyPlanTeamRespDTO> teamList;

    public Long getId() {
        return id;
    }

    public void setId(Long id) {
        this.id = id;
    }

    public Integer getStatus() {
        return status;
    }

    public void setStatus(Integer status) {
        this.status = status;
    }

    public Date getReleaseDate() {
        return releaseDate;
    }

    public void setReleaseDate(Date releaseDate) {
        this.releaseDate = releaseDate;
    }

    public Long getAuthorUid() {
        return authorUid;
    }

    public void setAuthorUid(Long authorUid) {
        this.authorUid = authorUid;
    }

    public Long getAuthorDeptId() {
        return authorDeptId;
    }

    public void setAuthorDeptId(Long authorDeptId) {
        this.authorDeptId = authorDeptId;
    }

    public Boolean getAssociatedDanger() {
        return associatedDanger;
    }

    public void setAssociatedDanger(Boolean associatedDanger) {
        this.associatedDanger = associatedDanger;
    }

    public String getType() {
        return type;
    }

    public void setType(String type) {
        this.type = type;
    }

    public String getLevel() {
        return level;
    }

    public void setLevel(String level) {
        this.level = level;
    }

    public String getName() {
        return name;
    }

    public void setName(String name) {
        this.name = name;
    }

    public List<EmergencyPlanAreaRespDTO> getAreaList() {
        return areaList;
    }

    public void setAreaList(List<EmergencyPlanAreaRespDTO> areaList) {
        this.areaList = areaList;
    }

    public List<EmergencyPlanDepartmentRespDTO> getDeptList() {
        return deptList;
    }

    public void setDeptList(List<EmergencyPlanDepartmentRespDTO> deptList) {
        this.deptList = deptList;
    }

    public List<EmergencyPlanFileRespDTO> getFileList() {
        return fileList;
    }

    public void setFileList(List<EmergencyPlanFileRespDTO> fileList) {
        this.fileList = fileList;
    }

    public List<EmergencyPlanTeamRespDTO> getTeamList() {
        return teamList;
    }

    public void setTeamList(List<EmergencyPlanTeamRespDTO> teamList) {
        this.teamList = teamList;
    }

    @Override
    public String toString() {
        return "EmergencyPlanDetailRespDTO{" +
                "id=" + id +
                ", status=" + status +
                ", releaseDate=" + releaseDate +
                ", authorUid=" + authorUid +
                ", authorDeptId=" + authorDeptId +
                ", associatedDanger=" + associatedDanger +
                ", type='" + type + '\'' +
                ", level='" + level + '\'' +
                ", name='" + name + '\'' +
                ", areaList=" + areaList +
                ", deptList=" + deptList +
                ", fileList=" + fileList +
                ", teamList=" + teamList +
                '}';
    }
}

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

对比新文件
@@ -0,0 +1,55 @@
package com.gkhy.safePlatform.emergency.model.dto.resp;


public class EmergencyPlanFileRespDTO {

    private Long id;

    private Long planId;

    private String fileUrl;

    private String fileName;

    public Long getId() {
        return id;
    }

    public void setId(Long id) {
        this.id = id;
    }

    public Long getPlanId() {
        return planId;
    }

    public void setPlanId(Long planId) {
        this.planId = planId;
    }

    public String getFileUrl() {
        return fileUrl;
    }

    public void setFileUrl(String fileUrl) {
        this.fileUrl = fileUrl;
    }

    public String getFileName() {
        return fileName;
    }

    public void setFileName(String fileName) {
        this.fileName = fileName;
    }

    @Override
    public String toString() {
        return "EmergencyPlanFileRespDTO{" +
                "id=" + id +
                ", planId=" + planId +
                ", fileUrl='" + fileUrl + '\'' +
                ", fileName='" + fileName + '\'' +
                '}';
    }
}

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

@@ -10,7 +10,7 @@

    private String name ;

    private Byte status ;
    private Integer status ;

    private String type;

@@ -36,11 +36,11 @@
        this.name = name;
    }

    public Byte getStatus() {
    public Integer getStatus() {
        return status;
    }

    public void setStatus(Byte status) {
    public void setStatus(Integer status) {
        this.status = status;
    }


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

对比新文件
@@ -0,0 +1,44 @@
package com.gkhy.safePlatform.emergency.model.dto.resp;


public class EmergencyPlanTeamRespDTO {

    private Long id;

    private Long planId;

    private Long teamId;

    public Long getId() {
        return id;
    }

    public void setId(Long id) {
        this.id = id;
    }

    public Long getPlanId() {
        return planId;
    }

    public void setPlanId(Long planId) {
        this.planId = planId;
    }

    public Long getTeamId() {
        return teamId;
    }

    public void setTeamId(Long areaId) {
        this.teamId = areaId;
    }

    @Override
    public String toString() {
        return "EmergencyPlanAreaRespDTO{" +
                "id=" + id +
                ", planId=" + planId +
                ", teamId=" + teamId +
                '}';
    }
}

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyPlanAreaInfoRepository.java

对比新文件
@@ -0,0 +1,18 @@
package com.gkhy.safePlatform.emergency.repository;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.gkhy.safePlatform.emergency.entity.EmergencyPlanAreaInfo;
import com.gkhy.safePlatform.emergency.entity.EmergencyPlanAreaInfoDO;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;

import java.util.List;


@Repository
public interface EmergencyPlanAreaInfoRepository extends BaseMapper<EmergencyPlanAreaInfo> {

    void addEmergencyPlanArea(EmergencyPlanAreaInfo emergencyPlanAreaInfo);

    List<EmergencyPlanAreaInfoDO> selectEmergencyPlanAreaByPlanId(@Param("planId") Long planId);
}

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyPlanDepartmentInfoRepository.java

对比新文件
@@ -0,0 +1,18 @@
package com.gkhy.safePlatform.emergency.repository;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.gkhy.safePlatform.emergency.entity.EmergencyPlanDepartmentInfo;
import com.gkhy.safePlatform.emergency.entity.EmergencyPlanDepartmentInfoDO;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;

import java.util.List;


@Repository
public interface EmergencyPlanDepartmentInfoRepository extends BaseMapper<EmergencyPlanDepartmentInfo> {

    void addEmergencyPlanDepartment(EmergencyPlanDepartmentInfo emergencyPlanDepartmentInfo);

    List<EmergencyPlanDepartmentInfoDO> selectEmergencyPlanDepartmentByPlanId(@Param("planId") Long planId);
}

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyPlanFileInfoRepository.java

对比新文件
@@ -0,0 +1,18 @@
package com.gkhy.safePlatform.emergency.repository;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.gkhy.safePlatform.emergency.entity.EmergencyPlanFileInfo;
import com.gkhy.safePlatform.emergency.entity.EmergencyPlanFileInfoDO;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;

import java.util.List;


@Repository
public interface EmergencyPlanFileInfoRepository extends BaseMapper<EmergencyPlanFileInfo> {

    void addEmergencyPlanFile(EmergencyPlanFileInfo emergencyPlanFileInfo);

    List<EmergencyPlanFileInfoDO> selectEmergencyPlanFileByPlanId(@Param("planId") Long planId);
}

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyPlanInfoRepository.java

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.gkhy.safePlatform.emergency.entity.EmergencyPlanInfo;
import com.gkhy.safePlatform.emergency.entity.EmergencyPlanInfoDetailDO;
import com.gkhy.safePlatform.emergency.entity.EmergencyPlanInfoPageDO;
import com.gkhy.safePlatform.emergency.query.db.EmergencyPlanDBQuery;
import org.apache.ibatis.annotations.Param;
@@ -16,4 +17,7 @@

    List<EmergencyPlanInfoPageDO> selectEmergencyPlanList(Page<EmergencyPlanInfoPageDO> page, @Param("query") EmergencyPlanDBQuery emergencyPlanDBQuery);

    void addEmergencyPlan(EmergencyPlanInfo emergencyPlanInfo);

    EmergencyPlanInfoDetailDO selectEmergencyPlanById(@Param("id") Long id);
}

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyPlanTeamInfoRepository.java

对比新文件
@@ -0,0 +1,18 @@
package com.gkhy.safePlatform.emergency.repository;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.gkhy.safePlatform.emergency.entity.EmergencyPlanTeamInfo;
import com.gkhy.safePlatform.emergency.entity.EmergencyPlanTeamInfoDO;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;

import java.util.List;


@Repository
public interface EmergencyPlanTeamInfoRepository extends BaseMapper<EmergencyPlanTeamInfo> {

    void addEmergencyPlanTeam(EmergencyPlanTeamInfo emergencyPlanTeamInfo);

    List<EmergencyPlanTeamInfoDO> selectEmergencyPlanTeamByPlanId(@Param("planId") Long planId);
}

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

@@ -4,6 +4,7 @@
import com.gkhy.safePlatform.commons.vo.ResultVO;
import com.gkhy.safePlatform.commons.vo.SearchResultVO;
import com.gkhy.safePlatform.emergency.model.dto.req.EmergencyPlanReqDTO;
import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyPlanDetailRespDTO;
import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyPlanPageRespDTO;
import com.gkhy.safePlatform.emergency.query.EmergencyPlanQuery;

@@ -13,5 +14,7 @@

    SearchResultVO<List<EmergencyPlanPageRespDTO>> selectEmergencyPlanList(PageQuery<EmergencyPlanQuery> query);

    ResultVO<String> add(Long valueOf, EmergencyPlanReqDTO emergencyPlanReqDTO);
    ResultVO addEmergencyPlan(Long uid, EmergencyPlanReqDTO emergencyPlanReqDTO);

    ResultVO<EmergencyPlanDetailRespDTO> getEmergencyPlanById(Long id);
}

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyPlanAreaInfoService.java

对比新文件
@@ -0,0 +1,15 @@
package com.gkhy.safePlatform.emergency.service.baseService;

import com.baomidou.mybatisplus.extension.service.IService;
import com.gkhy.safePlatform.emergency.entity.EmergencyPlanAreaInfo;
import com.gkhy.safePlatform.emergency.entity.EmergencyPlanAreaInfoDO;

import java.util.List;


public interface EmergencyPlanAreaInfoService extends IService<EmergencyPlanAreaInfo> {

    void addEmergencyPlanArea(EmergencyPlanAreaInfo emergencyPlanAreaInfo);

    List<EmergencyPlanAreaInfoDO> selectEmergencyPlanAreaByPlanId(Long id);
}

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyPlanDepartmentInfoService.java

对比新文件
@@ -0,0 +1,15 @@
package com.gkhy.safePlatform.emergency.service.baseService;

import com.baomidou.mybatisplus.extension.service.IService;
import com.gkhy.safePlatform.emergency.entity.EmergencyPlanDepartmentInfo;
import com.gkhy.safePlatform.emergency.entity.EmergencyPlanDepartmentInfoDO;

import java.util.List;


public interface EmergencyPlanDepartmentInfoService extends IService<EmergencyPlanDepartmentInfo> {

    void addEmergencyPlanDepartment(EmergencyPlanDepartmentInfo emergencyPlanDepartmentInfo);

    List<EmergencyPlanDepartmentInfoDO> selectEmergencyPlanDepartmentByPlanId(Long id);
}

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyPlanFileInfoService.java

对比新文件
@@ -0,0 +1,15 @@
package com.gkhy.safePlatform.emergency.service.baseService;

import com.baomidou.mybatisplus.extension.service.IService;
import com.gkhy.safePlatform.emergency.entity.EmergencyPlanFileInfo;
import com.gkhy.safePlatform.emergency.entity.EmergencyPlanFileInfoDO;

import java.util.List;


public interface EmergencyPlanFileInfoService extends IService<EmergencyPlanFileInfo> {

    void addEmergencyPlanFile(EmergencyPlanFileInfo emergencyPlanFileInfo);

    List<EmergencyPlanFileInfoDO> selectEmergencyPlanFileByPlanId(Long id);
}

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyPlanInfoService.java

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.gkhy.safePlatform.emergency.entity.EmergencyPlanInfo;
import com.gkhy.safePlatform.emergency.entity.EmergencyPlanInfoDetailDO;
import com.gkhy.safePlatform.emergency.entity.EmergencyPlanInfoPageDO;
import com.gkhy.safePlatform.emergency.query.db.EmergencyPlanDBQuery;

@@ -12,4 +13,8 @@
public interface EmergencyPlanInfoService extends IService<EmergencyPlanInfo> {

    List<EmergencyPlanInfoPageDO> selectEmergencyPlanList(Page<EmergencyPlanInfoPageDO>  page, EmergencyPlanDBQuery emergencyPlanDBQuery);

    void addEmergencyPlan(EmergencyPlanInfo emergencyPlanInfo);

    EmergencyPlanInfoDetailDO selectEmergencyPlanById(Long id);
}

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyPlanTeamInfoService.java

对比新文件
@@ -0,0 +1,15 @@
package com.gkhy.safePlatform.emergency.service.baseService;

import com.baomidou.mybatisplus.extension.service.IService;
import com.gkhy.safePlatform.emergency.entity.EmergencyPlanTeamInfo;
import com.gkhy.safePlatform.emergency.entity.EmergencyPlanTeamInfoDO;

import java.util.List;


public interface EmergencyPlanTeamInfoService extends IService<EmergencyPlanTeamInfo> {

    void addEmergencyPlanTeam(EmergencyPlanTeamInfo emergencyPlanTeamInfo);

    List<EmergencyPlanTeamInfoDO> selectEmergencyPlanTeamByPlanId(Long id);
}

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

对比新文件
@@ -0,0 +1,31 @@
package com.gkhy.safePlatform.emergency.service.baseService.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.gkhy.safePlatform.emergency.entity.EmergencyPlanAreaInfo;
import com.gkhy.safePlatform.emergency.entity.EmergencyPlanAreaInfoDO;
import com.gkhy.safePlatform.emergency.repository.EmergencyPlanAreaInfoRepository;
import com.gkhy.safePlatform.emergency.service.baseService.EmergencyPlanAreaInfoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.List;


@Service("emergencyPlanAreaInfoService")
public class EmergencyPlanAreaInfoServiceImpl extends ServiceImpl<EmergencyPlanAreaInfoRepository, EmergencyPlanAreaInfo> implements EmergencyPlanAreaInfoService {

    @Autowired
    private EmergencyPlanAreaInfoRepository emergencyPlanAreaInfoRepository;


    @Override
    public void addEmergencyPlanArea(EmergencyPlanAreaInfo emergencyPlanAreaInfo) {
        emergencyPlanAreaInfoRepository.addEmergencyPlanArea(emergencyPlanAreaInfo);
    }

    @Override
    public List<EmergencyPlanAreaInfoDO> selectEmergencyPlanAreaByPlanId(Long id) {
        return emergencyPlanAreaInfoRepository.selectEmergencyPlanAreaByPlanId(id);
    }

}

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

对比新文件
@@ -0,0 +1,30 @@
package com.gkhy.safePlatform.emergency.service.baseService.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.gkhy.safePlatform.emergency.entity.EmergencyPlanDepartmentInfo;
import com.gkhy.safePlatform.emergency.entity.EmergencyPlanDepartmentInfoDO;
import com.gkhy.safePlatform.emergency.repository.EmergencyPlanDepartmentInfoRepository;
import com.gkhy.safePlatform.emergency.service.baseService.EmergencyPlanDepartmentInfoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.List;

@Service("emergencyPlanDepartmentInfoService")
public class EmergencyPlanDepartmentInfoServiceImpl extends ServiceImpl<EmergencyPlanDepartmentInfoRepository, EmergencyPlanDepartmentInfo> implements EmergencyPlanDepartmentInfoService {

    @Autowired
    private EmergencyPlanDepartmentInfoRepository emergencyPlanDepartmentInfoRepository;


    @Override
    public void addEmergencyPlanDepartment(EmergencyPlanDepartmentInfo emergencyPlanDepartmentInfo) {
        emergencyPlanDepartmentInfoRepository.addEmergencyPlanDepartment(emergencyPlanDepartmentInfo);
    }

    @Override
    public List<EmergencyPlanDepartmentInfoDO> selectEmergencyPlanDepartmentByPlanId(Long id) {
        return emergencyPlanDepartmentInfoRepository.selectEmergencyPlanDepartmentByPlanId(id);
    }

}

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

对比新文件
@@ -0,0 +1,30 @@
package com.gkhy.safePlatform.emergency.service.baseService.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.gkhy.safePlatform.emergency.entity.EmergencyPlanFileInfo;
import com.gkhy.safePlatform.emergency.entity.EmergencyPlanFileInfoDO;
import com.gkhy.safePlatform.emergency.repository.EmergencyPlanFileInfoRepository;
import com.gkhy.safePlatform.emergency.service.baseService.EmergencyPlanFileInfoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.List;

@Service("emergencyPlanFileInfoService")
public class EmergencyPlanFileInfoServiceImpl extends ServiceImpl<EmergencyPlanFileInfoRepository, EmergencyPlanFileInfo> implements EmergencyPlanFileInfoService {

    @Autowired
    private EmergencyPlanFileInfoRepository emergencyPlanFileInfoRepository;


    @Override
    public void addEmergencyPlanFile(EmergencyPlanFileInfo emergencyPlanFileInfo) {
        emergencyPlanFileInfoRepository.addEmergencyPlanFile(emergencyPlanFileInfo);
    }

    @Override
    public List<EmergencyPlanFileInfoDO> selectEmergencyPlanFileByPlanId(Long id) {
        return emergencyPlanFileInfoRepository.selectEmergencyPlanFileByPlanId(id);
    }

}

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

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.gkhy.safePlatform.emergency.entity.EmergencyPlanInfo;
import com.gkhy.safePlatform.emergency.entity.EmergencyPlanInfoDetailDO;
import com.gkhy.safePlatform.emergency.entity.EmergencyPlanInfoPageDO;
import com.gkhy.safePlatform.emergency.query.db.EmergencyPlanDBQuery;
import com.gkhy.safePlatform.emergency.repository.EmergencyPlanInfoRepository;
@@ -23,6 +24,15 @@
        return emergencyPlanInfoRepository.selectEmergencyPlanList(page,emergencyPlanDBQuery);
    }

    @Override
    public void addEmergencyPlan(EmergencyPlanInfo emergencyPlanInfo) {
        emergencyPlanInfoRepository.addEmergencyPlan(emergencyPlanInfo);
    }

    @Override
    public EmergencyPlanInfoDetailDO selectEmergencyPlanById(Long id) {
        return emergencyPlanInfoRepository.selectEmergencyPlanById(id);
    }


}

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

对比新文件
@@ -0,0 +1,29 @@
package com.gkhy.safePlatform.emergency.service.baseService.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.gkhy.safePlatform.emergency.entity.EmergencyPlanTeamInfo;
import com.gkhy.safePlatform.emergency.entity.EmergencyPlanTeamInfoDO;
import com.gkhy.safePlatform.emergency.repository.EmergencyPlanTeamInfoRepository;
import com.gkhy.safePlatform.emergency.service.baseService.EmergencyPlanTeamInfoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.List;

@Service("emergencyPlanTeamInfoService")
public class EmergencyPlanTeamInfoServiceImpl extends ServiceImpl<EmergencyPlanTeamInfoRepository, EmergencyPlanTeamInfo> implements EmergencyPlanTeamInfoService {

    @Autowired
    private EmergencyPlanTeamInfoRepository emergencyPlanTeamInfoRepository;


    @Override
    public void addEmergencyPlanTeam(EmergencyPlanTeamInfo emergencyPlanTeamInfo) {
        emergencyPlanTeamInfoRepository.addEmergencyPlanTeam(emergencyPlanTeamInfo);
    }

    @Override
    public List<EmergencyPlanTeamInfoDO> selectEmergencyPlanTeamByPlanId(Long id) {
        return emergencyPlanTeamInfoRepository.selectEmergencyPlanTeamByPlanId(id);
    }
}

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

@@ -6,17 +6,22 @@
import com.gkhy.safePlatform.commons.utils.BeanCopyUtils;
import com.gkhy.safePlatform.commons.vo.ResultVO;
import com.gkhy.safePlatform.commons.vo.SearchResultVO;
import com.gkhy.safePlatform.emergency.entity.EmergencyPlanInfoPageDO;
import com.gkhy.safePlatform.emergency.entity.*;
import com.gkhy.safePlatform.emergency.enums.EmergencyPlanStatus;
import com.gkhy.safePlatform.emergency.enums.EmergencyResultCodes;
import com.gkhy.safePlatform.emergency.excepiton.EmergencyException;
import com.gkhy.safePlatform.emergency.model.dto.req.EmergencyPlanReqDTO;
import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyPlanPageRespDTO;
import com.gkhy.safePlatform.emergency.model.dto.resp.*;
import com.gkhy.safePlatform.emergency.query.EmergencyPlanQuery;
import com.gkhy.safePlatform.emergency.query.db.EmergencyPlanDBQuery;
import com.gkhy.safePlatform.emergency.service.EmergencyPlanService;
import com.gkhy.safePlatform.emergency.service.baseService.EmergencyPlanInfoService;
import com.gkhy.safePlatform.emergency.service.baseService.*;
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.Date;
import java.util.List;

@Service("emergencyPlanService")
@@ -24,6 +29,18 @@

    @Autowired
    private EmergencyPlanInfoService emergencyPlanInfoService;

    @Autowired
    private EmergencyPlanAreaInfoService emergencyPlanAreaInfoService;

    @Autowired
    private EmergencyPlanDepartmentInfoService emergencyPlanDepartmentInfoService;

    @Autowired
    private EmergencyPlanTeamInfoService emergencyPlanTeamInfoService;

    @Autowired
    private EmergencyPlanFileInfoService emergencyPlanFileInfoService;

    @Override
    public SearchResultVO<List<EmergencyPlanPageRespDTO>> selectEmergencyPlanList(PageQuery<EmergencyPlanQuery> query) {
@@ -49,10 +66,107 @@
    }

    @Override
    public ResultVO<String> add(Long valueOf, EmergencyPlanReqDTO emergencyPlanReqDTO) {
        //新增应急预案
        //新增应急预案使用部门表
        //
        return null;
    public ResultVO addEmergencyPlan(Long uid, EmergencyPlanReqDTO emergencyPlanReqDTO) {
        Date nowDate = new Date();
        // 新增应急预案
        EmergencyPlanInfo emergencyPlanInfo = new EmergencyPlanInfo();
        BeanUtils.copyProperties(emergencyPlanReqDTO,emergencyPlanInfo);
        emergencyPlanInfo.setDelFlag(false);
        emergencyPlanInfo.setCreateUid(uid);
        emergencyPlanInfo.setGmtCreate(nowDate);
        emergencyPlanInfo.setStatus(EmergencyPlanStatus.START.getStatus());
        emergencyPlanInfoService.addEmergencyPlan(emergencyPlanInfo);
        // 新增应急预案区域表
        if (!CollectionUtils.isEmpty(emergencyPlanReqDTO.getAreaList())){
            List<EmergencyPlanAreaInfo> emergencyPlanAreaInfoList = BeanCopyUtils.copyBeanList(emergencyPlanReqDTO.getAreaList(),EmergencyPlanAreaInfo.class);
            emergencyPlanAreaInfoList.forEach(EmergencyPlanAreaInfo->{
                EmergencyPlanAreaInfo.setDelFlag(false);
                EmergencyPlanAreaInfo.setCreateUid(uid);
                EmergencyPlanAreaInfo.setGmtCreate(nowDate);
                EmergencyPlanAreaInfo.setPlanId(emergencyPlanInfo.getId());
            });
            for (EmergencyPlanAreaInfo emergencyPlanAreaInfo : emergencyPlanAreaInfoList){
                emergencyPlanAreaInfoService.addEmergencyPlanArea(emergencyPlanAreaInfo);
            }
        }
        // 新增应急预案适用部门表
        if (!CollectionUtils.isEmpty(emergencyPlanReqDTO.getDeptList())){
            List<EmergencyPlanDepartmentInfo> emergencyPlanDepartmentInfoList = BeanCopyUtils.copyBeanList(emergencyPlanReqDTO.getDeptList(),EmergencyPlanDepartmentInfo.class);
            emergencyPlanDepartmentInfoList.forEach(EmergencyPlanDepartmentInfo->{
                EmergencyPlanDepartmentInfo.setDelFlag(false);
                EmergencyPlanDepartmentInfo.setCreateUid(uid);
                EmergencyPlanDepartmentInfo.setGmtCreate(nowDate);
                EmergencyPlanDepartmentInfo.setPlanId(emergencyPlanInfo.getId());
            });
            for (EmergencyPlanDepartmentInfo emergencyPlanDepartmentInfo : emergencyPlanDepartmentInfoList){
                emergencyPlanDepartmentInfoService.addEmergencyPlanDepartment(emergencyPlanDepartmentInfo);
            }
        }
        // 新增应急预案附件表
        if (!CollectionUtils.isEmpty(emergencyPlanReqDTO.getFileList())){
            List<EmergencyPlanFileInfo> emergencyPlanFileInfoList = BeanCopyUtils.copyBeanList(emergencyPlanReqDTO.getFileList(),EmergencyPlanFileInfo.class);
            emergencyPlanFileInfoList.forEach(EmergencyPlanFileInfo->{
                EmergencyPlanFileInfo.setDelFlag(false);
                EmergencyPlanFileInfo.setCreateUid(uid);
                EmergencyPlanFileInfo.setGmtCreate(nowDate);
                EmergencyPlanFileInfo.setPlanId(emergencyPlanInfo.getId());
            });
            for (EmergencyPlanFileInfo emergencyPlanFileInfo : emergencyPlanFileInfoList){
                emergencyPlanFileInfoService.addEmergencyPlanFile(emergencyPlanFileInfo);
            }
        }
        // 新增应急预案应急队伍表
        if (!CollectionUtils.isEmpty(emergencyPlanReqDTO.getTeamList())){
            List<EmergencyPlanTeamInfo> emergencyPlanTeamInfoList = BeanCopyUtils.copyBeanList(emergencyPlanReqDTO.getTeamList(),EmergencyPlanTeamInfo.class);
            emergencyPlanTeamInfoList.forEach(EmergencyPlanTeamInfo->{
                EmergencyPlanTeamInfo.setDelFlag(false);
                EmergencyPlanTeamInfo.setCreateUid(uid);
                EmergencyPlanTeamInfo.setGmtCreate(nowDate);
                EmergencyPlanTeamInfo.setPlanId(emergencyPlanInfo.getId());
            });
            for (EmergencyPlanTeamInfo emergencyPlanTeamInfo : emergencyPlanTeamInfoList){
                emergencyPlanTeamInfoService.addEmergencyPlanTeam(emergencyPlanTeamInfo);
            }
        }

        return new ResultVO<>(ResultCodes.OK);
    }

    @Override
    public ResultVO<EmergencyPlanDetailRespDTO> getEmergencyPlanById(Long id) {
        EmergencyPlanDetailRespDTO emergencyPlanDetailRespDTO = new EmergencyPlanDetailRespDTO();
        // 查询是否存在
        EmergencyPlanInfoDetailDO emergencyPlanInfoDetailDO = emergencyPlanInfoService.selectEmergencyPlanById(id);
        if (emergencyPlanInfoDetailDO==null){
            throw new EmergencyException(EmergencyResultCodes.PLAN_NOT_EXIST);
        }else{
            BeanUtils.copyProperties(emergencyPlanInfoDetailDO,emergencyPlanDetailRespDTO);

            // 查找对应的区域
            List<EmergencyPlanAreaInfoDO> emergencyPlanAreaInfoDOList = emergencyPlanAreaInfoService.selectEmergencyPlanAreaByPlanId(id);
            if (!CollectionUtils.isEmpty(emergencyPlanAreaInfoDOList)){
                List<EmergencyPlanAreaRespDTO> emergencyTeamFileRespDTOList = BeanCopyUtils.copyBeanList(emergencyPlanAreaInfoDOList , EmergencyPlanAreaRespDTO.class);
                emergencyPlanDetailRespDTO.setAreaList(emergencyTeamFileRespDTOList);
            }
            // 查找对应的适用部门
            List<EmergencyPlanDepartmentInfoDO> emergencyPlanDepartmentInfoDOList = emergencyPlanDepartmentInfoService.selectEmergencyPlanDepartmentByPlanId(id);
            if (!CollectionUtils.isEmpty(emergencyPlanDepartmentInfoDOList)){
                List<EmergencyPlanDepartmentRespDTO> emergencyTeamDepartmentRespDTOList = BeanCopyUtils.copyBeanList(emergencyPlanDepartmentInfoDOList , EmergencyPlanDepartmentRespDTO.class);
                emergencyPlanDetailRespDTO.setDeptList(emergencyTeamDepartmentRespDTOList);
            }
            // 查找对应的应急队伍
            List<EmergencyPlanTeamInfoDO> emergencyPlanTeamInfoDOList = emergencyPlanTeamInfoService.selectEmergencyPlanTeamByPlanId(id);
            if (!CollectionUtils.isEmpty(emergencyPlanTeamInfoDOList)){
                List<EmergencyPlanTeamRespDTO> emergencyTeamTeamRespDTOList = BeanCopyUtils.copyBeanList(emergencyPlanTeamInfoDOList , EmergencyPlanTeamRespDTO.class);
                emergencyPlanDetailRespDTO.setTeamList(emergencyTeamTeamRespDTOList);
            }
            // 查找对应的附件
            List<EmergencyPlanFileInfoDO> emergencyPlanFileInfoDOList = emergencyPlanFileInfoService.selectEmergencyPlanFileByPlanId(id);
            if (!CollectionUtils.isEmpty(emergencyPlanFileInfoDOList)){
                List<EmergencyPlanFileRespDTO> emergencyTeamFileRespDTOList = BeanCopyUtils.copyBeanList(emergencyPlanFileInfoDOList , EmergencyPlanFileRespDTO.class);
                emergencyPlanDetailRespDTO.setFileList(emergencyTeamFileRespDTOList);
            }
            return new ResultVO<>(ResultCodes.OK,emergencyPlanDetailRespDTO);
        }
    }
}

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

@@ -95,10 +95,13 @@
        emergencyTeamInfo.setGmtCreate(nowDate);
        emergencyTeamInfoService.addEmergencyTeam(emergencyTeamInfo);
        //2.新增应急队伍附件
        addEmergencyTeamFile(emergencyTeamInfo.getId(),uid,nowDate,emergencyTeamReqDTO.getFileList());
        if (!CollectionUtils.isEmpty(emergencyTeamReqDTO.getFileList())){
            addEmergencyTeamFile(emergencyTeamInfo.getId(),uid,nowDate,emergencyTeamReqDTO.getFileList());
        }
        //3.新增应急队伍人员
        addEmergencyTeamMember(emergencyTeamInfo.getId(),uid,nowDate,emergencyTeamReqDTO.getMemberList());

        if (!CollectionUtils.isEmpty(emergencyTeamReqDTO.getMemberList())){
            addEmergencyTeamMember(emergencyTeamInfo.getId(),uid,nowDate,emergencyTeamReqDTO.getMemberList());
        }
        return new ResultVO(ResultCodes.OK);
    }


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

对比新文件
@@ -0,0 +1,41 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.gkhy.safePlatform.emergency.repository.EmergencyPlanAreaInfoRepository">


    <insert id="addEmergencyPlanArea">
        insert into emergency_plan_area
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null ">id,</if>
            <if test="delFlag != null ">del_flag,</if>
            <if test="gmtCreate != null ">gmt_create,</if>
            <if test="gmtModitify != null ">gmt_moditify,</if>
            <if test="createUid != null ">create_uid,</if>
            <if test="updateUid != null ">update_uid,</if>
            <if test="planId != null ">plan_id,</if>
            <if test="areaId != null ">area_id,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="id != null ">#{id},</if>
            <if test="delFlag != null ">#{delFlag},</if>
            <if test="gmtCreate != null ">#{gmtCreate},</if>
            <if test="gmtModitify != null ">#{gmtModitify},</if>
            <if test="createUid != null ">#{createUid},</if>
            <if test="updateUid != null ">#{updateUid},</if>
            <if test="planId != null ">#{planId},</if>
            <if test="areaId != null ">#{areaId},</if>
        </trim>
    </insert>

    <resultMap type="com.gkhy.safePlatform.emergency.entity.EmergencyPlanAreaInfoDO" id="emergencyPlanAreaInfoDOResult">
        <id column="id" property="id" jdbcType="BIGINT"/>
        <result column="plan_id" property="planId"/>
        <result column="area_id" property="areaId"/>
    </resultMap>

    <select id="selectEmergencyPlanAreaByPlanId" resultMap="emergencyPlanAreaInfoDOResult">
        select id , plan_id , area_id from emergency_plan_area where plan_id=#{planId}
    </select>
</mapper>

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

对比新文件
@@ -0,0 +1,42 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.gkhy.safePlatform.emergency.repository.EmergencyPlanDepartmentInfoRepository">

    <insert id="addEmergencyPlanDepartment">
        insert into emergency_plan_department
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null ">id,</if>
            <if test="delFlag != null ">del_flag,</if>
            <if test="gmtCreate != null ">gmt_create,</if>
            <if test="gmtModitify != null ">gmt_moditify,</if>
            <if test="createUid != null ">create_uid,</if>
            <if test="updateUid != null ">update_uid,</if>
            <if test="planId != null ">plan_id,</if>
            <if test="departmentId != null ">department_id,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="id != null ">#{id},</if>
            <if test="delFlag != null ">#{delFlag},</if>
            <if test="gmtCreate != null ">#{gmtCreate},</if>
            <if test="gmtModitify != null ">#{gmtModitify},</if>
            <if test="createUid != null ">#{createUid},</if>
            <if test="updateUid != null ">#{updateUid},</if>
            <if test="planId != null ">#{planId},</if>
            <if test="departmentId != null ">#{departmentId},</if>
        </trim>
    </insert>


    <resultMap type="com.gkhy.safePlatform.emergency.entity.EmergencyPlanDepartmentInfoDO" id="emergencyPlanDepartmentInfoDOResult">
        <id column="id" property="id" jdbcType="BIGINT"/>
        <result column="plan_id" property="planId"/>
        <result column="department_id" property="departmentId"/>
    </resultMap>

    <select id="selectEmergencyPlanDepartmentByPlanId" resultMap="emergencyPlanDepartmentInfoDOResult">
        select id , plan_id , department_id from emergency_plan_department where plan_id=#{planId}
    </select>

</mapper>

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

对比新文件
@@ -0,0 +1,43 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.gkhy.safePlatform.emergency.repository.EmergencyPlanFileInfoRepository">

    <insert id="addEmergencyPlanFile">
        insert into emergency_plan_file
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null ">id,</if>
            <if test="delFlag != null ">del_flag,</if>
            <if test="gmtCreate != null ">gmt_create,</if>
            <if test="gmtModitify != null ">gmt_moditify,</if>
            <if test="createUid != null ">create_uid,</if>
            <if test="updateUid != null ">update_uid,</if>
            <if test="planId != null ">plan_id,</if>
            <if test="fileUrl != null and fileUrl != ''">file_url,</if>
            <if test="fileName != null and fileName != ''">file_name</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="id != null ">#{id},</if>
            <if test="delFlag != null ">#{delFlag},</if>
            <if test="gmtCreate != null ">#{gmtCreate},</if>
            <if test="gmtModitify != null ">#{gmtModitify},</if>
            <if test="createUid != null ">#{createUid},</if>
            <if test="updateUid != null ">#{updateUid},</if>
            <if test="planId != null ">#{planId},</if>
            <if test="fileUrl != null and fileUrl != ''">#{fileUrl},</if>
            <if test="fileName != null and fileName != ''">#{fileName}</if>
        </trim>
    </insert>

    <resultMap type="com.gkhy.safePlatform.emergency.entity.EmergencyPlanFileInfoDO" id="emergencyPlanFileInfoDOResult">
        <id column="id" property="id" jdbcType="BIGINT"/>
        <result column="plan_id" property="planId" />
        <result column="file_url" property="fileUrl" />
        <result column="file_name" property="fileName" />
    </resultMap>

    <select id="selectEmergencyPlanFileByPlanId" resultMap="emergencyPlanFileInfoDOResult">
        select id,`plan_id`,`file_url`,`file_name` from emergency_plan_file where del_flag = 0 and plan_id = #{planId}
    </select>
</mapper>

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

@@ -4,31 +4,73 @@
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.gkhy.safePlatform.emergency.repository.EmergencyPlanInfoRepository">

    <resultMap type="com.gkhy.safePlatform.emergency.entity.EmergencyPlanInfoPageDO" id="pageResult">
    <resultMap type="com.gkhy.safePlatform.emergency.entity.EmergencyPlanInfoPageDO" id="emergencyPlanInfoPageDOResult">
        <id column="id" property="id" jdbcType="BIGINT"/>
        <result column="name" property="name" />
        <result column="status" property="status" />
        <result column="type" property="type" />
        <result column="level" property="level" />
        <result column="release_date" property="releaseDate" />
        <result column="name" property="name"/>
        <result column="status" property="status"/>
        <result column="type" property="type"/>
        <result column="level" property="level"/>
        <result column="release_date" property="releaseDate"/>
    </resultMap>

    <resultMap type="com.gkhy.safePlatform.emergency.entity.EmergencyPlanInfoDetailDO" id="detailResult">
        <id column="id" property="id" jdbcType="BIGINT"/>
        <result column="name" property="name" />
        <result column="status" property="status" />
        <result column="type" property="type" />
        <result column="level" property="level" />
        <result column="release_date" property="releaseDate" />
        <result column="author_uid" property="authorUid" />
        <result column="author_dept_id" property="authorDeptId" />
        <result column="associated_danger" property="associatedDanger" />
    </resultMap>

    <select id="selectEmergencyPlanList" resultMap="pageResult">
        select id,`name`,`type`,`level`,release_date from emergency_plan where del_flag = 0
        <if test="query.name != null  and query.name != ''"> and `name` like concat('%', #{query.name}, '%')</if>
        <if test="query.type != null  and query.type != ''"> and `type` = #{query.type}</if>
    <select id="selectEmergencyPlanList" resultMap="emergencyPlanInfoPageDOResult">
        select id,`name`,`status`,`type`,`level`,release_date from emergency_plan where del_flag = 0
        <if test="query.name != null  and query.name != ''">and `name` like concat('%', #{query.name}, '%')</if>
        <if test="query.type != null  and query.type != ''">and `type` = #{query.type}</if>
    </select>

    <insert id="addEmergencyPlan" parameterType="com.gkhy.safePlatform.emergency.entity.EmergencyPlanInfo"
            keyProperty="id" useGeneratedKeys="true">
        insert into emergency_plan
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null ">id,</if>
            <if test="delFlag != null ">del_flag,</if>
            <if test="gmtCreate != null ">gmt_create,</if>
            <if test="gmtModitify != null ">gmt_moditify,</if>
            <if test="createUid != null ">create_uid,</if>
            <if test="updateUid != null ">update_uid,</if>
            <if test="status != null ">status,</if>
            <if test="releaseDate != null ">release_date,</if>
            <if test="authorUid != null ">author_uid,</if>
            <if test="authorDeptId != null ">author_dept_id,</if>
            <if test="associatedDanger != null ">associated_danger,</if>
            <if test="type != null and type != ''">`type`,</if>
            <if test="level != null and level != ''">`level`,</if>
            <if test="name != null and name != ''">`name`,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="id != null ">#{id},</if>
            <if test="delFlag != null ">#{delFlag},</if>
            <if test="gmtCreate != null ">#{gmtCreate},</if>
            <if test="gmtModitify != null ">#{gmtModitify},</if>
            <if test="createUid != null ">#{createUid},</if>
            <if test="updateUid != null ">#{updateUid},</if>
            <if test="status != null ">#{status},</if>
            <if test="releaseDate != null ">#{releaseDate},</if>
            <if test="authorUid != null ">#{authorUid},</if>
            <if test="authorDeptId != null ">#{authorDeptId},</if>
            <if test="associatedDanger!= null ">#{associatedDanger},</if>
            <if test="type != null and type != ''">#{type},</if>
            <if test="level != null and level != ''">#{level},</if>
            <if test="name != null and name != ''">#{name},</if>
        </trim>
    </insert>


    <resultMap type="com.gkhy.safePlatform.emergency.entity.EmergencyPlanInfoDetailDO" id="emergencyPlanInfoDetailDOResult">
        <id column="id" property="id" jdbcType="BIGINT"/>
        <result column="name" property="name"/>
        <result column="status" property="status"/>
        <result column="type" property="type"/>
        <result column="level" property="level"/>
        <result column="release_date" property="releaseDate"/>
        <result column="author_uid" property="authorUid"/>
        <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
        where del_flag = 0 and id = #{id}
    </select>
</mapper>

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

对比新文件
@@ -0,0 +1,41 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.gkhy.safePlatform.emergency.repository.EmergencyPlanTeamInfoRepository">

    <insert id="addEmergencyPlanTeam">
        insert into emergency_plan_team
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null ">id,</if>
            <if test="delFlag != null ">del_flag,</if>
            <if test="gmtCreate != null ">gmt_create,</if>
            <if test="gmtModitify != null ">gmt_moditify,</if>
            <if test="createUid != null ">create_uid,</if>
            <if test="updateUid != null ">update_uid,</if>
            <if test="planId != null ">plan_id,</if>
            <if test="teamId != null ">team_id,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="id != null ">#{id},</if>
            <if test="delFlag != null ">#{delFlag},</if>
            <if test="gmtCreate != null ">#{gmtCreate},</if>
            <if test="gmtModitify != null ">#{gmtModitify},</if>
            <if test="createUid != null ">#{createUid},</if>
            <if test="updateUid != null ">#{updateUid},</if>
            <if test="planId != null ">#{planId},</if>
            <if test="teamId != null ">#{teamId},</if>
        </trim>
    </insert>

    <resultMap type="com.gkhy.safePlatform.emergency.entity.EmergencyPlanTeamInfoDO" id="emergencyPlanTeamInfoDOResult">
        <id column="id" property="id" jdbcType="BIGINT"/>
        <result column="plan_id" property="planId"/>
        <result column="team_id" property="teamId"/>
    </resultMap>

    <select id="selectEmergencyPlanTeamByPlanId" resultMap="emergencyPlanTeamInfoDOResult">
        select id ,plan_id ,team_id  from emergency_plan_team where plan_id=#{planId}
    </select>

</mapper>