songhuangfeng123
2022-07-14 de03b5c7c7100edac5c441e58bda85f291f35c96
应急物资保养
已修改1个文件
已添加23个文件
1313 ■■■■■ 文件已修改
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencySuppliesMaintainController.java 66 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencySuppliesMaintainInfo.java 111 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencySuppliesMaintainInfoDetailDO.java 60 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencySuppliesMaintainInfoPageDO.java 60 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencySuppliesMaintainUserInfo.java 100 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencySuppliesMaintainUserInfoDO.java 51 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/EmergencyResultCodes.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesMaintainReqDTO.java 67 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesMaintainUserReqDTO.java 43 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesMaintainDetailRespDTO.java 71 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesMaintainPageRespDTO.java 60 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesMaintainUserRespDTO.java 42 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencySuppliesMaintainQuery.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/db/EmergencySuppliesMaintainDBQuery.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencySuppliesMaintainInfoRepository.java 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencySuppliesMaintainUserInfoRepository.java 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencySuppliesMaintainService.java 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencySuppliesMaintainInfoService.java 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencySuppliesMaintainUserInfoService.java 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencySuppliesMaintainInfoServiceImpl.java 48 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencySuppliesMaintainUserInfoServiceImpl.java 40 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencySuppliesMaintainServiceImpl.java 222 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencySuppliesMaintainInfoMapper.xml 73 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencySuppliesMaintainUserInfoMapper.xml 52 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencySuppliesMaintainController.java
对比新文件
@@ -0,0 +1,66 @@
package com.gkhy.safePlatform.emergency.controller;
import com.gkhy.safePlatform.commons.query.PageQuery;
import com.gkhy.safePlatform.commons.utils.PageUtils;
import com.gkhy.safePlatform.commons.vo.ResultVO;
import com.gkhy.safePlatform.emergency.model.dto.req.EmergencySuppliesMaintainReqDTO;
import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencySuppliesMaintainDetailRespDTO;
import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencySuppliesMaintainPageRespDTO;
import com.gkhy.safePlatform.emergency.query.EmergencySuppliesMaintainQuery;
import com.gkhy.safePlatform.emergency.service.EmergencySuppliesMaintainService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.security.Principal;
import java.util.List;
@RestController
@RequestMapping("/emergencySuppliesMaintain")
public class EmergencySuppliesMaintainController {
    @Autowired
    private EmergencySuppliesMaintainService emergencySuppliesMaintainService;
    /**
     * 应急物资检查列表
     */
    @RequestMapping(value = "/page/list" ,method = RequestMethod.POST)
    private ResultVO<List<EmergencySuppliesMaintainPageRespDTO>> list (@RequestBody PageQuery<EmergencySuppliesMaintainQuery> pageQuery){
        PageUtils.checkCheck(pageQuery.getPageIndex(), pageQuery.getPageSize());
        return  emergencySuppliesMaintainService.selectEmergencySuppliesMaintainList(pageQuery);
    }
    /**
     * 应急物资检查新增
     */
    @RequestMapping(value = "/add",method = RequestMethod.POST)
    public ResultVO addEmergencySuppliesMaintain(Principal principal, @RequestBody EmergencySuppliesMaintainReqDTO emergencySuppliesMaintainReqDTO) {
        String uid = principal.getName();
        return emergencySuppliesMaintainService.addEmergencySuppliesMaintain(Long.valueOf(uid), emergencySuppliesMaintainReqDTO);
    }
    /**
     * 应急物资检查详情
     */
    @RequestMapping(value = "/info/{id}",method = RequestMethod.GET)
    public ResultVO<EmergencySuppliesMaintainDetailRespDTO> getEmergencySuppliesMaintainById(@PathVariable("id")Long id){
        return emergencySuppliesMaintainService.getEmergencySuppliesMaintainById(id);
    }
    /**
     * 应急物资检查修改
     */
    @RequestMapping(value = "/update",method = RequestMethod.POST)
    public ResultVO updateEmergencySuppliesMaintain(Principal principal, @RequestBody EmergencySuppliesMaintainReqDTO emergencySuppliesMaintainReqDTO) {
        String uid = principal.getName();
        return emergencySuppliesMaintainService.updateEmergencySuppliesMaintain(Long.valueOf(uid), emergencySuppliesMaintainReqDTO);
    }
    /**
     * 应急物资检查删除/批量删除
     */
    @RequestMapping(value = "/batchDelete/{ids}",method = RequestMethod.GET)
    public ResultVO batchDeleteEmergencySuppliesMaintain(@PathVariable("ids")String ids){
        return emergencySuppliesMaintainService.batchDeleteEmergencySuppliesMaintain(ids);
    }
}
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencySuppliesMaintainInfo.java
对比新文件
@@ -0,0 +1,111 @@
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_supplies_maintain")
public class EmergencySuppliesMaintainInfo {
    @TableId(type = IdType.AUTO)
    private Long id;
    private Boolean delFlag;
    private Date gmtCreate;
    private Date gmtModitify;
    private Long createUid;
    private Long updateUid;
    private Long suppliesId;
    private String maintainResult;
    private Date maintainTime;
    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 getSuppliesId() {
        return suppliesId;
    }
    public void setSuppliesId(Long suppliesId) {
        this.suppliesId = suppliesId;
    }
    public String getMaintainResult() {
        return maintainResult;
    }
    public void setMaintainResult(String maintainResult) {
        this.maintainResult = maintainResult;
    }
    public Date getMaintainTime() {
        return maintainTime;
    }
    public void setMaintainTime(Date maintainTime) {
        this.maintainTime = maintainTime;
    }
    @Override
    public String toString() {
        return "EmergencySuppliesMaintainInfo{" +
                "id=" + id +
                ", delFlag=" + delFlag +
                ", gmtCreate=" + gmtCreate +
                ", gmtModitify=" + gmtModitify +
                ", createUid=" + createUid +
                ", updateUid=" + updateUid +
                ", suppliesId=" + suppliesId +
                ", maintainResult='" + maintainResult + '\'' +
                ", maintainTime=" + maintainTime +
                '}';
    }
}
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencySuppliesMaintainInfoDetailDO.java
对比新文件
@@ -0,0 +1,60 @@
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_supplies_maintain")
public class EmergencySuppliesMaintainInfoDetailDO {
    @TableId(type = IdType.AUTO)
    private Long id;
    private Long suppliesId;
    private String maintainResult;
    private Date maintainTime;
    public Long getId() {
        return id;
    }
    public void setId(Long id) {
        this.id = id;
    }
    public Long getSuppliesId() {
        return suppliesId;
    }
    public void setSuppliesId(Long suppliesId) {
        this.suppliesId = suppliesId;
    }
    public String getMaintainResult() {
        return maintainResult;
    }
    public void setMaintainResult(String maintainResult) {
        this.maintainResult = maintainResult;
    }
    public Date getMaintainTime() {
        return maintainTime;
    }
    public void setMaintainTime(Date maintainTime) {
        this.maintainTime = maintainTime;
    }
    @Override
    public String toString() {
        return "EmergencySuppliesMaintainInfoDetailDO{" +
                "id=" + id +
                ", suppliesId=" + suppliesId +
                ", maintainResult='" + maintainResult + '\'' +
                ", maintainTime=" + maintainTime +
                '}';
    }
}
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencySuppliesMaintainInfoPageDO.java
对比新文件
@@ -0,0 +1,60 @@
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_supplies_maintain")
public class EmergencySuppliesMaintainInfoPageDO {
    @TableId(type = IdType.AUTO)
    private Long id;
    private Long suppliesId;
    private String maintainResult;
    private Date maintainTime;
    public Long getId() {
        return id;
    }
    public void setId(Long id) {
        this.id = id;
    }
    public Long getSuppliesId() {
        return suppliesId;
    }
    public void setSuppliesId(Long suppliesId) {
        this.suppliesId = suppliesId;
    }
    public String getMaintainResult() {
        return maintainResult;
    }
    public void setMaintainResult(String maintainResult) {
        this.maintainResult = maintainResult;
    }
    public Date getMaintainTime() {
        return maintainTime;
    }
    public void setMaintainTime(Date maintainTime) {
        this.maintainTime = maintainTime;
    }
    @Override
    public String toString() {
        return "EmergencySuppliesMaintainInfoDetailDO{" +
                "id=" + id +
                ", suppliesId=" + suppliesId +
                ", maintainResult='" + maintainResult + '\'' +
                ", maintainTime=" + maintainTime +
                '}';
    }
}
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencySuppliesMaintainUserInfo.java
对比新文件
@@ -0,0 +1,100 @@
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_supplies_maintain")
public class EmergencySuppliesMaintainUserInfo {
    @TableId(type = IdType.AUTO)
    private Long id;
    private Boolean delFlag;
    private Date gmtCreate;
    private Date gmtModitify;
    private Long createUid;
    private Long updateUid;
    private Long maintainId;
    private Long userUid;
    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 getMaintainId() {
        return maintainId;
    }
    public void setMaintainId(Long maintainId) {
        this.maintainId = maintainId;
    }
    public Long getUserUid() {
        return userUid;
    }
    public void setUserUid(Long userUid) {
        this.userUid = userUid;
    }
    @Override
    public String toString() {
        return "EmergencySuppliesMaintainUserInfo{" +
                "id=" + id +
                ", delFlag=" + delFlag +
                ", gmtCreate=" + gmtCreate +
                ", gmtModitify=" + gmtModitify +
                ", createUid=" + createUid +
                ", updateUid=" + updateUid +
                ", maintainId=" + maintainId +
                ", userUid=" + userUid +
                '}';
    }
}
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencySuppliesMaintainUserInfoDO.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_supplies_maintain")
public class EmergencySuppliesMaintainUserInfoDO {
    @TableId(type = IdType.AUTO)
    private Long id;
    private Long maintainId;
    private Long userUid;
    public Long getId() {
        return id;
    }
    public void setId(Long id) {
        this.id = id;
    }
    public Long getMaintainId() {
        return maintainId;
    }
    public void setMaintainId(Long maintainId) {
        this.maintainId = maintainId;
    }
    public Long getUserUid() {
        return userUid;
    }
    public void setUserUid(Long userUid) {
        this.userUid = userUid;
    }
    @Override
    public String toString() {
        return "EmergencySuppliesMaintainUserInfo{" +
                "id=" + id +
                ", maintainId=" + maintainId +
                ", userUid=" + userUid +
                '}';
    }
}
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/EmergencyResultCodes.java
@@ -56,6 +56,10 @@
    SUPPLIES_INSPECT_NOT_EXIST("S1004" , "应急物资检查不存在"),
    SUPPLIES_MAINTAIN_NULL("S1005" , "应急物资保养不可为空"),
    SUPPLIES_MAINTAIN_NOT_EXIST("S1006" , "应急物资保养不存在"),
    ERROR("A3000", "未知错误");
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesMaintainReqDTO.java
对比新文件
@@ -0,0 +1,67 @@
package com.gkhy.safePlatform.emergency.model.dto.req;
import java.util.Date;
import java.util.List;
public class EmergencySuppliesMaintainReqDTO {
    private Long id;
    private Long suppliesId;
    private String maintainResult;
    private Date maintainTime;
    private List<EmergencySuppliesMaintainUserReqDTO> userList;
    public Long getId() {
        return id;
    }
    public void setId(Long id) {
        this.id = id;
    }
    public Long getSuppliesId() {
        return suppliesId;
    }
    public void setSuppliesId(Long suppliesId) {
        this.suppliesId = suppliesId;
    }
    public String getMaintainResult() {
        return maintainResult;
    }
    public void setMaintainResult(String maintainResult) {
        this.maintainResult = maintainResult;
    }
    public Date getMaintainTime() {
        return maintainTime;
    }
    public void setMaintainTime(Date maintainTime) {
        this.maintainTime = maintainTime;
    }
    public List<EmergencySuppliesMaintainUserReqDTO> getUserList() {
        return userList;
    }
    public void setUserList(List<EmergencySuppliesMaintainUserReqDTO> userList) {
        this.userList = userList;
    }
    @Override
    public String toString() {
        return "EmergencySuppliesMaintainReqDTO{" +
                "id=" + id +
                ", suppliesId=" + suppliesId +
                ", maintainResult='" + maintainResult + '\'' +
                ", maintainTime=" + maintainTime +
                ", userList=" + userList +
                '}';
    }
}
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesMaintainUserReqDTO.java
对比新文件
@@ -0,0 +1,43 @@
package com.gkhy.safePlatform.emergency.model.dto.req;
public class EmergencySuppliesMaintainUserReqDTO {
    private Long id;
    private Long maintainId;
    private Long userUid;
    public Long getId() {
        return id;
    }
    public void setId(Long id) {
        this.id = id;
    }
    public Long getMaintainId() {
        return maintainId;
    }
    public void setMaintainId(Long maintainId) {
        this.maintainId = maintainId;
    }
    public Long getUserUid() {
        return userUid;
    }
    public void setUserUid(Long userUid) {
        this.userUid = userUid;
    }
    @Override
    public String toString() {
        return "EmergencySuppliesInspectUserReqDTO{" +
                "id=" + id +
                ", maintainId=" + maintainId +
                ", userUid=" + userUid +
                '}';
    }
}
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesMaintainDetailRespDTO.java
对比新文件
@@ -0,0 +1,71 @@
package com.gkhy.safePlatform.emergency.model.dto.resp;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
import java.util.List;
public class EmergencySuppliesMaintainDetailRespDTO {
    private Long id;
    private Long suppliesId;
    private String maintainResult;
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date maintainTime;
    private List<EmergencySuppliesMaintainUserRespDTO> userList;
    public Long getId() {
        return id;
    }
    public void setId(Long id) {
        this.id = id;
    }
    public Long getSuppliesId() {
        return suppliesId;
    }
    public void setSuppliesId(Long suppliesId) {
        this.suppliesId = suppliesId;
    }
    public String getMaintainResult() {
        return maintainResult;
    }
    public void setMaintainResult(String maintainResult) {
        this.maintainResult = maintainResult;
    }
    public Date getMaintainTime() {
        return maintainTime;
    }
    public void setMaintainTime(Date maintainTime) {
        this.maintainTime = maintainTime;
    }
    public List<EmergencySuppliesMaintainUserRespDTO> getUserList() {
        return userList;
    }
    public void setUserList(List<EmergencySuppliesMaintainUserRespDTO> userList) {
        this.userList = userList;
    }
    @Override
    public String toString() {
        return "EmergencySuppliesMaintainDetailRespDTO{" +
                "id=" + id +
                ", suppliesId=" + suppliesId +
                ", maintainResult='" + maintainResult + '\'' +
                ", maintainTime=" + maintainTime +
                ", userList=" + userList +
                '}';
    }
}
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesMaintainPageRespDTO.java
对比新文件
@@ -0,0 +1,60 @@
package com.gkhy.safePlatform.emergency.model.dto.resp;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
public class EmergencySuppliesMaintainPageRespDTO {
    private Long id;
    private Long suppliesId;
    private String maintainResult;
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date maintainTime;
    public Long getId() {
        return id;
    }
    public void setId(Long id) {
        this.id = id;
    }
    public Long getSuppliesId() {
        return suppliesId;
    }
    public void setSuppliesId(Long suppliesId) {
        this.suppliesId = suppliesId;
    }
    public String getMaintainResult() {
        return maintainResult;
    }
    public void setMaintainResult(String maintainResult) {
        this.maintainResult = maintainResult;
    }
    public Date getMaintainTime() {
        return maintainTime;
    }
    public void setMaintainTime(Date maintainTime) {
        this.maintainTime = maintainTime;
    }
    @Override
    public String toString() {
        return "EmergencySuppliesMaintainDetailRespDTO{" +
                "id=" + id +
                ", suppliesId=" + suppliesId +
                ", maintainResult='" + maintainResult + '\'' +
                ", maintainTime=" + maintainTime +
                '}';
    }
}
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesMaintainUserRespDTO.java
对比新文件
@@ -0,0 +1,42 @@
package com.gkhy.safePlatform.emergency.model.dto.resp;
public class EmergencySuppliesMaintainUserRespDTO {
    private Long id;
    private Long maintainId;
    private Long userUid;
    public Long getId() {
        return id;
    }
    public void setId(Long id) {
        this.id = id;
    }
    public Long getMaintainId() {
        return maintainId;
    }
    public void setMaintainId(Long maintainId) {
        this.maintainId = maintainId;
    }
    public Long getUserUid() {
        return userUid;
    }
    public void setUserUid(Long userUid) {
        this.userUid = userUid;
    }
    @Override
    public String toString() {
        return "EmergencySuppliesMaintainUserRespDTO{" +
                "id=" + id +
                ", maintainId=" + maintainId +
                ", userUid=" + userUid +
                '}';
    }
}
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencySuppliesMaintainQuery.java
对比新文件
@@ -0,0 +1,14 @@
package com.gkhy.safePlatform.emergency.query;
public class EmergencySuppliesMaintainQuery {
    private Long suppliesId ;
    public Long getSuppliesId() {
        return suppliesId;
    }
    public void setSuppliesId(Long suppliesId) {
        this.suppliesId = suppliesId;
    }
}
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/db/EmergencySuppliesMaintainDBQuery.java
对比新文件
@@ -0,0 +1,14 @@
package com.gkhy.safePlatform.emergency.query.db;
public class EmergencySuppliesMaintainDBQuery {
    private Long suppliesId ;
    public Long getSuppliesId() {
        return suppliesId;
    }
    public void setSuppliesId(Long suppliesId) {
        this.suppliesId = suppliesId;
    }
}
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencySuppliesMaintainInfoRepository.java
对比新文件
@@ -0,0 +1,26 @@
package com.gkhy.safePlatform.emergency.repository;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.gkhy.safePlatform.emergency.entity.EmergencySuppliesMaintainInfo;
import com.gkhy.safePlatform.emergency.entity.EmergencySuppliesMaintainInfoDetailDO;
import com.gkhy.safePlatform.emergency.entity.EmergencySuppliesMaintainInfoPageDO;
import com.gkhy.safePlatform.emergency.query.db.EmergencySuppliesMaintainDBQuery;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.util.List;
@Repository
public interface EmergencySuppliesMaintainInfoRepository extends BaseMapper<EmergencySuppliesMaintainInfo> {
    List<EmergencySuppliesMaintainInfoPageDO> selectEmergencySuppliesMaintainList(Page<EmergencySuppliesMaintainInfoPageDO> page, @Param("query") EmergencySuppliesMaintainDBQuery emergencySuppliesMaintainDBQuery);
    void addEmergencySuppliesMaintain(EmergencySuppliesMaintainInfo emergencySuppliesMaintainInfo);
    EmergencySuppliesMaintainInfoDetailDO selectEmergencySuppliesMaintainById(@Param("id") Long id);
    void updateEmergencySuppliesMaintain(EmergencySuppliesMaintainInfo emergencySuppliesMaintainInfo);
    void deleteEmergencySuppliesMaintain(@Param("id") Long id);
}
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencySuppliesMaintainUserInfoRepository.java
对比新文件
@@ -0,0 +1,22 @@
package com.gkhy.safePlatform.emergency.repository;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.gkhy.safePlatform.emergency.entity.EmergencySuppliesMaintainUserInfo;
import com.gkhy.safePlatform.emergency.entity.EmergencySuppliesMaintainUserInfoDO;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.util.List;
@Repository
public interface EmergencySuppliesMaintainUserInfoRepository extends BaseMapper<EmergencySuppliesMaintainUserInfo> {
    void addEmergencySuppliesMaintainUser(EmergencySuppliesMaintainUserInfo emergencySuppliesMaintainUserInfo);
    List<EmergencySuppliesMaintainUserInfoDO> selectEmergencySuppliesMaintainUserBySuppliesMaintainId(@Param("suppliesMaintainId") Long suppliesMaintainId);
    void deleteEmergencySuppliesMaintainUserByIds(List<Long> ids);
    void deleteEmergencySuppliesMaintainUserBySuppliesMaintainId(@Param("suppliesMaintainId") Long suppliesMaintainId);
}
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencySuppliesMaintainService.java
对比新文件
@@ -0,0 +1,24 @@
package com.gkhy.safePlatform.emergency.service;
import com.gkhy.safePlatform.commons.query.PageQuery;
import com.gkhy.safePlatform.commons.vo.ResultVO;
import com.gkhy.safePlatform.commons.vo.SearchResultVO;
import com.gkhy.safePlatform.emergency.model.dto.req.EmergencySuppliesMaintainReqDTO;
import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencySuppliesMaintainDetailRespDTO;
import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencySuppliesMaintainPageRespDTO;
import com.gkhy.safePlatform.emergency.query.EmergencySuppliesMaintainQuery;
import java.util.List;
public interface EmergencySuppliesMaintainService {
    SearchResultVO<List<EmergencySuppliesMaintainPageRespDTO>> selectEmergencySuppliesMaintainList(PageQuery<EmergencySuppliesMaintainQuery> query);
    ResultVO addEmergencySuppliesMaintain(Long uid, EmergencySuppliesMaintainReqDTO emergencySuppliesMaintainReqDTO);
    ResultVO<EmergencySuppliesMaintainDetailRespDTO> getEmergencySuppliesMaintainById(Long id);
    ResultVO updateEmergencySuppliesMaintain(Long uid, EmergencySuppliesMaintainReqDTO emergencySuppliesMaintainReqDTO);
    ResultVO batchDeleteEmergencySuppliesMaintain(String ids);
}
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencySuppliesMaintainInfoService.java
对比新文件
@@ -0,0 +1,24 @@
package com.gkhy.safePlatform.emergency.service.baseService;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.gkhy.safePlatform.emergency.entity.EmergencySuppliesMaintainInfo;
import com.gkhy.safePlatform.emergency.entity.EmergencySuppliesMaintainInfoDetailDO;
import com.gkhy.safePlatform.emergency.entity.EmergencySuppliesMaintainInfoPageDO;
import com.gkhy.safePlatform.emergency.query.db.EmergencySuppliesMaintainDBQuery;
import java.util.List;
public interface EmergencySuppliesMaintainInfoService extends IService<EmergencySuppliesMaintainInfo> {
    List<EmergencySuppliesMaintainInfoPageDO> selectEmergencySuppliesMaintainList(Page<EmergencySuppliesMaintainInfoPageDO> page, EmergencySuppliesMaintainDBQuery emergencySuppliesMaintainDBQuery);
    void addEmergencySuppliesMaintain(EmergencySuppliesMaintainInfo emergencySuppliesMaintainInfo);
    EmergencySuppliesMaintainInfoDetailDO selectEmergencySuppliesMaintainById(Long id);
    void updateEmergencySuppliesMaintain(EmergencySuppliesMaintainInfo emergencySuppliesMaintainInfo);
    void deleteEmergencySuppliesMaintain(Long SuppliesMaintainId);
}
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencySuppliesMaintainUserInfoService.java
对比新文件
@@ -0,0 +1,19 @@
package com.gkhy.safePlatform.emergency.service.baseService;
import com.baomidou.mybatisplus.extension.service.IService;
import com.gkhy.safePlatform.emergency.entity.EmergencySuppliesMaintainUserInfo;
import com.gkhy.safePlatform.emergency.entity.EmergencySuppliesMaintainUserInfoDO;
import java.util.List;
public interface EmergencySuppliesMaintainUserInfoService extends IService<EmergencySuppliesMaintainUserInfo> {
    void addEmergencySuppliesMaintainUser(EmergencySuppliesMaintainUserInfo emergencySuppliesMaintainUserInfo);
    List<EmergencySuppliesMaintainUserInfoDO> selectEmergencySuppliesMaintainUserBySuppliesMaintainId(Long id);
    void deleteEmergencySuppliesMaintainUserByIds(List<Long> deleteList);
    void deleteEmergencySuppliesMaintainUserBySuppliesMaintainId(Long suppliesMaintainId);
}
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencySuppliesMaintainInfoServiceImpl.java
对比新文件
@@ -0,0 +1,48 @@
package com.gkhy.safePlatform.emergency.service.baseService.impl;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.gkhy.safePlatform.emergency.entity.EmergencySuppliesMaintainInfo;
import com.gkhy.safePlatform.emergency.entity.EmergencySuppliesMaintainInfoDetailDO;
import com.gkhy.safePlatform.emergency.entity.EmergencySuppliesMaintainInfoPageDO;
import com.gkhy.safePlatform.emergency.query.db.EmergencySuppliesMaintainDBQuery;
import com.gkhy.safePlatform.emergency.repository.EmergencySuppliesMaintainInfoRepository;
import com.gkhy.safePlatform.emergency.service.baseService.EmergencySuppliesMaintainInfoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@Service("emergencySuppliesMaintainInfoService")
public class EmergencySuppliesMaintainInfoServiceImpl extends ServiceImpl<EmergencySuppliesMaintainInfoRepository, EmergencySuppliesMaintainInfo> implements EmergencySuppliesMaintainInfoService {
    @Autowired
    private EmergencySuppliesMaintainInfoRepository emergencySuppliesMaintainInfoRepository;
    @Override
    public List<EmergencySuppliesMaintainInfoPageDO> selectEmergencySuppliesMaintainList(Page<EmergencySuppliesMaintainInfoPageDO> page, EmergencySuppliesMaintainDBQuery emergencySuppliesMaintainDBQuery) {
        return emergencySuppliesMaintainInfoRepository.selectEmergencySuppliesMaintainList(page,emergencySuppliesMaintainDBQuery);
    }
    @Override
    public void addEmergencySuppliesMaintain(EmergencySuppliesMaintainInfo emergencySuppliesMaintainInfo) {
        emergencySuppliesMaintainInfoRepository.addEmergencySuppliesMaintain(emergencySuppliesMaintainInfo);
    }
    @Override
    public EmergencySuppliesMaintainInfoDetailDO selectEmergencySuppliesMaintainById(Long id) {
        return emergencySuppliesMaintainInfoRepository.selectEmergencySuppliesMaintainById(id);
    }
    @Override
    public void updateEmergencySuppliesMaintain(EmergencySuppliesMaintainInfo emergencySuppliesMaintainInfo) {
        emergencySuppliesMaintainInfoRepository.updateEmergencySuppliesMaintain(emergencySuppliesMaintainInfo);
    }
    @Override
    public void deleteEmergencySuppliesMaintain(Long SuppliesMaintainId) {
        emergencySuppliesMaintainInfoRepository.deleteEmergencySuppliesMaintain(SuppliesMaintainId);
    }
}
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencySuppliesMaintainUserInfoServiceImpl.java
对比新文件
@@ -0,0 +1,40 @@
package com.gkhy.safePlatform.emergency.service.baseService.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.gkhy.safePlatform.emergency.entity.EmergencySuppliesMaintainUserInfo;
import com.gkhy.safePlatform.emergency.entity.EmergencySuppliesMaintainUserInfoDO;
import com.gkhy.safePlatform.emergency.repository.EmergencySuppliesMaintainUserInfoRepository;
import com.gkhy.safePlatform.emergency.service.baseService.EmergencySuppliesMaintainUserInfoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@Service("emergencySuppliesMaintainUserInfoService")
public class EmergencySuppliesMaintainUserInfoServiceImpl extends ServiceImpl<EmergencySuppliesMaintainUserInfoRepository, EmergencySuppliesMaintainUserInfo> implements EmergencySuppliesMaintainUserInfoService {
    @Autowired
    private EmergencySuppliesMaintainUserInfoRepository emergencySuppliesMaintainUserInfoRepository;
    @Override
    public void addEmergencySuppliesMaintainUser(EmergencySuppliesMaintainUserInfo emergencySuppliesMaintainUserInfo) {
        emergencySuppliesMaintainUserInfoRepository.addEmergencySuppliesMaintainUser(emergencySuppliesMaintainUserInfo);
    }
    @Override
    public List<EmergencySuppliesMaintainUserInfoDO> selectEmergencySuppliesMaintainUserBySuppliesMaintainId(Long id) {
        return emergencySuppliesMaintainUserInfoRepository.selectEmergencySuppliesMaintainUserBySuppliesMaintainId(id);
    }
    @Override
    public void deleteEmergencySuppliesMaintainUserByIds(List<Long> ids) {
        emergencySuppliesMaintainUserInfoRepository.deleteEmergencySuppliesMaintainUserByIds(ids);
    }
    @Override
    public void deleteEmergencySuppliesMaintainUserBySuppliesMaintainId(Long suppliesMaintainId) {
        emergencySuppliesMaintainUserInfoRepository.deleteEmergencySuppliesMaintainUserBySuppliesMaintainId(suppliesMaintainId);
    }
}
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencySuppliesMaintainServiceImpl.java
对比新文件
@@ -0,0 +1,222 @@
package com.gkhy.safePlatform.emergency.service.impl;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.gkhy.safePlatform.commons.enums.ResultCodes;
import com.gkhy.safePlatform.commons.query.PageQuery;
import com.gkhy.safePlatform.commons.utils.BeanCopyUtils;
import com.gkhy.safePlatform.commons.utils.StringUtils;
import com.gkhy.safePlatform.commons.vo.ResultVO;
import com.gkhy.safePlatform.commons.vo.SearchResultVO;
import com.gkhy.safePlatform.emergency.entity.*;
import com.gkhy.safePlatform.emergency.enums.EmergencyResultCodes;
import com.gkhy.safePlatform.emergency.excepiton.EmergencyException;
import com.gkhy.safePlatform.emergency.model.dto.req.EmergencySuppliesMaintainReqDTO;
import com.gkhy.safePlatform.emergency.model.dto.req.EmergencySuppliesMaintainUserReqDTO;
import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencySuppliesMaintainDetailRespDTO;
import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencySuppliesMaintainPageRespDTO;
import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencySuppliesMaintainUserRespDTO;
import com.gkhy.safePlatform.emergency.query.EmergencySuppliesMaintainQuery;
import com.gkhy.safePlatform.emergency.query.db.EmergencySuppliesMaintainDBQuery;
import com.gkhy.safePlatform.emergency.service.EmergencySuppliesMaintainService;
import com.gkhy.safePlatform.emergency.service.baseService.EmergencySuppliesInfoService;
import com.gkhy.safePlatform.emergency.service.baseService.EmergencySuppliesMaintainInfoService;
import com.gkhy.safePlatform.emergency.service.baseService.EmergencySuppliesMaintainUserInfoService;
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.stream.Collectors;
@Service("emergencySuppliesMaintainService")
public class EmergencySuppliesMaintainServiceImpl implements EmergencySuppliesMaintainService {
    @Autowired
    private EmergencySuppliesMaintainInfoService emergencySuppliesMaintainInfoService;
    @Autowired
    private EmergencySuppliesMaintainUserInfoService emergencySuppliesMaintainUserInfoService;
    @Autowired
    private EmergencySuppliesInfoService emergencySuppliesInfoService;
    @Override
    public SearchResultVO<List<EmergencySuppliesMaintainPageRespDTO>> selectEmergencySuppliesMaintainList(PageQuery<EmergencySuppliesMaintainQuery> query) {
        Long pageIndex = query.getPageIndex();
        Long pageSize = query.getPageSize();
        Page<EmergencySuppliesMaintainInfoPageDO> page = new Page<>(pageIndex, pageSize);
        EmergencySuppliesMaintainDBQuery emergencySuppliesMaintainDBQuery = new EmergencySuppliesMaintainDBQuery();
        if (query.getSearchParams() != null) {
            BeanUtils.copyProperties(query.getSearchParams(), emergencySuppliesMaintainDBQuery);
        }
        List<EmergencySuppliesMaintainInfoPageDO> emergencySuppliesMaintainListDoInfoList = emergencySuppliesMaintainInfoService.selectEmergencySuppliesMaintainList(page,emergencySuppliesMaintainDBQuery);
        List<EmergencySuppliesMaintainPageRespDTO> respList =  BeanCopyUtils.copyBeanList(emergencySuppliesMaintainListDoInfoList, EmergencySuppliesMaintainPageRespDTO.class);
        return new SearchResultVO<>(
                true,
                pageIndex,
                pageSize,
                page.getTotal(),
                respList,
                ResultCodes.OK
                );
    }
    @Override
    public ResultVO addEmergencySuppliesMaintain(Long uid, EmergencySuppliesMaintainReqDTO emergencySuppliesMaintainReqDTO) {
        Long suppliesId = emergencySuppliesMaintainReqDTO.getSuppliesId();
        if (suppliesId==null){
            throw new EmergencyException(EmergencyResultCodes.SUPPLIES_NULL);
        }else{
            EmergencySuppliesInfoDetailDO emergencySuppliesInfoDetailDO = emergencySuppliesInfoService.selectEmergencySuppliesById(suppliesId);
            if (emergencySuppliesInfoDetailDO==null){
                throw new EmergencyException(EmergencyResultCodes.SUPPLIES_NOT_EXIST);
            }else{
                Date nowDate = new Date();
                // 新增应急物资检查
                EmergencySuppliesMaintainInfo emergencySuppliesMaintainInfo = new EmergencySuppliesMaintainInfo();
                BeanUtils.copyProperties(emergencySuppliesMaintainReqDTO,emergencySuppliesMaintainInfo);
                emergencySuppliesMaintainInfo.setDelFlag(false);
                emergencySuppliesMaintainInfo.setCreateUid(uid);
                emergencySuppliesMaintainInfo.setGmtCreate(nowDate);
                emergencySuppliesMaintainInfoService.addEmergencySuppliesMaintain(emergencySuppliesMaintainInfo);
                // 新增急演练计划应急人员表
                if (!CollectionUtils.isEmpty(emergencySuppliesMaintainReqDTO.getUserList())) {
                    addEmergencySuppliesMaintainUser(uid, emergencySuppliesMaintainInfo.getId(), nowDate, emergencySuppliesMaintainReqDTO.getUserList());
                }
                return new ResultVO<>(ResultCodes.OK);
            }
        }
    }
    private void addEmergencySuppliesMaintainUser(Long uid, Long MaintainId, Date nowDate, List<EmergencySuppliesMaintainUserReqDTO> userList) {
        List<EmergencySuppliesMaintainUserInfo> emergencySuppliesMaintainUserInfoList = BeanCopyUtils.copyBeanList(userList, EmergencySuppliesMaintainUserInfo.class);
        emergencySuppliesMaintainUserInfoList.forEach(EmergencySuppliesMaintainUserInfo -> {
            EmergencySuppliesMaintainUserInfo.setDelFlag(false);
            EmergencySuppliesMaintainUserInfo.setCreateUid(uid);
            EmergencySuppliesMaintainUserInfo.setGmtCreate(nowDate);
            EmergencySuppliesMaintainUserInfo.setMaintainId(MaintainId);
        });
        for (EmergencySuppliesMaintainUserInfo emergencySuppliesMaintainUserInfo : emergencySuppliesMaintainUserInfoList) {
            emergencySuppliesMaintainUserInfoService.addEmergencySuppliesMaintainUser(emergencySuppliesMaintainUserInfo);
        }
    }
    @Override
    public ResultVO<EmergencySuppliesMaintainDetailRespDTO> getEmergencySuppliesMaintainById(Long id) {
        EmergencySuppliesMaintainDetailRespDTO emergencySuppliesMaintainDetailRespDTO = new EmergencySuppliesMaintainDetailRespDTO();
        // 查询是否存在
        EmergencySuppliesMaintainInfoDetailDO emergencySuppliesMaintainInfoDetailDO = emergencySuppliesMaintainInfoService.selectEmergencySuppliesMaintainById(id);
        if (emergencySuppliesMaintainInfoDetailDO==null){
            throw new EmergencyException(EmergencyResultCodes.SUPPLIES_MAINTAIN_NOT_EXIST);
        }else{
            BeanUtils.copyProperties(emergencySuppliesMaintainInfoDetailDO,emergencySuppliesMaintainDetailRespDTO);
            // 查找对应的人员表
            List<EmergencySuppliesMaintainUserInfoDO> emergencySuppliesMaintainUserInfoDOList = emergencySuppliesMaintainUserInfoService.selectEmergencySuppliesMaintainUserBySuppliesMaintainId(id);
            if (!CollectionUtils.isEmpty(emergencySuppliesMaintainUserInfoDOList)) {
                List<EmergencySuppliesMaintainUserRespDTO> emergencySuppliesMaintainUserRespDTOList = BeanCopyUtils.copyBeanList(emergencySuppliesMaintainUserInfoDOList, EmergencySuppliesMaintainUserRespDTO.class);
                emergencySuppliesMaintainDetailRespDTO.setUserList(emergencySuppliesMaintainUserRespDTOList);
            }
            return new ResultVO<>(ResultCodes.OK,emergencySuppliesMaintainDetailRespDTO);
        }
    }
    @Override
    public ResultVO updateEmergencySuppliesMaintain(Long uid, EmergencySuppliesMaintainReqDTO emergencySuppliesMaintainReqDTO) {
        Date nowDate = new Date();
        // 查询是否存在
        EmergencySuppliesMaintainInfoDetailDO emergencySuppliesMaintainInfoDetailDO = emergencySuppliesMaintainInfoService.selectEmergencySuppliesMaintainById(emergencySuppliesMaintainReqDTO.getId());
        if (emergencySuppliesMaintainInfoDetailDO==null){
            throw new EmergencyException(EmergencyResultCodes.SUPPLIES_MAINTAIN_NOT_EXIST);
        }else{
            EmergencySuppliesMaintainInfo emergencySuppliesMaintainInfo = new EmergencySuppliesMaintainInfo();
            BeanUtils.copyProperties(emergencySuppliesMaintainReqDTO,emergencySuppliesMaintainInfo);
            emergencySuppliesMaintainInfo.setUpdateUid(uid);
            emergencySuppliesMaintainInfo.setGmtModitify(nowDate);
            emergencySuppliesMaintainInfoService.updateEmergencySuppliesMaintain(emergencySuppliesMaintainInfo);
            // 更新急演练计划应急人员表
            if (!CollectionUtils.isEmpty(emergencySuppliesMaintainReqDTO.getUserList())) {
                updateEmergencySuppliesMaintainUser(uid, emergencySuppliesMaintainInfo.getId(), nowDate, emergencySuppliesMaintainReqDTO.getUserList());
            }
            return new ResultVO<>(ResultCodes.OK);
        }
    }
    private void updateEmergencySuppliesMaintainUser(Long uid, Long suppliesMaintainId, Date
            nowDate, List<EmergencySuppliesMaintainUserReqDTO> UserReqDTOList) {
        List<EmergencySuppliesMaintainUserInfoDO> emergencySuppliesMaintainUserInfoDOList = emergencySuppliesMaintainUserInfoService.selectEmergencySuppliesMaintainUserBySuppliesMaintainId(suppliesMaintainId);
        List<Long> oldIdsList = emergencySuppliesMaintainUserInfoDOList.stream().map(EmergencySuppliesMaintainUserInfoDO::getId).collect(Collectors.toList());
        List<Long> newIdsList = new ArrayList<>();
        //新增的区域集合
        List<EmergencySuppliesMaintainUserInfo> addList = new ArrayList<>();
        //删除的区域集合(id)
        List<Long> deleteList = new ArrayList<>();
        for (EmergencySuppliesMaintainUserReqDTO emergencySuppliesMaintainUserReqDTO : UserReqDTOList) {
            //如果不存在id则表示页面新增的附件
            if (emergencySuppliesMaintainUserReqDTO.getId() == null) {
                EmergencySuppliesMaintainUserInfo emergencySuppliesMaintainUserInfo = new EmergencySuppliesMaintainUserInfo();
                BeanUtils.copyProperties(emergencySuppliesMaintainUserReqDTO, emergencySuppliesMaintainUserInfo);
                emergencySuppliesMaintainUserInfo.setDelFlag(false);
                emergencySuppliesMaintainUserInfo.setGmtCreate(nowDate);
                emergencySuppliesMaintainUserInfo.setCreateUid(uid);
                emergencySuppliesMaintainUserInfo.setMaintainId(suppliesMaintainId);
                addList.add(emergencySuppliesMaintainUserInfo);
            }
            //如果存在id则判断页面是否删除
            else {
                newIdsList.add(emergencySuppliesMaintainUserReqDTO.getId());
            }
        }
        for (Long oldId : oldIdsList) {
            if (!newIdsList.contains(oldId)) {
                deleteList.add(oldId);
            }
        }
        if (!CollectionUtils.isEmpty(addList)) {
            for (EmergencySuppliesMaintainUserInfo emergencySuppliesMaintainUserInfo : addList) {
                emergencySuppliesMaintainUserInfoService.addEmergencySuppliesMaintainUser(emergencySuppliesMaintainUserInfo);
            }
        }
        if (!CollectionUtils.isEmpty(deleteList)) {
            emergencySuppliesMaintainUserInfoService.deleteEmergencySuppliesMaintainUserByIds(deleteList);
        }
    }
    @Override
    public ResultVO batchDeleteEmergencySuppliesMaintain(String ids) {
        if (StringUtils.isBlank(ids)) {
            throw new EmergencyException(EmergencyResultCodes.SUPPLIES_MAINTAIN_NULL);
        } else {
            String[] idArr = ids.split(",");
            for (String id : idArr) {
                deleteEmergencySuppliesMaintain(Long.valueOf(id));
            }
            return new ResultVO(ResultCodes.OK);
        }
    }
    private void deleteEmergencySuppliesMaintain(Long id) {
        //查询是否存在
        EmergencySuppliesMaintainInfoDetailDO emergencySuppliesMaintainInfoDetailDO = emergencySuppliesMaintainInfoService.selectEmergencySuppliesMaintainById(id);
        if (emergencySuppliesMaintainInfoDetailDO==null){
            throw new EmergencyException(EmergencyResultCodes.SUPPLIES_MAINTAIN_NOT_EXIST);
        }else{
            Long suppliesMaintainId = emergencySuppliesMaintainInfoDetailDO.getId();
            emergencySuppliesMaintainInfoService.deleteEmergencySuppliesMaintain(suppliesMaintainId);
            //删除人员
            emergencySuppliesMaintainUserInfoService.deleteEmergencySuppliesMaintainUserBySuppliesMaintainId(suppliesMaintainId);
        }
    }
}
emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencySuppliesMaintainInfoMapper.xml
对比新文件
@@ -0,0 +1,73 @@
<?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.EmergencySuppliesMaintainInfoRepository">
    <resultMap type="com.gkhy.safePlatform.emergency.entity.EmergencySuppliesMaintainInfoPageDO" id="emergencySuppliesMaintainInfoPageDOResult">
        <id column="id" property="id" jdbcType="BIGINT"/>
        <result column="supplies_id" property="suppliesId"/>
        <result column="maintain_result" property="maintainResult"/>
        <result column="maintain_time" property="maintainTime"/>
    </resultMap>
    <select id="selectEmergencySuppliesMaintainList" resultMap="emergencySuppliesMaintainInfoPageDOResult">
        select id,`supplies_id`,`maintain_result`,`maintain_time` from emergency_supplies_maintain where del_flag = 0
        <if test="query.suppliesId != null  and query.suppliesId != ''">and `supplies_id` = #{query.suppliesId}</if>
    </select>
    <insert id="addEmergencySuppliesMaintain" parameterType="com.gkhy.safePlatform.emergency.entity.EmergencySuppliesMaintainInfo"
            keyProperty="id" useGeneratedKeys="true">
        insert into emergency_supplies_maintain
        <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="suppliesId != null ">supplies_id,</if>
            <if test="maintainResult != null and maintainResult != ''">`maintain_result`,</if>
            <if test="maintainTime != null ">maintain_time,</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="suppliesId != null ">#{suppliesId},</if>
            <if test="maintainResult != null and maintainResult != ''">#{maintainResult},</if>
            <if test="maintainTime != null ">#{maintainTime},</if>
        </trim>
    </insert>
    <resultMap type="com.gkhy.safePlatform.emergency.entity.EmergencySuppliesMaintainInfoDetailDO" id="emergencySuppliesMaintainInfoDetailDOResult">
        <id column="id" property="id" jdbcType="BIGINT"/>
        <result column="supplies_id" property="suppliesId"/>
        <result column="maintain_result" property="maintainResult"/>
        <result column="maintain_time" property="maintainTime"/>
    </resultMap>
    <select id="selectEmergencySuppliesMaintainById" resultMap="emergencySuppliesMaintainInfoDetailDOResult">
                select id,`supplies_id`,`maintain_result`,`maintain_time` from emergency_supplies_maintain where del_flag = 0 and id = #{id}
    </select>
    <update id="updateEmergencySuppliesMaintain" parameterType="com.gkhy.safePlatform.emergency.entity.EmergencySuppliesMaintainInfo">
        update emergency_supplies_maintain
        <trim prefix="SET" suffixOverrides=",">
            <if test="gmtModitify != null ">gmt_moditify = #{gmtModitify},</if>
            <if test="updateUid != null ">update_uid = #{updateUid},</if>
            <if test="suppliesId != null ">supplies_id = #{suppliesId},</if>
            <if test="maintainResult != null and maintainResult != ''">`maintain_result` = #{maintainResult},</if>
            <if test="maintainTime != null ">maintain_time = #{maintainTime},</if>
        </trim>
        where id = #{id}
    </update>
    <update id="deleteEmergencySuppliesMaintain">
        update emergency_supplies_maintain set del_flag = 1 where id = #{id}
    </update>
</mapper>
emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencySuppliesMaintainUserInfoMapper.xml
对比新文件
@@ -0,0 +1,52 @@
<?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.EmergencySuppliesMaintainUserInfoRepository">
    <insert id="addEmergencySuppliesMaintainUser">
        insert into emergency_supplies_maintain_user
        <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="maintainId != null ">maintain_id,</if>
            <if test="userUid != null ">user_uid,</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="maintainId != null ">#{maintainId},</if>
            <if test="userUid != null ">#{userUid},</if>
        </trim>
    </insert>
    <resultMap type="com.gkhy.safePlatform.emergency.entity.EmergencySuppliesMaintainUserInfoDO" id="emergencySuppliesMaintainUserInfoDOResult">
        <id column="id" property="id" jdbcType="BIGINT"/>
        <result column="maintain_id" property="maintainId" />
        <result column="user_uid" property="userUid" />
    </resultMap>
    <select id="selectEmergencySuppliesMaintainUserBySuppliesMaintainId" resultMap="emergencySuppliesMaintainUserInfoDOResult">
        select id,`maintain_id`,`user_uid` from emergency_supplies_maintain_user where del_flag = 0 and maintain_id = #{suppliesMaintainId}
    </select>
    <update id = "deleteEmergencySuppliesMaintainUserByIds" >
        update emergency_supplies_maintain_user set del_flag = 1 where id in
        <foreach item="id" collection="ids" open="(" separator="," close=")">
            #{id}
        </foreach>
    </update>
    <update id="deleteEmergencySuppliesMaintainUserBySuppliesMaintainId">
        update emergency_supplies_maintain_user set del_flag = 1 where maintain_id = #{suppliesMaintainId}
    </update>
</mapper>