Merge branch 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into zf

zhangfeng

2022-09-21 fee66fde68610850d4c8c52df022b9d53a0cd3f7

Merge branch 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into zf


 Conflicts:

	safePlatfrom-out-web/src/main/resources/config/application-dev.yaml

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

@@ -70,9 +70,6 @@
    /**
     * 应急预案废止/还原
     */
    /**
     * 应急预案详情
     */
    @RequestMapping(value = "/updateAbolish",method = RequestMethod.GET)
    public ResultVO updateAbolish(Long id ,Boolean abolishStatus){
        return emergencyPlanService.updateAbolish(id,abolishStatus);

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

@@ -49,7 +49,7 @@
    }

    /**
     * 应急预案修改
     * 应急预案启动记录修改
     */
    @RequestMapping(value = "/update",method = RequestMethod.POST)
    public ResultVO updateEmergencyPlanLog(Authentication authentication, @RequestBody EmergencyPlanLogReqDTO emergencyPlanLogReqDTO) {
@@ -58,7 +58,7 @@
    }

    /**
     * 应急预案删除/批量删除
     * 应急预案启动记录删除/批量删除
     */
    @RequestMapping(value = "/batchDelete",method = RequestMethod.POST)
    public ResultVO batchDeleteEmergencyPlanLog(@RequestBody  Long[] ids){

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

@@ -24,7 +24,7 @@
    private EmergencySuppliesMaintainService emergencySuppliesMaintainService;

    /**
     * 应急物资检查列表
     * 应急物资保养列表
     */
    @RequestMapping(value = "/page/list" ,method = RequestMethod.POST)
    private ResultVO<List<EmergencySuppliesMaintainPageRespDTO>> list (@RequestBody PageQuery<EmergencySuppliesMaintainQuery> pageQuery){
@@ -33,7 +33,7 @@
    }

    /**
     * 应急物资检查新增
     * 应急物资保养新增
     */
    @RequestMapping(value = "/add",method = RequestMethod.POST)
    public ResultVO addEmergencySuppliesMaintain(Authentication authentication, @RequestBody EmergencySuppliesMaintainReqDTO emergencySuppliesMaintainReqDTO) {
@@ -42,7 +42,7 @@
    }

    /**
     * 应急物资检查详情
     * 应急物资保养详情
     */
    @RequestMapping(value = "/info/{id}",method = RequestMethod.GET)
    public ResultVO<EmergencySuppliesMaintainDetailRespDTO> getEmergencySuppliesMaintainById(@PathVariable("id")Long id){
@@ -50,7 +50,7 @@
    }

    /**
     * 应急物资检查修改
     * 应急物资保养修改
     */
    @RequestMapping(value = "/update",method = RequestMethod.POST)
    public ResultVO updateEmergencySuppliesMaintain(Authentication authentication, @RequestBody EmergencySuppliesMaintainReqDTO emergencySuppliesMaintainReqDTO) {
@@ -59,7 +59,7 @@
    }

    /**
     * 应急物资检查删除/批量删除
     * 应急物资保养删除/批量删除
     */
    @RequestMapping(value = "/batchDelete",method = RequestMethod.POST)
    public ResultVO batchDeleteEmergencySuppliesMaintain(@RequestBody Long[] ids){

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

@@ -11,43 +11,42 @@

    private Long id;

    // 应急演练实施的id  帮助数据进行筛选
    // 应急演练实施的id
    private Long drillExecuteId;

    //适宜性
    private Byte suitable;

    //充分性
    private Byte sufficient;

    //人员到位情况
    private Byte arrival;

    //物资到位情况-现场物资
    private Byte supplies;

    //物资到位情况-个人防护
    private Byte protection;

    //协调组织情况-整体组织
    private Byte whole;

    //协调组织情况-疏散组分工
    private Byte division;

    //实战效果评价
    private Byte effect;

    //支援部门和协作有效性-报告上级
    private Byte report;

    //支援部门和协作有效性-安全部门
    private Byte safety;

    //支援部门和协作有效性-救援后勤部门
    private Byte rescue;

    //支援部门和协作有效性-警戒撤离配合
    private Byte evacuate;

    //是否需要修改应急预案：0否1是
    private Boolean needModify;

    //存在问题和改进措施
    private String questionAndImprove;

    //修改内容
    private String modifyContent;

    //文件列表
    private List<EmergencyDrillEvaluationFileReqDTO> fileList;

    //人员列表
    private List<EmergencyDrillEvaluationUserReqDTO> userList;


    public Long getId() {
        return id;

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

@@ -7,7 +7,7 @@
import java.util.List;

public class EmergencyDrillExecuteReqDTO {

    //记录人名称
    private String recordUserName;

    public String getRecordUserName() {
@@ -19,18 +19,18 @@
    }

    private Long id;

    //状态 0：待评价 1 ：已评价
    private Boolean status;

    //演练记录时间
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date drillRecordDate;

    //演练计划id
    private Long drillPlanId;

    //记录人uid
    private Long recordUserUid;

    //演练过程描述
    private String processDesc;

    //人员列表
    private List<EmergencyDrillExecuteUserReqDTO> userList;

    public Long getId() {

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

@@ -7,7 +7,7 @@
import java.util.List;

public class EmergencyDrillPlanReqDTO {

    //计划制定人名称
    private String makingUserName;

    public String getMakingUserName() {
@@ -20,41 +20,41 @@


    private Long id;

    //状态
    private Integer status;

    //计划制定日期
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date makingPlanDate;

    //计划演练日期
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date drillPlanDate;

    //计划制定人uid
    private Long makingUserUid;

    //计划制定部门ID
    private Long makingDepartmentId;

    //应急预案ID
    private Long planId;

    //主办部门ID
    private Long departmentId;

    //演练经费
    private BigDecimal drillExpense;

    //演练级别（数据字典）
    private Byte drillLevel;

    //演练地点
    private String drillAddress;

    //演练名称
    private String drillName;

    //演练方式（数据字典）
    private Byte drillWay;

    //保险措施
    private String insuranceMeasures;

    //备注
    private String remark;

    //演练目的
    private String purpose;

    //文件列表
    private List<EmergencyDrillPlanFileReqDTO> fileList;

    //人员列表
    private List<EmergencyDrillPlanUserReqDTO> userList;

    public Long getId() {

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

@@ -6,9 +6,9 @@
public class EmergencyPlanLogReqDTO {

    private Long id;

    //预案id
    private Long planId;

    //备注
    private String remark;

    public Long getId() {

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

@@ -6,7 +6,7 @@
import java.util.List;

public class EmergencyPlanReqDTO {

    //编写人名称
    private String authorName;

    public String getAuthorName() {
@@ -18,30 +18,30 @@
    }

    private Long id;

    //状态
    private Integer status;

    //发布实施日期
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date releaseDate;

    //编写人uid
    private Long authorUid;

    //编写部门id
    private Long authorDeptId;

    //危险源关联：0否1是
    private Boolean associatedDanger;

    //预案类型（数据字典）
    private Byte type;

    //预案级别（数据字典）
    private Byte level;

    //预案名称
    private String name ;

    private List<EmergencyPlanAreaReqDTO> areaList;

    //部门列表
    private List<EmergencyPlanDepartmentReqDTO> deptList;

    //文件列表
    private List<EmergencyPlanFileReqDTO> fileList;

    //队伍列表
    private List<EmergencyPlanTeamReqDTO> teamList;

    public Long getId() {

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

@@ -10,12 +10,14 @@
public class EmergencySuppliesInspectReqDTO {

    private Long id;

    //物资id
    private Long suppliesId;
    //检查结果
    private String inspectResult;
    //检查时间
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date inspectTime;

    //检查人列表
    private List<EmergencySuppliesInspectUserReqDTO> userList;



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

@@ -2,7 +2,7 @@


public class EmergencySuppliesInspectUserReqDTO {

    //人员名称
    private String userName;

    public String getUserName() {
@@ -14,8 +14,9 @@
    }

    private Long id;

    //检查id
    private Long inspectId;
    //人员uid
    private Long userUid;

    public Long getId() {

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

@@ -8,12 +8,14 @@
public class EmergencySuppliesMaintainReqDTO {

    private Long id;

    //物资id
    private Long suppliesId;
    //保养结果
    private String maintainResult;
    //保养时间
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date maintainTime;

    //包养人列表
    private List<EmergencySuppliesMaintainUserReqDTO> userList;



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

@@ -2,7 +2,7 @@


public class EmergencySuppliesMaintainUserReqDTO {

    //人员名称
    private String userName;

    public String getUserName() {
@@ -14,8 +14,9 @@
    }

    private Long id;

    //保养id
    private Long maintainId;
    //人员uid
    private Long userUid;

    public Long getId() {

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

@@ -8,7 +8,7 @@
import java.util.Date;

public class EmergencySuppliesReqDTO {

    //负责人名称
    private String principalUserName;

    public String getPrincipalUserName() {
@@ -20,29 +20,49 @@
    }

    private Long id;
    //生产日期
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date productionDate;
    //投用日期
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date useDate;
    //检查日期
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date inspectDate;
    //下次检查日期
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date nextInspectDate;
    //检查周期/月
    private Integer inspectPeriod;
    //存储数量
    private Integer count;
    //使用期限/天
    private Integer usePeriod;
    //负责部门id
    private Long departmentId;
    //负责人uid
    private Long principalUserUid;
    //状态（数据字典）
    private Byte status;
    //分类（数据字典）
    private Byte classification;
    //名称
    private String name;
    //编号
    private String number;
    //型号
    private String model;
    //经度
    private String longitude;
    //维度
    private String latitude;
    //用途
    private String use;
    //所属区域
    private Long areaId;
    //存放位置
    private String place;
    //使用说明
    private String useExplain;

    public Long getId() {

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

@@ -4,19 +4,19 @@
public class EmergencyTeamMemberReqDTO {

    private Long id;

    //队伍id
    private Long teamId;

    //人员uid
    private Long userUid;

    //人员性别
    private Boolean gender;

    //人员工号
    private String jobNumber;

    //人员名称
    private String name;

    //手机号码
    private String phone;

    //职位
    private String position;

    public Long getId() {

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

@@ -4,6 +4,7 @@

public class EmergencyTeamReqDTO {

    //负责人名称
    private String principalName;

    public String getPrincipalName() {
@@ -16,22 +17,31 @@

    private Long id;

    //负责人uid
    private Long principalUid;

    //负责人部门id
    private Long principalDepartmentId;

    //队伍级别（数据字典）
    private Byte teamLevel;

    //队伍名称
    private String teamName;

    //负责人手机
    private String principalPhone;

    //固定电话
    private String telephoneNumber;

    //队伍描述
    private String teamDesc;

    //文件列表
    private List<EmergencyTeamFileReqDTO> fileList;

    //人员列表
    private List<EmergencyTeamMemberReqDTO> memberList;

    public Long getId() {

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

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

public class EmergencyWorkApproveReqDTO {

    //排序
    private Integer sort ;

    public Integer getSort() {
@@ -28,7 +28,7 @@
    private String approvePersonName;
    //审批状态 1：未审批 2：审批中 3：审批完成
    private Integer approveStatus;
    //审批意见
    //审批结果 0不通过 1通过
    private Boolean approveResult;
    //审批意见
    private String approveMemo;

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

@@ -8,9 +8,9 @@

public class EmergencyDrillEvaluationDetailRespDTO {

    // 应急演练计划
    // 应急预案名称
    private String emergencyPlanName;

    // 计划制定人名称
    private String makingUserName;

    public String getEmergencyPlanName() {
@@ -28,39 +28,39 @@
    public void setMakingUserName(String makingUserName) {
        this.makingUserName = makingUserName;
    }

    //计划制定日期
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date makingPlanDate;

    //计划演练日期
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date drillPlanDate;

    //计划制定人uid
    private Long makingUserUid;

    //计划制定部门ID
    private Long makingDepartmentId;

    //主办部门ID
    private Long departmentId;

    //演练经费
    private BigDecimal drillExpense;

    //演练级别（数据字典）
    private Byte drillLevel;

    //演练地点
    private String drillAddress;

    //演练名称
    private String drillName;

    //演练方式（数据字典）
    private Byte drillWay;

    //保险措施
    private String insuranceMeasures;

    //备注
    private String remark;

    //演练目的
    private String purpose;

    //演练计划文件列表
    private List<EmergencyDrillPlanFileRespDTO> planFileList;

    //演练计划人员列表
    private List<EmergencyDrillPlanUserRespDTO> planUserList;

    //演练计划负责人人员列表
    private List<EmergencyDrillPlanUserRespDTO> planChargeUserList;

    public List<EmergencyDrillPlanUserRespDTO> getPlanChargeUserList() {
@@ -73,6 +73,7 @@

    // 应急演练实施

    //记录人名称
    private String recordUserName;

    public String getRecordUserName() {
@@ -82,55 +83,55 @@
    public void setRecordUserName(String recordUserName) {
        this.recordUserName = recordUserName;
    }

    //演练计划id
    private Long drillPlanId;

    //演练记录时间
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date drillRecordDate;

    //记录人uid
    private Long recordUserUid;

    //演练过程描述
    private String processDesc;

    //演练计划实施人员列表
    private List<EmergencyDrillExecuteUserRespDTO> executeUserList;

    // 评价
    // 评价id
    private Long id;

    //演练实施ID
    private Long drillExecuteId;

    //适宜性
    private Byte suitable;

    //充分性
    private Byte sufficient;

    //人员到位情况
    private Byte arrival;

    //物资到位情况-现场物资
    private Byte supplies;

    //物资到位情况-个人防护
    private Byte protection;

    //协调组织情况-整体组织
    private Byte whole;

    //协调组织情况-疏散组分工
    private Byte division;

    //实战效果评价
    private Byte effect;

    //支援部门和协作有效性-报告上级
    private Byte report;

    //支援部门和协作有效性-安全部门
    private Byte safety;

    //支援部门和协作有效性-救援后勤部门
    private Byte rescue;

    //支援部门和协作有效性-警戒撤离配合
    private Byte evacuate;

    //是否需要修改应急预案：0否1是
    private Boolean needModify;

    //存在问题和改进措施
    private String questionAndImprove;

    //修改内容
    private String modifyContent;

    //评价文件列表
    private List<EmergencyDrillEvaluationFileRespDTO> evaluationFileList;

    //评价人员列表
    private List<EmergencyDrillEvaluationUserRespDTO> evaluationUserList;

    public Date getMakingPlanDate() {

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

@@ -5,7 +5,7 @@
import java.util.Date;

public class EmergencyDrillEvaluationPageRespDTO {

    //应急预案名称
    private String emergencyPlanName;

    public String getEmergencyPlanName() {
@@ -15,18 +15,18 @@
    public void setEmergencyPlanName(String emergencyPlanName) {
        this.emergencyPlanName = emergencyPlanName;
    }

    //演练名称
    private String drillName;

    //演练地点
    private String drillAddress;

    //演练方式
    private Byte drillWay;

    //演练级别
    private Byte drillLevel;

    //计划演练日期
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date drillPlanDate;

    //演练记录时间
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date drillRecordDate;

@@ -79,7 +79,7 @@
    }

    private Long id;

    //演练实施id
    private Long drillExecuteId;



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

@@ -7,7 +7,7 @@
import java.util.List;

public class EmergencyDrillExecuteDetailRespDTO {

    //记录人名称
    private String recordUserName;

    public String getRecordUserName() {
@@ -17,7 +17,7 @@
    public void setRecordUserName(String recordUserName) {
        this.recordUserName = recordUserName;
    }

    // 演练名称
    private String drillName;

    public String getDrillName() {
@@ -29,18 +29,18 @@
    }

    private Long id;

    //状态 0：待评价 1 ：已评价
    private Boolean status;

    //演练记录时间
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date drillRecordDate;

    //演练计划id
    private Long drillPlanId;

    //记录人uid
    private Long recordUserUid;

    //演练过程描述
    private String processDesc;

    //人员列表
    private List<EmergencyDrillExecuteUserRespDTO> userList;

    public Long getId() {

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

@@ -5,18 +5,18 @@
import java.util.Date;

public class EmergencyDrillExecutePageRespDTO {

    //演练名称
    private String drillName;

    //演练地点
    private String drillAddress;

    //演练方式
    private Byte drillWay;

    //演练级别
    private Byte drillLevel;

    //计划演练日期
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date drillPlanDate;

    //预案名称
    private String emergencyPlanName;

    public String getDrillName() {
@@ -68,12 +68,12 @@
    }

    private Long id;

    //状态 0：待评价 1 ：已评价
    private Boolean status;

    //演练记录时间
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date drillRecordDate;

    //演练计划id
    private Long drillPlanId;

    public Long getId() {

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

@@ -7,7 +7,7 @@
import java.util.List;

public class EmergencyDrillPlanDetailRespDTO {

    //预案名称
    private String planName;

    public String getPlanName() {
@@ -17,7 +17,7 @@
    public void setPlanName(String planName) {
        this.planName = planName;
    }

    //计划制定人名称
    private String makingUserName;

    public String getMakingUserName() {
@@ -29,46 +29,46 @@
    }

    private Long id;

    //更新日期
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date gmtModitify;

    //状态
    private Integer status;

    //计划制定日期
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date makingPlanDate;

    //计划演练日期
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date drillPlanDate;

    //计划制定人uid
    private Long makingUserUid;

    //计划制定部门ID
    private Long makingDepartmentId;

    //应急预案ID
    private Long planId;

    //主办部门ID
    private Long departmentId;

    //演练经费
    private BigDecimal drillExpense;

    //演练级别（数据字典）
    private Byte drillLevel;

    //演练地点
    private String drillAddress;

    //演练名称
    private String drillName;

    //演练方式（数据字典）
    private Byte drillWay;

    //保险措施
    private String insuranceMeasures;

    //备注
    private String remark;

    //演练目的
    private String purpose;

    //文件列表
    private List<EmergencyDrillPlanFileRespDTO> fileList;

    //人员列表
    private List<EmergencyDrillPlanUserRespDTO> userList;

    //负责人列表
    private List<EmergencyDrillPlanUserRespDTO> chargeUserList;

    public List<EmergencyDrillPlanUserRespDTO> getChargeUserList() {

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

@@ -7,18 +7,18 @@
public class EmergencyDrillPlanPageRespDTO {

    private Long id;

    //预案名称
    private String drillName;

    //演练地点
    private String drillAddress;

    //演练方式（数据字典）
    private Byte drillWay;

    //演练级别（数据字典）
    private Byte drillLevel;

    //计划演练日期
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date drillPlanDate;

    //更新日期
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date gmtModitify;


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

@@ -6,7 +6,7 @@
import java.util.List;

public class EmergencyPlanDetailRespDTO {

    //编写人名称
    private String authorName;

    public String getAuthorName() {
@@ -18,30 +18,30 @@
    }

    private Long id;

    //状态
    private Integer status;

    //发布实施日期
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date releaseDate;

    //编写人uid
    private Long authorUid;

    //编写部门id
    private Long authorDeptId;

    //危险源关联：0否1是
    private Boolean associatedDanger;

    //预案类型（数据字典）
    private Byte type;

    //预案级别（数据字典）
    private Byte level;

    //预案名称
    private String name ;

    private List<EmergencyPlanAreaRespDTO> areaList;

    //部门列表
    private List<EmergencyPlanDepartmentRespDTO> deptList;

    //文件列表
    private List<EmergencyPlanFileRespDTO> fileList;

    //队伍列表
    private List<EmergencyPlanTeamRespDTO> teamList;

    public Long getId() {

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

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

public class EmergencyPlanLogRespDTO {

    //预案名称
    private String planName;

    public String getPlanName() {
@@ -15,7 +16,7 @@
    public void setPlanName(String planName) {
        this.planName = planName;
    }

    //启动人名称
    private String  userName;

    public String getUserName() {
@@ -27,14 +28,14 @@
    }

    private Long id;

    //预案id
    private Long planId;

    //启动人id
    private Long userUid;

    //启动时间
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date startCreate;

    //备注
    private String remark;

    public Long getId() {

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

@@ -50,6 +50,7 @@
        this.checkApprove = checkApprove;
    }

    //编写人名称
    private  String authorName;

    public String getAuthorName() {
@@ -61,15 +62,15 @@
    }

    private Long id;

    // 预案名称
    private String name ;

    //预案状态
    private Integer status ;

    //预案类型（数据字典）
    private Byte type;

    //预案级别（数据字典）
    private Byte level;

    //发布实施日期
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date releaseDate;


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

@@ -12,9 +12,9 @@
import java.util.List;

public class EmergencySuppliesDetailRespDTO {

    //保养列表
    private List<EmergencySuppliesMaintainDetailRespDTO> maintainList;

    //检查列表
    private List<EmergencySuppliesInspectDetailRespDTO> inspectList;

    public List<EmergencySuppliesMaintainDetailRespDTO> getMaintainList() {
@@ -32,7 +32,7 @@
    public void setInspectList(List<EmergencySuppliesInspectDetailRespDTO> inspectList) {
        this.inspectList = inspectList;
    }

    //负责人名称
    private String principalUserName;

    public String getPrincipalUserName() {
@@ -45,29 +45,49 @@

    @TableId(type = IdType.AUTO)
    private Long id;
    //生产日期
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date productionDate;
    //投用日期
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date useDate;
    //检查日期
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date inspectDate;
    //下次检查日期
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date nextInspectDate;
    //检查周期/月
    private Integer inspectPeriod;
    //存储数量
    private Integer count;
    //使用期限/天
    private Integer usePeriod;
    //负责部门id
    private Long departmentId;
    //负责人uid
    private Long principalUserUid;
    //状态（数据字典）
    private Byte status;
    //分类（数据字典）
    private Byte classification;
    //名称
    private String name;
    //编号
    private String number;
    //型号
    private String model;
    //经度
    private String longitude;
    //维度
    private String latitude;
    //用途
    private String use;
    //所属区域
    private Long areaId;
    //存放位置
    private String place;
    //使用说明
    private String useExplain;

    public Long getId() {

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

@@ -8,7 +8,7 @@
import java.util.List;

public class EmergencySuppliesInspectDetailRespDTO {

    //物资名称
    private String suppliesName;

    public String getSuppliesName() {
@@ -20,12 +20,14 @@
    }

    private Long id;

    //物资id
    private Long suppliesId;
    //检查结果
    private String inspectResult;
    //检查日期
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date inspectTime;

    //检查人列表
    private List<EmergencySuppliesInspectUserRespDTO> userList;

    public Long getId() {

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

@@ -7,7 +7,7 @@
import java.util.Date;

public class EmergencySuppliesInspectPageRespDTO {

    //物资名称
    private String suppliesName;

    public String getSuppliesName() {
@@ -19,9 +19,11 @@
    }

    private Long id;

    //物资id
    private Long suppliesId;
    //检查结果
    private String inspectResult;
    //检查时间
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date inspectTime;


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

@@ -3,7 +3,7 @@
import java.util.Date;

public class EmergencySuppliesInspectUserRespDTO {

    //物资名称
    private String userName;

    public String getUserName() {
@@ -15,8 +15,9 @@
    }

    private Long id;

    //物资id
    private Long inspectId;
    //人员uid
    private Long userUid;

    public Long getId() {

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

@@ -8,7 +8,7 @@
import java.util.List;

public class EmergencySuppliesMaintainDetailRespDTO {

    //物资名称
    private String suppliesName;

    public String getSuppliesName() {
@@ -20,12 +20,14 @@
    }

    private Long id;

    //物资id
    private Long suppliesId;
    //保养id
    private String maintainResult;
    //保养时间
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date maintainTime;

    //保养人id
    private List<EmergencySuppliesMaintainUserRespDTO> userList;

    public Long getId() {

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

@@ -7,7 +7,7 @@
import java.util.Date;

public class EmergencySuppliesMaintainPageRespDTO {

    //物资名称
    private String suppliesName;

    public String getSuppliesName() {
@@ -19,9 +19,11 @@
    }

    private Long id;

    //物资id
    private Long suppliesId;
    //保养结果
    private String maintainResult;
    //保养时间
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date maintainTime;


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

@@ -1,7 +1,7 @@
package com.gkhy.safePlatform.emergency.model.dto.resp;

public class EmergencySuppliesMaintainUserRespDTO {

    //人呀名称
    private String userName;

    public String getUserName() {
@@ -13,8 +13,9 @@
    }

    private Long id;

    //保养id
    private Long maintainId;
    //保养人uid
    private Long userUid;

    public Long getId() {

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

@@ -5,7 +5,7 @@
import com.baomidou.mybatisplus.annotation.TableName;

public class EmergencySuppliesPageRespDTO {

    //部门名称
    private String deptName;

    public String getDeptName() {
@@ -17,12 +17,17 @@
    }

    private Long id;

    //名称
    private String name;
    //编号
    private String number;
    //负责部门id
    private Long departmentId;
    //分类（数据字典）
    private String classification;
    //存放位置
    private String place;
    //存储数量
    private Integer count;

    public Long getId() {

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

@@ -4,7 +4,7 @@
import java.util.List;

public class EmergencyTeamDetailRespDTO {

    //负责人名称
    private String principalName;

    public String getPrincipalName() {
@@ -16,23 +16,23 @@
    }

    private Long id;

    //负责人uid
    private Long principalUid;

    //负责人部门id
    private Long principalDepartmentId;

    //队伍级别（数据字典）
    private Byte teamLevel;

    //队伍名称
    private String teamName;

    //负责人手机
    private String principalPhone;

    //固定电话
    private String telephoneNumber;

    //队伍描述
    private String teamDesc;

    //文件列表
    private List<EmergencyTeamFileRespDTO> fileList;

    //人员列表
    private List<EmergencyTeamMemberRespDTO> memberList;

    public Long getId() {

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

@@ -4,19 +4,19 @@
public class EmergencyTeamMemberRespDTO {

    private Long id;

    //队伍id
    private Long teamId;

    //用户uid
    private Long userUid;

    //性别 0男1女
    private Boolean gender;

    //人员工号
    private String jobNumber;

    //人员名称
    private String name;

    //手机号码
    private String phone;

    //职位
    private String position;

    public Long getId() {

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

@@ -6,15 +6,15 @@
public class EmergencyTeamPageRespDTO {

    private Long id;

    //队伍级别（数据字典）
    private Byte teamLevel;

    //队伍名称
    private String teamName;

    //负责人手机
    private String principalPhone;

    //队伍描述
    private String teamDesc;

    //文件列表
    private List<EmergencyTeamFileRespDTO> fileList;

    public Long getId() {

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

@@ -5,7 +5,7 @@
import java.util.Date;

public class EmergencyWorkApproveDetailRespDTO {

    //排序
    private Integer sort ;

    public Integer getSort() {
@@ -17,7 +17,7 @@
    }

    private Long id;

    //更新时间
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date gmtCreate;


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

@@ -5,7 +5,7 @@
import java.util.Date;

public class EmergencyWorkApprovePageRespDTO {

    //排序
    private Integer sort ;

    public Integer getSort() {
@@ -17,6 +17,7 @@
    }

    private Long id;
    //更新时间
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date gmtCreate;


 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyDrillExecuteQuery.java

@@ -2,6 +2,7 @@

public class EmergencyDrillExecuteQuery {

    //状态 0：待评价 1 ：已评价
    private Boolean status;

    public Boolean getStatus() {

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyDrillPlanQuery.java

@@ -1,7 +1,7 @@
package com.gkhy.safePlatform.emergency.query;

public class EmergencyDrillPlanQuery {

    //演练名称
    private String drillName;

    public String getDrillName() {

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyPlanLogQuery.java

@@ -1,7 +1,7 @@
package com.gkhy.safePlatform.emergency.query;

public class EmergencyPlanLogQuery {

    //预案id
    private Long planId ;

    public Long getPlanId() {

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyPlanQuery.java

@@ -2,6 +2,7 @@

public class EmergencyPlanQuery {

    //废止状态 0：未废止 1：已废止
    private Boolean abolishStatus;

    public Boolean getAbolishStatus() {
@@ -12,8 +13,9 @@
        this.abolishStatus = abolishStatus;
    }

    //预案名称
    private String name ;

    //预案类型
    private Byte type ;

    public String getName() {

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencySuppliesInspectQuery.java

@@ -1,7 +1,7 @@
package com.gkhy.safePlatform.emergency.query;

public class EmergencySuppliesInspectQuery {

    //物资id
    private Long suppliesId ;

    public Long getSuppliesId() {

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencySuppliesMaintainQuery.java

@@ -1,7 +1,7 @@
package com.gkhy.safePlatform.emergency.query;

public class EmergencySuppliesMaintainQuery {

    //物资id
    private Long suppliesId ;

    public Long getSuppliesId() {

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencySuppliesQuery.java

@@ -2,6 +2,7 @@

public class EmergencySuppliesQuery {

    //物资名称
    private String name ;



 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyTeamQuery.java

@@ -2,8 +2,10 @@

public class EmergencyTeamQuery {

    //队伍名称
    private String teamName ;

    //队伍级别
    private Byte teamLevel ;

    public String getTeamName() {

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyWorkApproveQuery.java

@@ -5,9 +5,9 @@
import java.util.Date;

public class EmergencyWorkApproveQuery {

    //关联业务类型 1:应急预案
    private Integer relateType;

    //业务id
    private Long relateId;

    public Integer getRelateType() {
@@ -25,10 +25,10 @@
    public void setRelateId(Long relateId) {
        this.relateId = relateId;
    }

    //开始时间
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date startTime;

    //结束时间
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date endTime;


 emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyDrillExecuteInfoMapper.xml

@@ -197,7 +197,8 @@
            </foreach>
        </if>
        GROUP BY
        DATE_FORMAT( a.gmt_create, '%Y-%m-%d' )
        DATE_FORMAT( a.gmt_create, '%Y-%m-%d' ),
        DATE_FORMAT( a.gmt_create, '%d' )
    </select>

    <select id="selectByMonthAndDeptForIntegerMonth" resultMap="emergencyDrillExecuteCountRPC">
@@ -218,7 +219,8 @@
            </foreach>
        </if>
        GROUP BY
        DATE_FORMAT( a.gmt_create, '%Y-%m' )
        DATE_FORMAT( a.gmt_create, '%Y-%m' ),
        DATE_FORMAT( a.gmt_create, '%m' )
    </select>



 equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/controller/EquipmentInfoController.java

@@ -162,7 +162,7 @@
        repairDetail.setRepairEndDate(new Timestamp(new java.util.Date().getTime()));
        repairDetail.setRepairPersonDepartmentId(0L);
        repairDetail.setRepairMemo("");
        repairDetail.setRepairStatus(0);
        repairDetail.setRepairStatus((byte)0);
        repairDetail.setExceptionInfo("");
        repairDetails.add(repairDetail);
        infoDto.setRepaireDetailList(repairDetails);
@@ -223,10 +223,10 @@
        infoDto.setSetPart("");
        infoDto.setProduceTime(new Timestamp(new java.util.Date().getTime()));
        infoDto.setUseEndDay("");
        infoDto.setLifeCycle(0);
        infoDto.setLifeCycle((byte)0);
        infoDto.setUseDate(new Timestamp(new java.util.Date().getTime()));
        infoDto.setRepairStatus(0);
        infoDto.setStopStatus(0);
        infoDto.setRepairStatus((byte)0);
        infoDto.setStopStatus((byte)0);
        infoDto.setPreviousCheckDate(new Timestamp(new java.util.Date().getTime()));
        infoDto.setPreviousTestDate(new Timestamp(new java.util.Date().getTime()));
        infoDto.setPreviousTakecareDate(new Timestamp(new java.util.Date().getTime()));

 equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/controller/KeypointEquipmentInfoController.java

@@ -149,7 +149,7 @@
        repairDetail.setRepairEndDate(new Timestamp(new java.util.Date().getTime()));
        repairDetail.setRepairPersonDepartmentId(0L);
        repairDetail.setRepairMemo("");
        repairDetail.setRepairStatus(0);
        repairDetail.setRepairStatus((byte)0);
        repairDetail.setExceptionInfo("");
        repairDetails.add(repairDetail);
        infoDto.setRepaireDetailList(repairDetails);
@@ -205,7 +205,7 @@
        infoDto.setConnectPersonId(0L);
        infoDto.setInputPersonId(0L);
        infoDto.setResponsibilityPersonId(0L);
        infoDto.setPartType(0);
        infoDto.setPartType((byte)0);
        infoDto.setCheckCycle("");
        infoDto.setEmergencePlanId(0L);
        infoDto.setDangerousElement("");

 equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentInfo.java

@@ -130,13 +130,13 @@
        this.useEndDay = useEndDay;
    }
                //生命周期 1：已使用 2：库存中 3：报废
            private Integer lifeCycle;
            private Byte lifeCycle;
        
    public Integer getLifeCycle() {
    public Byte getLifeCycle() {
        return lifeCycle;
    }

    public void setLifeCycle(Integer lifeCycle) {
    public void setLifeCycle(Byte lifeCycle) {
        this.lifeCycle = lifeCycle;
    }
                //投用日期
@@ -151,23 +151,23 @@
        this.useDate = useDate;
    }
                //维修状态 1:维修中 2：已修好
            private Integer repairStatus;
            private Byte repairStatus;
        
    public Integer getRepairStatus() {
    public Byte getRepairStatus() {
        return repairStatus;
    }

    public void setRepairStatus(Integer repairStatus) {
    public void setRepairStatus(Byte repairStatus) {
        this.repairStatus = repairStatus;
    }
                //停用状态 1:停用 2.在用 3.维修 4.报废
            private Integer stopStatus;
            private Byte stopStatus;
        
    public Integer getStopStatus() {
    public Byte getStopStatus() {
        return stopStatus;
    }

    public void setStopStatus(Integer stopStatus) {
    public void setStopStatus(Byte stopStatus) {
        this.stopStatus = stopStatus;
    }
                //上次检查日期

 equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentRepairDetail.java

@@ -121,13 +121,13 @@
        this.repairMemo = repairMemo;
    }
                //维修状态  1：维修中 2：已修好
            private Integer repairStatus;
            private Byte repairStatus;
        
    public Integer getRepairStatus() {
    public Byte getRepairStatus() {
        return repairStatus;
    }

    public void setRepairStatus(Integer repairStatus) {
    public void setRepairStatus(Byte repairStatus) {
        this.repairStatus = repairStatus;
    }
                //设施异常项

 equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/KeypointEquipmentInfo.java

@@ -139,13 +139,13 @@
        this.responsibilityPersonName = responsibilityPersonName;
    }
    //装置部位分类 1：关键装置 2：重点部位
    private Integer partType;
    private Byte partType;

    public Integer getPartType() {
    public Byte getPartType() {
        return partType;
    }

    public void setPartType(Integer partType) {
    public void setPartType(Byte partType) {
        this.partType = partType;
    }
    //检查周期

 equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/enums/EquipmentLifeCycleEnum.java

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

import java.util.HashMap;
import java.util.Map;

public enum EquipmentLifeCycleEnum {

    LIVE_CYCLE_ONE((byte) 1, "已投用"),
    LIVE_CYCLE_TWO((byte) 2, "库存中"),
    LIVE_CYCLE_THREE((byte) 3, "报废");


    private Byte code;
    private String value;

    EquipmentLifeCycleEnum(Byte code, String value) {
        this.code = code;
        this.value = value;
    }

    public Byte getCode() {
        return code;
    }

    public void setCode(Byte code) {
        this.code = code;
    }

    public String getValue() {
        return value;
    }

    public void setValue(String value) {
        this.value = value;
    }

    // 转换成为 MAP<Byte, String>, 对外提供查询和遍历功能
    public static Map<Byte, EquipmentLifeCycleEnum> toMap() {
        Map<Byte, EquipmentLifeCycleEnum> map = new HashMap();
        for (EquipmentLifeCycleEnum accidentExpressEnum : EquipmentLifeCycleEnum.values()) {
            map.put(accidentExpressEnum.getCode(), accidentExpressEnum);
        }
        return map;
    }
    public static EquipmentLifeCycleEnum getByCode(Byte code){
        return toMap().get(code);
    }
}

 equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/enums/EquipmentRepairStatusEnum.java

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

import java.util.HashMap;
import java.util.Map;

public enum EquipmentRepairStatusEnum {

    REPAIR_STATUS_ONE((byte) 1, "维修中"),
    REPAIR_STATUS_TWO((byte) 2, "已修好");


    private Byte code;
    private String value;

    EquipmentRepairStatusEnum(Byte code, String value) {
        this.code = code;
        this.value = value;
    }

    public Byte getCode() {
        return code;
    }

    public void setCode(Byte code) {
        this.code = code;
    }

    public String getValue() {
        return value;
    }

    public void setValue(String value) {
        this.value = value;
    }

    // 转换成为 MAP<Byte, String>, 对外提供查询和遍历功能
    public static Map<Byte, EquipmentRepairStatusEnum> toMap() {
        Map<Byte, EquipmentRepairStatusEnum> map = new HashMap();
        for (EquipmentRepairStatusEnum accidentExpressEnum : EquipmentRepairStatusEnum.values()) {
            map.put(accidentExpressEnum.getCode(), accidentExpressEnum);
        }
        return map;
    }
    public static EquipmentRepairStatusEnum getByCode(Byte code){
        return toMap().get(code);
    }
}

 equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/enums/EquipmentResultCodes.java

@@ -2,6 +2,13 @@

public enum EquipmentResultCodes {

    EQUIPMENT_ENUM_LIFE_CYCLE_NOT_EXIST("E1001","设备生命周期类型异常"),

    EQUIPMENT_ENUM_STOP_STATUS_NOT_EXIST("E1002","设备停用状态类型异常"),

    EQUIPMENT_ENUM_REPAIR_STATUS_NOT_EXIST("E1003","设备维修状态类型异常"),

    KEYPOINT_EQUIPMENT_ENUM_PART_TYPE_NOT_EXIST("K1001","重点设备装置部位分类类型异常"),

    ERROR("A3000", "未知错误");


 equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/enums/EquipmentStopStatusEnum.java

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

import java.util.HashMap;
import java.util.Map;

public enum EquipmentStopStatusEnum {

    STOP_STATUS_ONE((byte) 1, "停用"),
    STOP_STATUS_TWO((byte) 2, "在用"),
    STOP_STATUS_THREE((byte) 3, "维修"),
    STOP_STATUS_FOUR((byte) 4, "报废");


    private Byte code;
    private String value;

    EquipmentStopStatusEnum(Byte code, String value) {
        this.code = code;
        this.value = value;
    }

    public Byte getCode() {
        return code;
    }

    public void setCode(Byte code) {
        this.code = code;
    }

    public String getValue() {
        return value;
    }

    public void setValue(String value) {
        this.value = value;
    }

    // 转换成为 MAP<Byte, String>, 对外提供查询和遍历功能
    public static Map<Byte, EquipmentStopStatusEnum> toMap() {
        Map<Byte, EquipmentStopStatusEnum> map = new HashMap();
        for (EquipmentStopStatusEnum accidentExpressEnum : EquipmentStopStatusEnum.values()) {
            map.put(accidentExpressEnum.getCode(), accidentExpressEnum);
        }
        return map;
    }
    public static EquipmentStopStatusEnum getByCode(Byte code){
        return toMap().get(code);
    }
}

 equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/enums/KeypointEquipmentPartTypeEnum.java

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

import java.util.HashMap;
import java.util.Map;

public enum KeypointEquipmentPartTypeEnum {

    PART_TYPE_ONE((byte) 1, "关键装置"),
    PART_TYPE_TWO((byte) 2, "重点部位");


    private Byte code;
    private String value;

    KeypointEquipmentPartTypeEnum(Byte code, String value) {
        this.code = code;
        this.value = value;
    }

    public Byte getCode() {
        return code;
    }

    public void setCode(Byte code) {
        this.code = code;
    }

    public String getValue() {
        return value;
    }

    public void setValue(String value) {
        this.value = value;
    }

    // 转换成为 MAP<Byte, String>, 对外提供查询和遍历功能
    public static Map<Byte, KeypointEquipmentPartTypeEnum> toMap() {
        Map<Byte, KeypointEquipmentPartTypeEnum> map = new HashMap();
        for (KeypointEquipmentPartTypeEnum accidentExpressEnum : KeypointEquipmentPartTypeEnum.values()) {
            map.put(accidentExpressEnum.getCode(), accidentExpressEnum);
        }
        return map;
    }
    public static KeypointEquipmentPartTypeEnum getByCode(Byte code){
        return toMap().get(code);
    }
}

 equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/EquipmentInfoImportExcel.java

@@ -38,16 +38,16 @@
    private String useEndDay;
    //生命周期 1：已使用 2：库存中 3：报废
    @ExcelCell(index = 11)
    private Integer lifeCycle;
    private Byte lifeCycle;
    //投用日期
    @ExcelCell(index = 12)
    private Timestamp useDate;
    //维修状态 1:维修中 2：已修好
    @ExcelCell(index = 13)
    private Integer repairStatus;
    private Byte repairStatus;
    //停用状态 1:停用 2.在用 3.维修 4.报废
    @ExcelCell(index = 14)
    private Integer stopStatus;
    private Byte stopStatus;
    //上次检查日期
    @ExcelCell(index = 15)
    private Timestamp previousCheckDate;
@@ -242,11 +242,11 @@
        this.useEndDay = useEndDay;
    }
    //生命周期 1：已使用 2：库存中 3：报废        
    public Integer getLifeCycle() {
    public Byte getLifeCycle() {
        return lifeCycle;
    }

    public void setLifeCycle(Integer lifeCycle) {
    public void setLifeCycle(Byte lifeCycle) {
        this.lifeCycle = lifeCycle;
    }
    //投用日期        
@@ -258,19 +258,19 @@
        this.useDate = useDate;
    }
    //维修状态 1:维修中 2：已修好        
    public Integer getRepairStatus() {
    public Byte getRepairStatus() {
        return repairStatus;
    }

    public void setRepairStatus(Integer repairStatus) {
    public void setRepairStatus(Byte repairStatus) {
        this.repairStatus = repairStatus;
    }
    //停用状态 1:停用 2.在用 3.维修 4.报废        
    public Integer getStopStatus() {
    public Byte getStopStatus() {
        return stopStatus;
    }

    public void setStopStatus(Integer stopStatus) {
    public void setStopStatus(Byte stopStatus) {
        this.stopStatus = stopStatus;
    }
    //上次检查日期        

 equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/EquipmentInfoSaveOrUpdate.java

@@ -33,14 +33,14 @@
    //使用期限(天)    
    private String useEndDay;
    //生命周期 1：已使用 2：库存中 3：报废    
    private Integer lifeCycle;
    private Byte lifeCycle;
    //投用日期
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Timestamp useDate;
    //维修状态 1:维修中 2：已修好    
    private Integer repairStatus;
    private Byte repairStatus;
    //停用状态 1:停用 2.在用 3.维修 4.报废    
    private Integer stopStatus;
    private Byte stopStatus;
    //上次检查日期
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Timestamp previousCheckDate;
@@ -354,11 +354,11 @@
        this.useEndDay = useEndDay;
    }
    //生命周期 1：已使用 2：库存中 3：报废        
    public Integer getLifeCycle() {
    public Byte getLifeCycle() {
        return lifeCycle;
    }

    public void setLifeCycle(Integer lifeCycle) {
    public void setLifeCycle(Byte lifeCycle) {
        this.lifeCycle = lifeCycle;
    }
    //投用日期        
@@ -370,19 +370,19 @@
        this.useDate = useDate;
    }
    //维修状态 1:维修中 2：已修好        
    public Integer getRepairStatus() {
    public Byte getRepairStatus() {
        return repairStatus;
    }

    public void setRepairStatus(Integer repairStatus) {
    public void setRepairStatus(Byte repairStatus) {
        this.repairStatus = repairStatus;
    }
    //停用状态 1:停用 2.在用 3.维修 4.报废        
    public Integer getStopStatus() {
    public Byte getStopStatus() {
        return stopStatus;
    }

    public void setStopStatus(Integer stopStatus) {
    public void setStopStatus(Byte stopStatus) {
        this.stopStatus = stopStatus;
    }
    //上次检查日期        

 equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/EquipmentRepairDetailQueryCriteria.java

@@ -34,7 +34,7 @@
    private String repairMemo;
    //维修状态  1：维修中 2：已修好    
    @Query()
    private Integer repairStatus;
    private Byte repairStatus;
    //设施异常项    
    @Query()
    private String exceptionInfo;
@@ -122,11 +122,11 @@
        this.repairMemo = repairMemo;
    }
    //维修状态  1：维修中 2：已修好        
    public Integer getRepairStatus() {
    public Byte getRepairStatus() {
        return repairStatus;
    }

    public void setRepairStatus(Integer repairStatus) {
    public void setRepairStatus(Byte repairStatus) {
        this.repairStatus = repairStatus;
    }
    //设施异常项        

 equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/KeypointEquipmentInfoImportExcel.java

@@ -33,7 +33,7 @@
    private Long responsibilityPersonId;
    //装置部位分类 1：关键装置 2：重点部位
    @ExcelCell(index = 9)
    private Integer partType;
    private Byte partType;
    //检查周期
    @ExcelCell(index = 10)
    private String checkCycle;
@@ -125,11 +125,11 @@
        this.responsibilityPersonId = responsibilityPersonId;
    }
    //装置部位分类 1：关键装置 2：重点部位        
    public Integer getPartType() {
    public Byte getPartType() {
        return partType;
    }

    public void setPartType(Integer partType) {
    public void setPartType(Byte partType) {
        this.partType = partType;
    }
    //检查周期        

 equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/EquipmentInfoDto.java

@@ -35,13 +35,13 @@
    //使用期限(天)    
    private String useEndDay;
    //生命周期 1：已使用 2：库存中 3：报废    
    private Integer lifeCycle;
    private Byte lifeCycle;
    //投用日期    
    private Timestamp useDate;
    //维修状态 1:维修中 2：已修好    
    private Integer repairStatus;
    private Byte repairStatus;
    //停用状态 1:停用 2.在用 3.维修 4.报废    
    private Integer stopStatus;
    private Byte stopStatus;
    //上次检查日期    
    private Timestamp previousCheckDate;
    //上次检测日期    
@@ -312,11 +312,11 @@
        this.useEndDay = useEndDay;
    }
    //生命周期 1：已使用 2：库存中 3：报废        
    public Integer getLifeCycle() {
    public Byte getLifeCycle() {
        return lifeCycle;
    }

    public void setLifeCycle(Integer lifeCycle) {
    public void setLifeCycle(Byte lifeCycle) {
        this.lifeCycle = lifeCycle;
    }
    //投用日期        
@@ -328,19 +328,19 @@
        this.useDate = useDate;
    }
    //维修状态 1:维修中 2：已修好        
    public Integer getRepairStatus() {
    public Byte getRepairStatus() {
        return repairStatus;
    }

    public void setRepairStatus(Integer repairStatus) {
    public void setRepairStatus(Byte repairStatus) {
        this.repairStatus = repairStatus;
    }
    //停用状态 1:停用 2.在用 3.维修 4.报废        
    public Integer getStopStatus() {
    public Byte getStopStatus() {
        return stopStatus;
    }

    public void setStopStatus(Integer stopStatus) {
    public void setStopStatus(Byte stopStatus) {
        this.stopStatus = stopStatus;
    }
    //上次检查日期        

 equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/EquipmentInfoExcel.java

@@ -41,16 +41,16 @@
    private String useEndDay;
    //生命周期 1：已使用 2：库存中 3：报废
    @ExcelCell(index = 11)
    private Integer lifeCycle;
    private Byte lifeCycle;
    //投用日期
    @ExcelCell(index = 12)
    private Timestamp useDate;
    //维修状态 1:维修中 2：已修好
    @ExcelCell(index = 13)
    private Integer repairStatus;
    private Byte repairStatus;
    //停用状态 1:停用 2.在用 3.维修 4.报废    
    @ExcelCell(index = 14)
    private Integer stopStatus;
    private Byte stopStatus;
    //上次检查日期
    @ExcelCell(index = 15)
    private Timestamp previousCheckDate;
@@ -253,11 +253,11 @@
        this.useEndDay = useEndDay;
    }
    //生命周期 1：已使用 2：库存中 3：报废        
    public Integer getLifeCycle() {
    public Byte getLifeCycle() {
        return lifeCycle;
    }

    public void setLifeCycle(Integer lifeCycle) {
    public void setLifeCycle(Byte lifeCycle) {
        this.lifeCycle = lifeCycle;
    }
    //投用日期        
@@ -269,19 +269,19 @@
        this.useDate = useDate;
    }
    //维修状态 1:维修中 2：已修好        
    public Integer getRepairStatus() {
    public Byte getRepairStatus() {
        return repairStatus;
    }

    public void setRepairStatus(Integer repairStatus) {
    public void setRepairStatus(Byte repairStatus) {
        this.repairStatus = repairStatus;
    }
    //停用状态 1:停用 2.在用 3.维修 4.报废        
    public Integer getStopStatus() {
    public Byte getStopStatus() {
        return stopStatus;
    }

    public void setStopStatus(Integer stopStatus) {
    public void setStopStatus(Byte stopStatus) {
        this.stopStatus = stopStatus;
    }
    //上次检查日期        

 equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/EquipmentRepairDetailDto.java

@@ -21,7 +21,7 @@
    //维修情况    
    private String repairMemo;
    //维修状态  1：维修中 2：已修好    
    private Integer repairStatus;
    private Byte repairStatus;
    //设施异常项    
    private String exceptionInfo;
    //创建日期    
@@ -94,11 +94,11 @@
        this.repairMemo = repairMemo;
    }
    //维修状态  1：维修中 2：已修好        
    public Integer getRepairStatus() {
    public Byte getRepairStatus() {
        return repairStatus;
    }

    public void setRepairStatus(Integer repairStatus) {
    public void setRepairStatus(Byte repairStatus) {
        this.repairStatus = repairStatus;
    }
    //设施异常项        

 equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/KeypointEquipmentInfoDto.java

@@ -62,7 +62,7 @@
        this.responsibilityPersonName = responsibilityPersonName;
    }
    //装置部位分类 1：关键装置 2：重点部位    
    private Integer partType;
    private Byte partType;
    //检查周期    
    private String checkCycle;
    //应急预案/外键    
@@ -289,11 +289,11 @@
        this.responsibilityPersonId = responsibilityPersonId;
    }
    //装置部位分类 1：关键装置 2：重点部位        
    public Integer getPartType() {
    public Byte getPartType() {
        return partType;
    }

    public void setPartType(Integer partType) {
    public void setPartType(Byte partType) {
        this.partType = partType;
    }
    //检查周期        

 equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/KeypointEquipmentInfoExcel.java

@@ -40,7 +40,7 @@
    private Long responsibilityPersonId;
    //装置部位分类 1：关键装置 2：重点部位
    @ExcelCell(index = 9)
    private Integer partType;
    private Byte partType;
    //检查周期
    @ExcelCell(index = 10)
    private String checkCycle;
@@ -271,11 +271,11 @@
        this.responsibilityPersonId = responsibilityPersonId;
    }
    //装置部位分类 1：关键装置 2：重点部位        
    public Integer getPartType() {
    public Byte getPartType() {
        return partType;
    }

    public void setPartType(Integer partType) {
    public void setPartType(Byte partType) {
        this.partType = partType;
    }
    //检查周期        

 equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/EquipmentInfoServiceImpl.java

@@ -14,6 +14,10 @@
import com.gkhy.safePlatform.commons.vo.ResultVO;
import com.gkhy.safePlatform.commons.vo.SearchResultVO;
import com.gkhy.safePlatform.equipment.entity.*;
import com.gkhy.safePlatform.equipment.enums.EquipmentLifeCycleEnum;
import com.gkhy.safePlatform.equipment.enums.EquipmentRepairStatusEnum;
import com.gkhy.safePlatform.equipment.enums.EquipmentResultCodes;
import com.gkhy.safePlatform.equipment.enums.EquipmentStopStatusEnum;
import com.gkhy.safePlatform.equipment.excepiton.EquipmentException;
import com.gkhy.safePlatform.equipment.model.dto.req.*;
import com.gkhy.safePlatform.equipment.model.dto.resp.EquipmentInfoDto;
@@ -235,6 +239,10 @@

    @Override
    public void addOrUpdate(EquipmentInfoSaveOrUpdate infoDto) {

        // 验证枚举
        checkEnum(infoDto);

        if(infoDto.getInfoType() == null || infoDto.getEquipmentTypeId() == null){
            throw new EquipmentException(ResultCodes.CLIENT_PARAM_ILLEGAL);
        }
@@ -559,4 +567,23 @@
        ExcelUtil.exportExcel(map,respList , response.getOutputStream(),DateUtils.PATTERN_STANDARD);
        response.getOutputStream().close();
    }


    /**
     * 枚举验证
     * @param infoDto
     */
    public void checkEnum(EquipmentInfoSaveOrUpdate infoDto){
        if (EquipmentLifeCycleEnum.getByCode(infoDto.getLifeCycle()) == null) {
            throw new EquipmentException(EquipmentResultCodes.EQUIPMENT_ENUM_LIFE_CYCLE_NOT_EXIST);
        }

        if (EquipmentRepairStatusEnum.getByCode(infoDto.getRepairStatus()) == null) {
            throw new EquipmentException(EquipmentResultCodes.EQUIPMENT_ENUM_STOP_STATUS_NOT_EXIST);
        }

        if (EquipmentStopStatusEnum.getByCode(infoDto.getStopStatus()) == null) {
            throw new EquipmentException(EquipmentResultCodes.EQUIPMENT_ENUM_REPAIR_STATUS_NOT_EXIST);
        }
    }
}

 equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/KeypointEquipmentInfoServiceImpl.java

@@ -7,6 +7,8 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.gkhy.safePlatform.account.rpc.apimodel.AccountDepartmentService;
import com.gkhy.safePlatform.equipment.entity.*;
import com.gkhy.safePlatform.equipment.enums.EquipmentResultCodes;
import com.gkhy.safePlatform.equipment.enums.KeypointEquipmentPartTypeEnum;
import com.gkhy.safePlatform.equipment.excepiton.EquipmentException;
import com.gkhy.safePlatform.equipment.model.dto.req.*;
import com.gkhy.safePlatform.equipment.model.dto.resp.KeypointEquipmentInfoExcel;
@@ -241,6 +243,10 @@

    @Override
    public void addOrUpdate(KeypointEquipmentInfoDto infoDto) {

        // 验证枚举
        checkEnum(infoDto);

        KeypointEquipmentInfo equipmentInfo = BeanCopyUtils.copyBean(infoDto, KeypointEquipmentInfo.class);
        //保存主数据
        if (infoDto.getId() == null) { //新增
@@ -453,4 +459,14 @@
        ExcelUtil.exportExcel(map,respList , response.getOutputStream(),DateUtils.PATTERN_STANDARD);
        response.getOutputStream().close();
    }

    /**
     * 枚举验证
     * @param infoDto
     */
    public void checkEnum(KeypointEquipmentInfoDto infoDto){
        if (KeypointEquipmentPartTypeEnum.getByCode(infoDto.getPartType()) == null) {
            throw new EquipmentException(EquipmentResultCodes.KEYPOINT_EQUIPMENT_ENUM_PART_TYPE_NOT_EXIST);
        }
    }
}

 goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/ExamineMngController.java

@@ -76,9 +76,9 @@
    @PostMapping(value = "/addOrUpdate")
    public ResultVO update(Authentication authentication, @RequestBody ExamineMng examineMng) {
        // 获取当前用户
        ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
/*        ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
        examineMng.setExamineDepartmentId(currentUser.getDepId());
        examineMng.setExaminePersonId(currentUser.getUid());
        examineMng.setExaminePersonId(currentUser.getUid());*/
        if (examineMng.getId() == null) {
            return new ResultVO<>(ResultCodes.OK,examineMngBaseService.save(examineMng));
        } else {

 goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/RewardPunishmentDetailController.java

 goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetMngController.java

@@ -11,6 +11,9 @@
import com.gkhy.safePlatform.commons.vo.ResultVO;
import com.gkhy.safePlatform.targetDuty.entity.TargetDivideDetail;
import com.gkhy.safePlatform.targetDuty.entity.TargetMng;
import com.gkhy.safePlatform.targetDuty.enums.TargetDutyResultCodes;
import com.gkhy.safePlatform.targetDuty.enums.TargetMngLevelEnum;
import com.gkhy.safePlatform.targetDuty.excepiton.TargetDutyException;
import com.gkhy.safePlatform.targetDuty.model.dto.req.TargetCheckAndSubmitQueryCriteria;
import com.gkhy.safePlatform.targetDuty.model.dto.req.TargetMngImportExcel;
import com.gkhy.safePlatform.targetDuty.model.dto.req.TargetMngQueryCriteria;
@@ -93,6 +96,10 @@
     */
    @PostMapping(value = "/addOrUpdate")
    public ResultVO update(@RequestBody TargetMng targetMng) {

        if (TargetMngLevelEnum.getByCode(targetMng.getLevel())==null){
            throw new TargetDutyException(TargetDutyResultCodes.TARGET_MNG_ENUM_LEVEL_NOT_EXIST);
        }

        if( !StringUtils.hasText(targetMng.getqName()) ||  !StringUtils.hasText(targetMng.getIndexNum())
                ||  !StringUtils.hasText(targetMng.getYear()) ||  !StringUtils.hasText(targetMng.getValue())
@@ -182,7 +189,7 @@
        mng.setIndexNum("3");
        mng.setYear("2021");
        mng.setValue("312");
        mng.setLevel(1);
        mng.setLevel((byte)1);
        mng.setCompleteDate(new Timestamp(new java.util.Date().getTime()));
        mng.setMemo("发发发");
        mng.setTargetType(0);

 goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetMng.java

@@ -80,13 +80,13 @@
        this.valueSign = valueSign;
    }
                //指标级别 1:公司级 2:部门分厂级 3:工段班组级
            private Integer level;
            private Byte level;
        
    public Integer getLevel() {
    public Byte getLevel() {
        return level;
    }

    public void setLevel(Integer level) {
    public void setLevel(Byte level) {
        this.level = level;
    }
                //完成期限

 goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/enums/TargetDutyResultCodes.java

@@ -14,6 +14,9 @@

    APPROVE_NOT_EXIST("A1005" , "审批记录不存在"),

    TARGET_MNG_ENUM_LEVEL_NOT_EXIST("T1000","目标设置指标级别类型异常"),


    ERROR("A3000", "未知错误");

    private String code;

 goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/enums/TargetMngLevelEnum.java

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

import java.util.HashMap;
import java.util.Map;

public enum TargetMngLevelEnum {


    Level_ONE((byte) 1, "公司级"),
    Level_TWO((byte) 2, "部门分厂级"),
    Level_THREE((byte) 3, "工段班组级");


    private Byte code;
    private String value;

    TargetMngLevelEnum(Byte code, String value) {
        this.code = code;
        this.value = value;
    }

    public Byte getCode() {
        return code;
    }

    public void setCode(Byte code) {
        this.code = code;
    }

    public String getValue() {
        return value;
    }

    public void setValue(String value) {
        this.value = value;
    }

    // 转换成为 MAP<Byte, String>, 对外提供查询和遍历功能
    public static Map<Byte, TargetMngLevelEnum> toMap() {
        Map<Byte, TargetMngLevelEnum> map = new HashMap();
        for (TargetMngLevelEnum accidentExpressEnum : TargetMngLevelEnum.values()) {
            map.put(accidentExpressEnum.getCode(), accidentExpressEnum);
        }
        return map;
    }
    public static TargetMngLevelEnum getByCode(Byte code){
        return toMap().get(code);
    }
}

 goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/TargetMngDto.java

@@ -19,7 +19,7 @@
    //指标值    
    private String value;
    //指标级别 1:公司级 2:部门分厂级 3:工段班组级    
    private Integer level;
    private Byte level;
    //完成期限    
    private Timestamp completeDate;
    //备注信息    
@@ -85,11 +85,11 @@
        this.value = value;
    }
    //指标级别 1:公司级 2:部门分厂级 3:工段班组级        
    public Integer getLevel() {
    public Byte getLevel() {
        return level;
    }

    public void setLevel(Integer level) {
    public void setLevel(Byte level) {
        this.level = level;
    }
    //完成期限        

 goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/schedule/KeepAliveRobot.java

@@ -1,6 +1,7 @@
package com.gkhy.safePlatform.targetDuty.schedule;

import com.gkhy.safePlatform.targetDuty.service.TargetTypeService;
import com.gkhy.safePlatform.targetDuty.service.baseService.TargetTypeBaseService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.scheduling.annotation.EnableScheduling;
@@ -14,14 +15,13 @@
public class KeepAliveRobot {

    @Autowired
    private TargetTypeService targetTypeService;
    private TargetTypeBaseService targetTypeBaseService;

    // 30m
    @Scheduled(cron = "0 0/30 * * * ?")
    public void keepAlive(){
        //
//        targetTypeService.getById(-1L);

        targetTypeBaseService.getById(1L);
    }

}

 goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/ExamineMngServiceImpl.java

@@ -135,6 +135,7 @@
        List<CurrentExamineDto> list = JSONObject.parseArray( examineMng.getNumberDetailJson(), CurrentExamineDto.class);
        List<Long> idList = list.stream().map(CurrentExamineDto::getId).collect(Collectors.toList());

        if(!idList.isEmpty()) {
        List<ExamineItem> itemList = examineItemBaseService.selectBatchIds(idList);
        Map<Long,ExamineItem> itemMap = itemList.stream().collect(
                Collectors.toMap(ExamineItem::getId, Function.identity(),(k1, k2)->k1));
@@ -149,6 +150,7 @@
                }
            });
        }
        }
        dto.setCurrentExamineDtoList(list);

        //获取合格分数

 goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetMngServiceImpl.java

@@ -386,5 +386,9 @@
        response.getOutputStream().close();
    }

    public void checkEnum(){

    }


}

 incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/controller/AccidentExpressController.java

@@ -87,8 +87,8 @@
     * 事故快报伤亡人员删除
     */
    @RequestMapping(value = "/casualty/del/{accidentExpressId}",method = RequestMethod.GET)
    public ResultVO delAccidentExpressCasualty(@PathVariable("accidentExpressId")Long accidentExpressId){
        return accidentExpressService.delAccidentExpressCasualty(accidentExpressId);
    public ResultVO delAccidentExpressCasualty(@PathVariable("accidentExpressId")Long id){
        return accidentExpressService.delAccidentExpressCasualty(id);
    }

}

 incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/AccidentExpressService.java

@@ -28,5 +28,5 @@

    ResultVO addAccidentExpressCasualty(Long uid, AccidentExpressCasualtyReqDTO accidentExpressCasualtyReqDTO);

    ResultVO delAccidentExpressCasualty(Long accidentExpressId);
    ResultVO delAccidentExpressCasualty(Long id);
}

 incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/impl/AccidentExpressServiceImpl.java

@@ -273,8 +273,8 @@
    }

    @Override
    public ResultVO delAccidentExpressCasualty(Long accidentExpressId) {
        accidentExpressCasualtyInfoService.deleteAccidentExpressCasualtyById(accidentExpressId);
    public ResultVO delAccidentExpressCasualty(Long id) {
        accidentExpressCasualtyInfoService.deleteAccidentExpressCasualtyById(id);
        return new ResultVO(ResultCodes.OK);
    }


 incident-manage/incident-manage-service/src/main/resources/config/mapper/incidentManage/AccidentReportInfoMapper.xml

@@ -249,7 +249,8 @@
            AND a.gmt_create <![CDATA[ <= ]]> #{endTime}
        GROUP BY
            DATE_FORMAT( a.gmt_create, '%Y-%m' ),
            a.accident_level
            a.accident_level,
            DATE_FORMAT( a.gmt_create, '%m' )
    </select>

    <select id="getCountForRPCByDeptIdAndDay" resultMap="accidentReportCountRPC">
@@ -271,6 +272,7 @@
            AND a.gmt_create <![CDATA[ <= ]]> #{endTime}
        GROUP BY
            DATE_FORMAT( a.gmt_create, '%Y-%m-%d' ),
            a.accident_level
            a.accident_level,
            DATE_FORMAT( a.gmt_create, '%d' )
    </select>
</mapper>

 safePlatfrom-out-web/src/main/resources/config/application-dev.yaml

@@ -32,7 +32,7 @@
      type: com.alibaba.druid.pool.DruidDataSource
    equipment:
      driver-class-name: com.mysql.cj.jdbc.Driver
      url: jdbc:mysql://192.168.0.52:3306/safeplatform.equipment.dev?allowMultiQueries=true&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
      url: jdbc:mysql://192.168.0.52:3306/safeplatform.equipment.dev?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
      username: gkhy_dev_out_team
      password: Adsdf675T6AC7yga
      type: com.alibaba.druid.pool.DruidDataSource

 safePlatfrom-out-web/src/main/resources/config/application.yaml

@@ -2,7 +2,7 @@
  application:
    name: safeplatform-out
  profiles:
    active: guotai-uat
    active: dev
#    active: guotai-demo
#### test  uat  guotai-demo guotai-uat
#    active: test