临时提交-已经与app端对接完成

16639036659

2023-06-26 28f6c716269ce5435b103137dd7ec1f1f9ab19ba

临时提交-已经与app端对接完成

 src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportCheckRecordFromTaskDTO.java

@@ -1,11 +1,8 @@
package com.ruoyi.doublePrevention.entity.CJReport.CJdto.HandlerDO;



import com.baomidou.mybatisplus.annotation.TableName;

import lombok.Data;



import java.io.Serializable;

import java.util.Date;



//@TableName("prevent_cj_report_check_record_from_task")

@Data

public class CJReportCheckRecordFromTaskDTO {

    /**

     * 主键

@@ -16,142 +13,49 @@
     */

    private String companyCode;

    /**

     * 删除标志：0-有效，1-删除

     */

    private String deleted;

    /**

     * 创建时间

     */

    private String createDate;

    /**

     * 创建人

     */

    private String createBy;

    /**

     * 最后修改时间

     */

    private String updateDate;

    /**

     * 修改人

     */

    private String updateBy;

    /**

     * 隐患排查作业UUID

     */

    private String checkTaskId;

    /**

     * 排 查 结 果

     */

    private String checkStatus;

    /**

     * 排查时间

     */

    private String checkTime;



    private String mobileMe;



    private String isDefend;

    /**

     * 修改人手机号

     * 创建人

     */

    private String updateByMobile;

    private String createBy;

    /**

     * 创建人手机号

     */

    private String createByMobile;





    public String getId() {

        return id;

    }



    public void setId(String id) {

        this.id = id;

    }

//    /**

//     * 排 查 结 果

//     */

//    private String checkStatus;

//    /**

//     * 修改人手机号

//     */

//    private String updateByMobile;

//    /**

//     * 创建时间

//     */

//    private String createDate;

//    /**

//     * 最后修改时间

//     */

//    private String updateDate;

//    /**

//     * 修改人

//     */

//    private String updateBy;



    public String getCompanyCode() {

        return companyCode;

    }



    public void setCompanyCode(String companyCode) {

        this.companyCode = companyCode;

    }



    public String getDeleted() {

        return deleted;

    }



    public void setDeleted(String deleted) {

        this.deleted = deleted;

    }



    public String getCreateDate() {

        return createDate;

    }



    public void setCreateDate(String createDate) {

        this.createDate = createDate;

    }



    public String getCreateBy() {

        return createBy;

    }



    public void setCreateBy(String createBy) {

        this.createBy = createBy;

    }



    public String getUpdateDate() {

        return updateDate;

    }



    public void setUpdateDate(String updateDate) {

        this.updateDate = updateDate;

    }



    public String getUpdateBy() {

        return updateBy;

    }



    public void setUpdateBy(String updateBy) {

        this.updateBy = updateBy;

    }



    public String getCheckTaskId() {

        return checkTaskId;

    }



    public void setCheckTaskId(String checkTaskId) {

        this.checkTaskId = checkTaskId;

    }



    public String getCheckStatus() {

        return checkStatus;

    }



    public void setCheckStatus(String checkStatus) {

        this.checkStatus = checkStatus;

    }



    public String getCheckTime() {

        return checkTime;

    }



    public void setCheckTime(String checkTime) {

        this.checkTime = checkTime;

    }



    public String getCreateByMobile() {

        return createByMobile;

    }



    public void setCreateByMobile(String createByMobile) {

        this.createByMobile = createByMobile;

    }



    public String getUpdateByMobile() {

        return updateByMobile;

    }



    public void setUpdateByMobile(String updateByMobile) {

        this.updateByMobile = updateByMobile;

    }



}




 src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportCheckTaskFromWorkDTO.java

@@ -1,11 +1,13 @@
package com.ruoyi.doublePrevention.entity.CJReport.CJdto.HandlerDO;



import com.baomidou.mybatisplus.annotation.TableName;

import lombok.Data;



import java.io.Serializable;

import java.util.Date;



//@TableName("prevent_cj_report_check_task_from_work")



@Data

public class CJReportCheckTaskFromWorkDTO implements Serializable {

    /**

     * 主键

@@ -15,6 +17,54 @@
     * 公司编码

     */

    private String companyCode;

    /**

     * 管控措施UUID

     */

    private String riskMeasureId;

    /**

     * 隐患排查内容

     */

    private String troubleshootContent;

    /**

     * 巡检周期

     */

    private Integer checkCycle;

    /**

     * 巡检周期单位 小时，日，月，年

     */

    private String checkCycleUnit;



    /**

     *任务开始时间

     * 指该任 务首次开始执行的时间，必填

     */

    private String taskStartTime;

    /**

     *当巡检周期是小时的时候为必填

     */

    private String workStartTime;

    /**

     *当巡检周期是小时的时候为必填

     */

    private String workEndTime;

    /**

     *工作日类型(每天：0；法定工作日(除法定

     * 放假以外的所有)：1 ；非法定工作日(除了放假的时候)：2)

     */

    private String workDayType;

    /**

     *任务类型 任务类型(日常任务： 0；主要负责人

     * 任务：1 ；技术负责人任务：2；操作负责人任务：3；) 默认为日常任务：

     * 0

     */

    private String workType;

    /**

     *包保任务对应项 当任务类型为主要负责人任务、

     * 技术负责人任务、操作负责人任务时，此项为必填。

     */

    private String taskNum;





    /**

     * 删除标志：0-有效，1-删除

     */

@@ -35,98 +85,7 @@
     * 修改人

     */

    private String updateBy;

    /**

     * 管控措施UUID

     */

    private String riskMeasureId;

    /**

     * 巡检周期

     */

    private Integer checkCycle;

    /**

     * 巡检周期单位 小时，日，月，年

     */

    private String checkCycleUnit;





    public String getId() {

        return id;

    }



    public void setId(String id) {

        this.id = id;

    }



    public String getCompanyCode() {

        return companyCode;

    }



    public void setCompanyCode(String companyCode) {

        this.companyCode = companyCode;

    }



    public String getDeleted() {

        return deleted;

    }



    public void setDeleted(String deleted) {

        this.deleted = deleted;

    }



    public String getCreateBy() {

        return createBy;

    }



    public void setCreateBy(String createBy) {

        this.createBy = createBy;

    }



    public String getCreateDate() {

        return createDate;

    }



    public void setCreateDate(String createDate) {

        this.createDate = createDate;

    }



    public String getUpdateDate() {

        return updateDate;

    }



    public void setUpdateDate(String updateDate) {

        this.updateDate = updateDate;

    }



    public String getUpdateBy() {

        return updateBy;

    }



    public void setUpdateBy(String updateBy) {

        this.updateBy = updateBy;

    }



    public String getRiskMeasureId() {

        return riskMeasureId;

    }



    public void setRiskMeasureId(String riskMeasureId) {

        this.riskMeasureId = riskMeasureId;

    }



    public Integer getCheckCycle() {

        return checkCycle;

    }



    public void setCheckCycle(Integer checkCycle) {

        this.checkCycle = checkCycle;

    }



    public String getCheckCycleUnit() {

        return checkCycleUnit;

    }



    public void setCheckCycleUnit(String checkCycleUnit) {

        this.checkCycleUnit = checkCycleUnit;

    }

}




 src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportDangerInfoDTO.java

@@ -1,11 +1,12 @@
package com.ruoyi.doublePrevention.entity.CJReport.CJdto.HandlerDO;



import com.baomidou.mybatisplus.annotation.TableName;

import lombok.Data;



import java.io.Serializable;

import java.util.Date;



//@TableName("prevent_cj_report_danger_info")

@Data

public class CJReportDangerInfoDTO{

    /**

     * 主键

@@ -15,26 +16,6 @@
     * 公司编码

     */

    private String companyCode;

    /**

     * 删除标志：0-有效，1-删除

     */

    private String deleted;

    /**

     * 创建时间

     */

    private String createDate;

    /**

     * 创建人

     */

    private String createBy;

    /**

     * 最后修改时间

     */

    private String updateDate;

    /**

     * 修改人

     */

    private String updateBy;

    /**

     * 安全风险分析对象编码

     */

@@ -92,6 +73,10 @@
     */

    private String hazardDangerType;

    /**

     * 隐患类别(其他隐患0 ;主要负责人隐患1;技术负责人隐患2 ;操作负责人隐患3

     */

    private String hazardCategory;

    /**

     * 登记人姓名

     */

    private String registrant;

@@ -115,220 +100,27 @@
     * 验收时间

     */

    private String checkAcceptTime;

    /**

     * 删除标志：0-有效，1-删除

     */

    private String deleted;

    /**

     * 创建时间

     */

    private String createDate;

    /**

     * 创建人

     */

    private String createBy;

    /**

     * 最后修改时间

     */

    private String updateDate;

    /**

     * 修改人

     */

    private String updateBy;



    public String getId() {

        return id;

    }



    public void setId(String id) {

        this.id = id;

    }



    public String getCompanyCode() {

        return companyCode;

    }



    public void setCompanyCode(String companyCode) {

        this.companyCode = companyCode;

    }



    public String getCreateBy() {

        return createBy;

    }



    public void setCreateBy(String createBy) {

        this.createBy = createBy;

    }



    public String getUpdateBy() {

        return updateBy;

    }



    public void setUpdateBy(String updateBy) {

        this.updateBy = updateBy;

    }



    public String getHazardCode() {

        return hazardCode;

    }



    public void setHazardCode(String hazardCode) {

        this.hazardCode = hazardCode;

    }



    public String getRiskMeasureId() {

        return riskMeasureId;

    }



    public void setRiskMeasureId(String riskMeasureId) {

        this.riskMeasureId = riskMeasureId;

    }



    public String getCheckRecordId() {

        return checkRecordId;

    }



    public void setCheckRecordId(String checkRecordId) {

        this.checkRecordId = checkRecordId;

    }



    public String getDangerName() {

        return dangerName;

    }



    public void setDangerName(String dangerName) {

        this.dangerName = dangerName;

    }



    public String getDangerLevel() {

        return dangerLevel;

    }



    public void setDangerLevel(String dangerLevel) {

        this.dangerLevel = dangerLevel;

    }



    public String getDangerSrc() {

        return dangerSrc;

    }



    public void setDangerSrc(String dangerSrc) {

        this.dangerSrc = dangerSrc;

    }



    public String getDangerManageType() {

        return dangerManageType;

    }



    public void setDangerManageType(String dangerManageType) {

        this.dangerManageType = dangerManageType;

    }



    public String getDangerDesc() {

        return dangerDesc;

    }



    public void setDangerDesc(String dangerDesc) {

        this.dangerDesc = dangerDesc;

    }



    public String getDangerReason() {

        return dangerReason;

    }



    public void setDangerReason(String dangerReason) {

        this.dangerReason = dangerReason;

    }



    public String getControlMeasures() {

        return controlMeasures;

    }



    public void setControlMeasures(String controlMeasures) {

        this.controlMeasures = controlMeasures;

    }



    public String getCost() {

        return cost;

    }



    public void setCost(String cost) {

        this.cost = cost;

    }



    public String getDangerState() {

        return dangerState;

    }



    public void setDangerState(String dangerState) {

        this.dangerState = dangerState;

    }



    public String getHazardDangerType() {

        return hazardDangerType;

    }



    public void setHazardDangerType(String hazardDangerType) {

        this.hazardDangerType = hazardDangerType;

    }



    public String getRegistrant() {

        return registrant;

    }



    public void setRegistrant(String registrant) {

        this.registrant = registrant;

    }

    public String getLiablePerson() {

        return liablePerson;

    }



    public void setLiablePerson(String liablePerson) {

        this.liablePerson = liablePerson;

    }



    public String getCheckAcceptPerson() {

        return checkAcceptPerson;

    }



    public void setCheckAcceptPerson(String checkAcceptPerson) {

        this.checkAcceptPerson = checkAcceptPerson;

    }



    public String getCheckAcceptComment() {

        return checkAcceptComment;

    }



    public void setCheckAcceptComment(String checkAcceptComment) {

        this.checkAcceptComment = checkAcceptComment;

    }



    public String getDeleted() {

        return deleted;

    }



    public void setDeleted(String deleted) {

        this.deleted = deleted;

    }



    public String getCreateDate() {

        return createDate;

    }



    public void setCreateDate(String createDate) {

        this.createDate = createDate;

    }



    public String getUpdateDate() {

        return updateDate;

    }



    public void setUpdateDate(String updateDate) {

        this.updateDate = updateDate;

    }



    public String getDangerManageDeadline() {

        return dangerManageDeadline;

    }



    public void setDangerManageDeadline(String dangerManageDeadline) {

        this.dangerManageDeadline = dangerManageDeadline;

    }



    public String getRegistTime() {

        return registTime;

    }



    public void setRegistTime(String registTime) {

        this.registTime = registTime;

    }



    public String getCheckAcceptTime() {

        return checkAcceptTime;

    }



    public void setCheckAcceptTime(String checkAcceptTime) {

        this.checkAcceptTime = checkAcceptTime;

    }

}




 src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportOverhaulLogDTO.java

对比新文件
@@ -0,0 +1,61 @@
package com.ruoyi.doublePrevention.entity.CJReport.CJdto.HandlerDO;



import lombok.Data;





@Data

public class CJReportOverhaulLogDTO {



    /**

     * 主键

     */

    private String id;

    /**

     * 公司编码

     */

    private String companyCode;

    /**

     * 风险分析对象编码

     */

    private String hazardCode;

    /**

     * 所属安全风险分析单元uuid

     */

    private String riskUnitId;

    /**

     * 装置停用或者检维修开始时间

     */

    private String stopStartTime;

    /**

     * 装置停用或者检维修结束时间

     */

    private String stopEndTime;

    /**

     * 描述停用原因

     */

    private String stopReason;

    /**

     * 创建时间

     */

    private String createDate;

    /**

     * 创建人

     */

    private String createBy;

    /**

     * 最后修改时间

     */

    private String updateDate;

    /**

     * 修改人

     */

    private String updateBy;





//    /**

//     * 删除标志：0-有效，1-删除

//     */

//    private String deleted;





}


 src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportRiskAnaUnitDTO.java

@@ -1,12 +1,6 @@
package com.ruoyi.doublePrevention.entity.CJReport.CJdto.HandlerDO;



import com.baomidou.mybatisplus.annotation.TableName;

import com.fasterxml.jackson.annotation.JsonFormat;



import java.io.Serializable;

import java.util.Date;



//@TableName("prevent_cj_report_risk_ana_unit")

public class CJReportRiskAnaUnitDTO {

    /**

     * 主键

@@ -17,13 +11,13 @@
     */

    private String companyCode;

    /**

     * 安全风险分析单元名称

     */

    private String riskUnitName;

    /**

     * 安全风险分析对象编码

     */

    private String hazardCode;

    /**

     * 安全风险分析单元名称

     */

    private String riskUnitName;

    /**

     * 责任部门

     */

@@ -32,7 +26,6 @@
     * 责任人姓名

     */

    private String hazardLiablePerson;



    /**

     * 删除标志：0-有效，1-删除

     */


 src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportRiskControlMeasureDTO.java

@@ -1,11 +1,7 @@
package com.ruoyi.doublePrevention.entity.CJReport.CJdto.HandlerDO;



import com.baomidou.mybatisplus.annotation.TableName;



import java.io.Serializable;

import java.util.Date;



//@TableName("prevent_cj_report_risk_control_measure")

public class CJReportRiskControlMeasureDTO implements Serializable {

    /**

     * 主键

@@ -15,26 +11,6 @@
     * 公司编码

     */

    private String companyCode;

    /**

     * 删除标志：0-有效，1-删除

     */

    private String deleted;

    /**

     * 创建时间

     */

    private String createDate;

    /**

     * 创建人

     */

    private String createBy;

    /**

     * 最后修改时间

     */

    private String updateDate;

    /**

     * 修改人

     */

    private String updateBy;

    /**

     * 风险事件单元 UUID

     */

@@ -64,6 +40,27 @@
     */

    private String classify3;



    /**

     * 删除标志：0-有效，1-删除

     */

    private String deleted;

    /**

     * 创建时间

     */

    private String createDate;

    /**

     * 创建人

     */

    private String createBy;

    /**

     * 最后修改时间

     */

    private String updateDate;

    /**

     * 修改人

     */

    private String updateBy;



    public String getId() {

        return id;

    }


 src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportRiskEventDTO.java

@@ -1,11 +1,8 @@
package com.ruoyi.doublePrevention.entity.CJReport.CJdto.HandlerDO;



import com.baomidou.mybatisplus.annotation.TableName;



import java.io.Serializable;

import java.util.Date;



//@TableName("prevent_cj_report_risk_event")

public class CJReportRiskEventDTO implements Serializable {

    /**

     * 主键

@@ -16,14 +13,14 @@
     */

    private String companyCode;

    /**

     * 风险事件名称

     */

    private String riskEventName;

    /**

     * 关联风险分析单元UUID

     */

    private String riskUnitId;

    /**

     * 风险事件名称

     */

    private String riskEventName;

    /**

     * 删除标志：0-有效，1-删除

     */

    private String deleted;


 src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportCheckRecordFromTask.java

@@ -3,10 +3,12 @@
import com.baomidou.mybatisplus.annotation.IdType;

import com.baomidou.mybatisplus.annotation.TableId;

import com.baomidou.mybatisplus.annotation.TableName;

import lombok.Data;



import java.io.Serializable;

import java.util.Date;



@Data

@TableName("prevent_cj_report_check_record_from_task")

public class PreventCJReportCheckRecordFromTask implements Serializable {

    /**

@@ -79,140 +81,9 @@
     */

    private Long taskId;



    public Long getTaskId() {

        return taskId;

    }

    private String mobileCode;



    public void setTaskId(Long taskId) {

        this.taskId = taskId;

    }

    private String defend;



    public Integer getIndexId() {

        return indexId;

    }



    public void setIndexId(Integer indexId) {

        this.indexId = indexId;

    }



    public String getId() {

        return id;

    }



    public void setId(String id) {

        this.id = id;

    }



    public String getCompanyCode() {

        return companyCode;

    }



    public void setCompanyCode(String companyCode) {

        this.companyCode = companyCode;

    }



    public String getDeleted() {

        return deleted;

    }



    public void setDeleted(String deleted) {

        this.deleted = deleted;

    }



    public Date getCreateDate() {

        return createDate;

    }



    public void setCreateDate(Date createDate) {

        this.createDate = createDate;

    }



    public String getCreateBy() {

        return createBy;

    }



    public void setCreateBy(String createBy) {

        this.createBy = createBy;

    }



    public Date getUpdateDate() {

        return updateDate;

    }



    public void setUpdateDate(Date updateDate) {

        this.updateDate = updateDate;

    }



    public String getUpdateBy() {

        return updateBy;

    }



    public void setUpdateBy(String updateBy) {

        this.updateBy = updateBy;

    }



    public String getCheckTaskId() {

        return checkTaskId;

    }



    public void setCheckTaskId(String checkTaskId) {

        this.checkTaskId = checkTaskId;

    }



    public String getCheckStatus() {

        return checkStatus;

    }



    public void setCheckStatus(String checkStatus) {

        this.checkStatus = checkStatus;

    }



    public Date getCheckTime() {

        return checkTime;

    }



    public void setCheckTime(Date checkTime) {

        this.checkTime = checkTime;

    }



    public String getCreateByMobile() {

        return createByMobile;

    }



    public void setCreateByMobile(String createByMobile) {

        this.createByMobile = createByMobile;

    }



    public String getUpdateByMobile() {

        return updateByMobile;

    }



    public void setUpdateByMobile(String updateByMobile) {

        this.updateByMobile = updateByMobile;

    }



    public Date getReportTime() {

        return reportTime;

    }



    public void setReportTime(Date reportTime) {

        this.reportTime = reportTime;

    }



    public Byte getReportStatus() {

        return reportStatus;

    }



    public void setReportStatus(Byte reportStatus) {

        this.reportStatus = reportStatus;

    }



    public Byte getDataSource() {

        return dataSource;

    }



    public void setDataSource(Byte dataSource) {

        this.dataSource = dataSource;

    }

}




 src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportCheckTaskFromWork.java

@@ -3,10 +3,12 @@
import com.baomidou.mybatisplus.annotation.IdType;

import com.baomidou.mybatisplus.annotation.TableId;

import com.baomidou.mybatisplus.annotation.TableName;

import lombok.Data;



import java.io.Serializable;

import java.util.Date;



@Data

@TableName("prevent_cj_report_check_task_from_work")

public class PreventCJReportCheckTaskFromWork implements Serializable {

    /**

@@ -71,124 +73,40 @@
     */

    private Long workId;



    public Long getWorkId() {

        return workId;

    }



    public void setWorkId(Long workId) {

        this.workId = workId;

    }

    /**

     * 隐患排查内容

     */

    private String troubleshootContent;

    /**

     *任务开始时间

     * 指该任 务首次开始执行的时间，必填

     */

    private Date taskStartTime;

    /**

     *当巡检周期是小时的时候为必填

     */

    private Date workStartTime;

    /**

     *当巡检周期是小时的时候为必填

     */

    private Date workEndTime;

    /**

     *工作日类型(每天：0；法定工作日(除法定

     * 放假以外的所有)：1 ；非法定工作日(除了放假的时候)：2)

     */

    private String workDayType;

    /**

     *任务类型 任务类型(日常任务： 0；主要负责人

     * 任务：1 ；技术负责人任务：2；操作负责人任务：3；) 默认为日常任务：

     * 0

     */

    private String workType;

    /**

     *包保任务对应项 当任务类型为主要负责人任务、

     * 技术负责人任务、操作负责人任务时，此项为必填。

     */

    private String taskNum;



    public Integer getIndexId() {

        return indexId;

    }



    public void setIndexId(Integer indexId) {

        this.indexId = indexId;

    }



    public String getId() {

        return id;

    }



    public void setId(String id) {

        this.id = id;

    }



    public String getCompanyCode() {

        return companyCode;

    }



    public void setCompanyCode(String companyCode) {

        this.companyCode = companyCode;

    }



    public String getDeleted() {

        return deleted;

    }



    public void setDeleted(String deleted) {

        this.deleted = deleted;

    }



    public Date getCreateDate() {

        return createDate;

    }



    public void setCreateDate(Date createDate) {

        this.createDate = createDate;

    }



    public String getCreateBy() {

        return createBy;

    }



    public void setCreateBy(String createBy) {

        this.createBy = createBy;

    }



    public Date getUpdateDate() {

        return updateDate;

    }



    public void setUpdateDate(Date updateDate) {

        this.updateDate = updateDate;

    }



    public String getUpdateBy() {

        return updateBy;

    }



    public void setUpdateBy(String updateBy) {

        this.updateBy = updateBy;

    }



    public String getRiskMeasureId() {

        return riskMeasureId;

    }



    public void setRiskMeasureId(String riskMeasureId) {

        this.riskMeasureId = riskMeasureId;

    }



    public Integer getCheckCycle() {

        return checkCycle;

    }



    public void setCheckCycle(Integer checkCycle) {

        this.checkCycle = checkCycle;

    }



    public String getCheckCycleUnit() {

        return checkCycleUnit;

    }



    public void setCheckCycleUnit(String checkCycleUnit) {

        this.checkCycleUnit = checkCycleUnit;

    }



    public Date getReportTime() {

        return reportTime;

    }



    public void setReportTime(Date reportTime) {

        this.reportTime = reportTime;

    }



    public Byte getReportStatus() {

        return reportStatus;

    }



    public void setReportStatus(Byte reportStatus) {

        this.reportStatus = reportStatus;

    }



    public Byte getDataSource() {

        return dataSource;

    }



    public void setDataSource(Byte dataSource) {

        this.dataSource = dataSource;

    }

}




 src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportDangerInfo.java

@@ -3,10 +3,12 @@
import com.baomidou.mybatisplus.annotation.IdType;

import com.baomidou.mybatisplus.annotation.TableId;

import com.baomidou.mybatisplus.annotation.TableName;

import lombok.Data;



import java.io.Serializable;

import java.util.Date;



@Data

@TableName("prevent_cj_report_danger_info")

public class PreventCJReportDangerInfo implements Serializable {

    /**

@@ -145,269 +147,5 @@








    public Long getDangerManagerId() {

        return dangerManagerId;

    }



    public void setDangerManagerId(Long dangerManagerId) {

        this.dangerManagerId = dangerManagerId;

    }



    public String getHazardCategory() {

        return hazardCategory;

    }



    public void setHazardCategory(String hazardCategory) {

        this.hazardCategory = hazardCategory;

    }



    public Integer getIndexId() {

        return indexId;

    }



    public void setIndexId(Integer indexId) {

        this.indexId = indexId;

    }



    public String getId() {

        return id;

    }



    public void setId(String id) {

        this.id = id;

    }



    public String getCompanyCode() {

        return companyCode;

    }



    public void setCompanyCode(String companyCode) {

        this.companyCode = companyCode;

    }



    public Date getCreateDate() {

        return createDate;

    }



    public void setCreateDate(Date createDate) {

        this.createDate = createDate;

    }



    public String getCreateBy() {

        return createBy;

    }



    public void setCreateBy(String createBy) {

        this.createBy = createBy;

    }



    public Date getUpdateDate() {

        return updateDate;

    }



    public void setUpdateDate(Date updateDate) {

        this.updateDate = updateDate;

    }



    public String getUpdateBy() {

        return updateBy;

    }



    public void setUpdateBy(String updateBy) {

        this.updateBy = updateBy;

    }



    public String getHazardCode() {

        return hazardCode;

    }



    public void setHazardCode(String hazardCode) {

        this.hazardCode = hazardCode;

    }



    public String getRiskMeasureId() {

        return riskMeasureId;

    }



    public void setRiskMeasureId(String riskMeasureId) {

        this.riskMeasureId = riskMeasureId;

    }



    public String getCheckRecordId() {

        return checkRecordId;

    }



    public void setCheckRecordId(String checkRecordId) {

        this.checkRecordId = checkRecordId;

    }



    public String getDangerName() {

        return dangerName;

    }



    public void setDangerName(String dangerName) {

        this.dangerName = dangerName;

    }



    public String getDangerLevel() {

        return dangerLevel;

    }



    public void setDangerLevel(String dangerLevel) {

        this.dangerLevel = dangerLevel;

    }



    public String getDangerSrc() {

        return dangerSrc;

    }



    public void setDangerSrc(String dangerSrc) {

        this.dangerSrc = dangerSrc;

    }



    public String getDangerManageType() {

        return dangerManageType;

    }



    public void setDangerManageType(String dangerManageType) {

        this.dangerManageType = dangerManageType;

    }



    public String getDangerDesc() {

        return dangerDesc;

    }



    public void setDangerDesc(String dangerDesc) {

        this.dangerDesc = dangerDesc;

    }



    public String getDangerReason() {

        return dangerReason;

    }



    public void setDangerReason(String dangerReason) {

        this.dangerReason = dangerReason;

    }



    public String getControlMeasures() {

        return controlMeasures;

    }



    public void setControlMeasures(String controlMeasures) {

        this.controlMeasures = controlMeasures;

    }



    public String getCost() {

        return cost;

    }



    public void setCost(String cost) {

        this.cost = cost;

    }



    public Date getDangerManageDeadline() {

        return dangerManageDeadline;

    }



    public void setDangerManageDeadline(Date dangerManageDeadline) {

        this.dangerManageDeadline = dangerManageDeadline;

    }



    public String getDangerState() {

        return dangerState;

    }



    public void setDangerState(String dangerState) {

        this.dangerState = dangerState;

    }



    public String getHazardDangerType() {

        return hazardDangerType;

    }



    public void setHazardDangerType(String hazardDangerType) {

        this.hazardDangerType = hazardDangerType;

    }



    public String getRegistrant() {

        return registrant;

    }



    public void setRegistrant(String registrant) {

        this.registrant = registrant;

    }



    public Date getRegistTime() {

        return registTime;

    }



    public void setRegistTime(Date registTime) {

        this.registTime = registTime;

    }



    public String getLiablePerson() {

        return liablePerson;

    }



    public void setLiablePerson(String liablePerson) {

        this.liablePerson = liablePerson;

    }



    public String getCheckAcceptPerson() {

        return checkAcceptPerson;

    }



    public void setCheckAcceptPerson(String checkAcceptPerson) {

        this.checkAcceptPerson = checkAcceptPerson;

    }



    public String getCheckAcceptComment() {

        return checkAcceptComment;

    }



    public void setCheckAcceptComment(String checkAcceptComment) {

        this.checkAcceptComment = checkAcceptComment;

    }



    public Date getCheckAcceptTime() {

        return checkAcceptTime;

    }



    public void setCheckAcceptTime(Date checkAcceptTime) {

        this.checkAcceptTime = checkAcceptTime;

    }



    public Date getReportTime() {

        return reportTime;

    }



    public void setReportTime(Date reportTime) {

        this.reportTime = reportTime;

    }



    public Byte getReportStatus() {

        return reportStatus;

    }



    public void setReportStatus(Byte reportStatus) {

        this.reportStatus = reportStatus;

    }



    public Byte getDataSource() {

        return dataSource;

    }



    public void setDataSource(Byte dataSource) {

        this.dataSource = dataSource;

    }



    public String getDeleted() {

        return deleted;

    }



    public void setDeleted(String deleted) {

        this.deleted = deleted;

    }

}




 src/main/java/com/ruoyi/doublePrevention/entity/PreventRiskDangerCheckLog.java

@@ -3,9 +3,10 @@
import com.baomidou.mybatisplus.annotation.IdType;

import com.baomidou.mybatisplus.annotation.TableId;

import com.baomidou.mybatisplus.annotation.TableName;

import lombok.Data;



import java.util.Date;



@Data

@TableName("prevent_risk_danger_check_log")

public class PreventRiskDangerCheckLog {



@@ -47,75 +48,7 @@
     */

    private Byte reportSwitch;



    public Long getCheckId() {

        return checkId;

    }

    private Long mobileCode;



    public void setCheckId(Long checkId) {

        this.checkId = checkId;

    }



    public Long getId() {

        return id;

    }



    public void setId(Long id) {

        this.id = id;

    }



    public String getUuid() {

        return uuid;

    }



    public void setUuid(String uuid) {

        this.uuid = uuid;

    }



    public Byte getCheckStatus() {

        return checkStatus;

    }



    public void setCheckStatus(Byte checkStatus) {

        this.checkStatus = checkStatus;

    }



    public Long getJobId() {

        return jobId;

    }



    public void setJobId(Long jobId) {

        this.jobId = jobId;

    }



    public Date getReportTime() {

        return reportTime;

    }



    public void setReportTime(Date reportTime) {

        this.reportTime = reportTime;

    }



    public Date getUpdateReportDataTime() {

        return updateReportDataTime;

    }



    public void setUpdateReportDataTime(Date updateReportDataTime) {

        this.updateReportDataTime = updateReportDataTime;

    }



    public Byte getReportStatus() {

        return reportStatus;

    }



    public void setReportStatus(Byte reportStatus) {

        this.reportStatus = reportStatus;

    }



    public Byte getReportSwitch() {

        return reportSwitch;

    }



    public void setReportSwitch(Byte reportSwitch) {

        this.reportSwitch = reportSwitch;

    }

    private Long  dangerCheckPointId;

}


 src/main/java/com/ruoyi/doublePrevention/entity/PreventRiskDangerInfo.java

@@ -2,9 +2,10 @@


import com.baomidou.mybatisplus.annotation.IdType;

import com.baomidou.mybatisplus.annotation.TableId;

import lombok.Data;



import java.util.Date;



@Data

public class PreventRiskDangerInfo {



    /**

@@ -78,123 +79,5 @@
     */

    private Byte reportSwitch;



    public Long getId() {

        return id;

    }



    public void setId(Long id) {

        this.id = id;

    }



    public String getUuid() {

        return Uuid;

    }



    public void setUuid(String uuid) {

        Uuid = uuid;

    }



    public Long getDangerCheckPointId() {

        return dangerCheckPointId;

    }



    public void setDangerCheckPointId(Long dangerCheckPointId) {

        this.dangerCheckPointId = dangerCheckPointId;

    }



    public String getHazardCode() {

        return hazardCode;

    }



    public void setHazardCode(String hazardCode) {

        this.hazardCode = hazardCode;

    }



    public Byte getDangerSrc() {

        return dangerSrc;

    }



    public void setDangerSrc(Byte dangerSrc) {

        this.dangerSrc = dangerSrc;

    }



    public String getDangerDesc() {

        return dangerDesc;

    }



    public void setDangerDesc(String dangerDesc) {

        this.dangerDesc = dangerDesc;

    }



    public String getDangerReason() {

        return dangerReason;

    }



    public void setDangerReason(String dangerReason) {

        this.dangerReason = dangerReason;

    }



    public Byte getHazardDangerType() {

        return hazardDangerType;

    }



    public void setHazardDangerType(Byte hazardDangerType) {

        this.hazardDangerType = hazardDangerType;

    }



    public Byte getDangerState() {

        return dangerState;

    }



    public void setDangerState(Byte dangerState) {

        this.dangerState = dangerState;

    }



    public Byte getTimeoutFlag() {

        return timeoutFlag;

    }



    public void setTimeoutFlag(Byte timeoutFlag) {

        this.timeoutFlag = timeoutFlag;

    }



    public Byte getDangerResult() {

        return dangerResult;

    }



    public void setDangerResult(Byte dangerResult) {

        this.dangerResult = dangerResult;

    }



    public Date getReportTime() {

        return reportTime;

    }



    public void setReportTime(Date reportTime) {

        this.reportTime = reportTime;

    }



    public Date getUpdateReportDataTime() {

        return updateReportDataTime;

    }



    public void setUpdateReportDataTime(Date updateReportDataTime) {

        this.updateReportDataTime = updateReportDataTime;

    }



    public Byte getReportStatus() {

        return reportStatus;

    }



    public void setReportStatus(Byte reportStatus) {

        this.reportStatus = reportStatus;

    }



    public Byte getReportSwitch() {

        return reportSwitch;

    }



    public void setReportSwitch(Byte reportSwitch) {

        this.reportSwitch = reportSwitch;

    }

}


 src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportCheckTaskFromWorkRepository.java

@@ -13,14 +13,6 @@
@Repository

public interface PreventCJReportCheckTaskFromWorkRepository extends BaseMapper<PreventCJReportCheckTaskFromWork> {



//    /**

//     * 上报数据-任务配置-分页查询

//     */

//    IPage<PreventCJReportCheckTaskFromWork> getReportTaskFromWorkPage(Page<Object> objectPage, PreventReportCheckTaskFromWorkReqDTO queryReqDTO);

    /**

     * 批量插入数据

     * */

    int insertList(List<PreventCJReportCheckTaskFromWork> taskFromWorkLists);

    /**

     * 任务配置 -查询待上报

     * */


 src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportOverhaulLogRepository.java

@@ -2,10 +2,17 @@


import com.baomidou.mybatisplus.core.mapper.BaseMapper;

import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportOverhaulLog;

import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam;

import org.springframework.stereotype.Repository;



import java.util.List;



@Repository

public interface PreventCJReportOverhaulLogRepository extends BaseMapper<PreventCJReportOverhaulLog> {



    int insertCJOverhaulLists(PreventCJReportOverhaulLog cjOverhaulLog);



    List<PreventCJReportOverhaulLog> listReportOverhaulDate();



    int updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);

}


 src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskDangerCheckAndMeasureRepository.java

@@ -14,4 +14,6 @@
    int insertCheckAndMeasure(PreventRiskDangerCheckAndMeasure checkAndMeasure);



    List<PreventRiskDangerCheckAndMeasure> getByBaseCheckPointId(Long checkPointId);



    PreventRiskDangerCheckAndMeasure getByDangerCheckPointId(Long dangerCheckPointId);

}


 src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskDangerCheckLogRepository.java

@@ -34,4 +34,6 @@
    PreventRiskDangerCheckLog getByDangerCheckByCheckId(Long checkId);



    PreventRiskDangerCheckLog getByDangerCheckByJobId(Long jobId);



    int updateCheckLog(Long checkId, Long mobileCode);

}


 src/main/java/com/ruoyi/doublePrevention/repository/PreventTaskTypeRepository.java

@@ -4,8 +4,12 @@
import com.ruoyi.doublePrevention.entity.PreventTaskType;

import org.springframework.stereotype.Repository;



import java.util.List;



@Repository

public interface PreventTaskTypeRepository extends BaseMapper<PreventTaskType> {



    PreventTaskType getInfoByTaskId(Long taskId);



    List<PreventTaskType> getInfoByJobId(Long jobId);

}


 src/main/java/com/ruoyi/doublePrevention/scheduls/ExecCJReportDateSchedule.java

@@ -56,6 +56,8 @@
    private PreventCJReportDangerInfoService CJDangerInfoService;

    @Autowired

    private PreventCJReportPointService CJPointService;

    @Autowired

    private PreventCJReportOverhaulLogService CJOverhaulLogService;



    String token = "GT6gGJV7JV";

    String key = "Bv+NeBolwqg2Pbc1yVwrZA==";

@@ -468,6 +470,9 @@
                CJReportCheckTaskFromWorkDTO cjReportCheckTaskFromWorkDTO = BeanCopyUtils.copyBean(cjTaskFromWork, CJReportCheckTaskFromWorkDTO.class);

                cjReportCheckTaskFromWorkDTO.setCreateDate(dateFormat.format(cjTaskFromWork.getCreateDate()));

                cjReportCheckTaskFromWorkDTO.setUpdateDate(dateFormat.format(cjTaskFromWork.getUpdateDate()));

                cjReportCheckTaskFromWorkDTO.setTaskStartTime(dateFormat.format(cjTaskFromWork.getCreateDate()));

                cjReportCheckTaskFromWorkDTO.setWorkStartTime(dateFormat.format(cjTaskFromWork.getUpdateDate()));

                cjReportCheckTaskFromWorkDTO.setWorkEndTime(dateFormat.format(cjTaskFromWork.getUpdateDate()));

                reportCheckTaskFromWorkList.add(cjReportCheckTaskFromWorkDTO);

            }

            //数据上报

@@ -564,9 +569,11 @@
            List<CJReportCheckRecordFromTaskDTO> reportRecordFromTaskList = new ArrayList<>();

            for (PreventCJReportCheckRecordFromTask cjRecordFromTask : CJRecordFromTasks) {

                CJReportCheckRecordFromTaskDTO cjReportCheckRecordFromTaskDTO = BeanCopyUtils.copyBean(cjRecordFromTask, CJReportCheckRecordFromTaskDTO.class);

                cjReportCheckRecordFromTaskDTO.setCreateDate(dateFormat.format(cjRecordFromTask.getCreateDate()));

                cjReportCheckRecordFromTaskDTO.setUpdateDate(dateFormat.format(cjRecordFromTask.getUpdateDate()));

//                cjReportCheckRecordFromTaskDTO.setCreateDate(dateFormat.format(cjRecordFromTask.getCreateDate()));

//                cjReportCheckRecordFromTaskDTO.setUpdateDate(dateFormat.format(cjRecordFromTask.getUpdateDate()));

                cjReportCheckRecordFromTaskDTO.setCheckTime(dateFormat.format(cjRecordFromTask.getCheckTime()));

                cjReportCheckRecordFromTaskDTO.setMobileMe(cjRecordFromTask.getMobileCode());

                cjReportCheckRecordFromTaskDTO.setIsDefend(cjRecordFromTask.getDefend());

                reportRecordFromTaskList.add(cjReportCheckRecordFromTaskDTO);

            }

            //数据加密

@@ -760,6 +767,114 @@
           logger.info("【6】隐患信息-无数据上报昌吉州");

       }



    }



        /**

         * 7、检修停用记录信息数据

         * */

        logger.info("【7】检修停用记录-处理数据...");

        List<PreventCJReportOverhaulLog> CJOverhaulLogs = CJOverhaulLogService.listReportOverhaulDate();

        if (ObjectUtils.isNotEmpty(CJOverhaulLogs)){

            //封装上报数据

            List<CJReportOverhaulLogDTO> reportOverhaulLogDTOS = new ArrayList<>();

            for (PreventCJReportOverhaulLog cjOverhaulLog : CJOverhaulLogs) {

                CJReportOverhaulLogDTO cjReportOverhaulLogDTO = BeanCopyUtils.copyBean(cjOverhaulLog, CJReportOverhaulLogDTO.class);



                cjReportOverhaulLogDTO.setCreateDate(dateFormat.format(cjOverhaulLog.getCreateDate()));

                cjReportOverhaulLogDTO.setUpdateDate(dateFormat.format(cjOverhaulLog.getUpdateDate()));

                cjReportOverhaulLogDTO.setStopStartTime(dateFormat.format(cjOverhaulLog.getStopStartTime()));

                if (ObjectUtils.isNotEmpty(cjOverhaulLog.getStopEndTime())){

                    cjReportOverhaulLogDTO.setStopEndTime(dateFormat.format(cjOverhaulLog.getStopEndTime()));

                }else {

                    cjReportOverhaulLogDTO.setStopEndTime(null);

                }

                reportOverhaulLogDTOS.add(cjReportOverhaulLogDTO);

            }



            //数据上报

            logger.info("【原始数据】" + JSONObject.toJSONString(reportOverhaulLogDTOS));

            String AESReportDangerInfo = encrypt(JSONObject.toJSONString(reportOverhaulLogDTOS), key.getBytes(), iv.getBytes());

            StringBuffer dangerInfoResultBuffer = null;

            //上报数据

            try {

                URL url = new URL("http://v1/data/receive/receiveUnitStop");

                //得到连接对象

                con = (HttpURLConnection) url.openConnection();

                //设置请求类型

                con.setRequestMethod("POST");

                //设置Content-Type，此处根据实际情况确定

                con.setRequestProperty("Content-Type", "application/json;charset=UTF-8");

                //允许写出

                con.setDoOutput(true);

                //允许读入

                con.setDoInput(true);

                //不使用缓存

                con.setUseCaches(false);

                //设置请求头

                con.setRequestProperty("X-Access-Token",token + formatDate.toString());

                OutputStream os = con.getOutputStream();

                Map paraMap = new HashMap();

                paraMap.put("data", AESReportDangerInfo);/**封装数据*/

                //组装入参，设置请求体

                os.write(JSON.toJSONString(paraMap).getBytes());

                //得到响应码

                responseCode = con.getResponseCode();

                //本段日志，测试成功后，可注释掉

                if (responseCode == HttpURLConnection.HTTP_OK) {

                    //得到响应流

                    InputStream inputStream = con.getInputStream();

                    //将响应流转换成字符串

                    dangerInfoResultBuffer = new StringBuffer();

                    String line;

                    buffer = new BufferedReader(new InputStreamReader(inputStream, "UTF-8"));

                    while ((line = buffer.readLine()) != null) {

                        dangerInfoResultBuffer.append(line);

                    }

                    logger.info("result:" + dangerInfoResultBuffer.toString());

                }

            } catch (Exception e) {

                e.printStackTrace();

            }



            //接收返回值，保存返回值

            CJReportResultData CJOverhaulLogResult = JSONObject.parseObject(dangerInfoResultBuffer.toString(), CJReportResultData.class);

            //接收返回值，保存返回值

            List<String> errorIdList= new ArrayList<>();

            Data data = JSONObject.parseObject(CJOverhaulLogResult.getData(), Data.class);

            //保存失败结果

            if (ObjectUtils.isNotEmpty(data)){

                for (ErrorMsgDetails errorMsgDetail : data.getErrorMsgDetails()) {

                    errorIdList.add(errorMsgDetail.getId());

                }

            }

            logger.info("【】CJOverhaulLog数据上报结果：" + CJOverhaulLogResult.getCode());

            //设置所有数据上报成功



            if (CJOverhaulLogResult.getCode().equals(CJReportEnum.SUCCESS.getCode()) || CJOverhaulLogResult.getCode().equals(CJReportEnum.SUCESS_AND_FAIL.getCode())){

                for (PreventCJReportOverhaulLog cjOverhaulLog : CJOverhaulLogs) {

                    HandlerCJReportParam handlerCJReportParam = new HandlerCJReportParam();

                    //封装数据

                    handlerCJReportParam.setId(cjOverhaulLog.getId());

                    handlerCJReportParam.setReportStatus(SyncEnum.SYNC_EXEC_SUCCESS.getCode());

                    handlerCJReportParam.setReportTime(date);

                    CJOverhaulLogService.updateCJReportStatusById(handlerCJReportParam);

                }

            }

            //设置上报失败的数据，上报失败

            if (CJOverhaulLogResult.getCode().equals(CJReportEnum.FAIL.getCode()) || CJOverhaulLogResult.getCode().equals(CJReportEnum.SUCESS_AND_FAIL.getCode())){

                for (String failId : errorIdList) {

                    //上报失败

                    HandlerCJReportParam handlerCJReportParam = new HandlerCJReportParam();

                    //封装数据

                    handlerCJReportParam.setId(failId);

                    handlerCJReportParam.setReportStatus(SyncEnum.SYNC_EXEC_FAIL.getCode());

                    handlerCJReportParam.setReportTime(date);

                    CJOverhaulLogService.updateCJReportStatusById(handlerCJReportParam);

                }

            }

            logger.info("【7】检修停用记录-数据处理完成");

        }else {

            logger.info("【7】检修停用记录-无数据上报昌吉州");

        }



    }

}


 src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java

@@ -24,9 +24,12 @@
import org.slf4j.Logger;

import org.slf4j.LoggerFactory;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.scheduling.annotation.Scheduled;

import org.springframework.stereotype.Component;

import org.springframework.transaction.annotation.Transactional;



import java.text.SimpleDateFormat;

import java.time.LocalDateTime;

import java.util.ArrayList;

import java.util.Date;

import java.util.List;

@@ -37,6 +40,8 @@


    private final Logger logger = LoggerFactory.getLogger(this.getClass());



    public static SimpleDateFormat startFormat = new SimpleDateFormat("yyyy-MM-dd 06:30:00");

    public static SimpleDateFormat endFormat = new SimpleDateFormat("yyyy-MM-dd 23:59:59");



    @Autowired

    private PreventReportConfigService preventReportConfigService;

@@ -98,9 +103,9 @@
    private PreventTaskTypeService taskTypeService;//管控措施，任务清单对应关系。基础排查点附属表



    @Autowired

    private PreventOverhaulLogService overhaulLogService;//隐患信息附属表

    private PreventOverhaulLogService overhaulLogService;

    @Autowired

    private PreventCJReportOverhaulLogService reportOverhaulLogService;//隐患信息附属表

    private PreventCJReportOverhaulLogService reportOverhaulLogService;





    @Transactional

@@ -394,6 +399,25 @@
                    CJTaskFromWork.setDataSource((byte) 1);

                    CJTaskFromWork.setRiskMeasureId(work.getMeasureUuid());

                    CJTaskFromWork.setWorkId(jobById.getJobId());



                    //第二版标准新增

                    PreventRiskControlMeasure measureById = preventRiskControlMeasureService.getPreventRiskControlMeasureById(work.getMeasureId());

                    CJTaskFromWork.setTroubleshootContent(measureById.getCheckContent());

                    CJTaskFromWork.setTaskStartTime(jobById.getStartTime());

                    if (jobById.getTroubleshootTypeCycleType() == 1){

                        Date date = new Date();

                        CJTaskFromWork.setWorkStartTime(new Date(startFormat.format(date)));//todo  这个时间如何确定？

                        CJTaskFromWork.setWorkEndTime(new Date(endFormat.format(date)));

                    }

                    CJTaskFromWork.setWorkDayType("0");

                    List<PreventTaskType> typeByJobId = taskTypeService.getInfoByJobId(work.getJobId());

                    int typeTag = 0;

                    for (PreventTaskType taskType : typeByJobId) {

                        typeTag = taskType.getType();

                    }

                    CJTaskFromWork.setWorkType(String.valueOf(typeTag));

                    CJTaskFromWork.setTaskNum("1");



                    //封装数据

                    CJTaskFromWorkLists.add(CJTaskFromWork);

                    //设置原始数据上报状态

@@ -401,7 +425,6 @@
                    handlerReportParam.setReportTime(new Date());

                    handlerReportParam.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());

                    preventRiskJobAndMeasureService.updateWorkReportStatus(handlerReportParam);



                }

            }else {

                logger.info("【双重预防】当前无任务配置数据需要处理");

@@ -448,7 +471,6 @@
                     *  1.找到每个点的提交接口，进行数据处理

                     *  2.写一个定时任务处理（备用）

                     * */



                    /**

                     *   todo  排查后的任务才上报

                     *  examineUserName，checkTime  任务执行后，不为空  不使用;

@@ -470,7 +492,7 @@
                                PreventCJReportCheckRecordFromTask CJRecordFromTask = new PreventCJReportCheckRecordFromTask();

                                CJRecordFromTask.setCheckStatus("0");// 0-正常；1-存在隐患；2-未处理；3-其他

                                if (Integer.valueOf(hiddenDangerCheckPoint.getWhetherDanger()) == 1){

                                        CJRecordFromTask.setCheckStatus("1");// 0-正常；1-存在隐患；2-未处理；3-其他

                                    CJRecordFromTask.setCheckStatus("1");// 0-正常；1-存在隐患；2-未处理；3-其他

                                }

                                User createUser = new User();

                                createUser = trUserService.getUserByLoginName(hiddenDangerCheckById.getCreateBy());

@@ -517,19 +539,26 @@
                                CJRecordFromTask.setCheckTaskId(preventCJReportCheckTaskFromWork.getId());

                                CJRecordFromTask.setCheckTime(hiddenDangerCheckById.getCheckTime());

                                CJRecordFromTask.setTaskId(task.getCheckId());

                                //第二版标准新增

                                CJRecordFromTask.setMobileCode(task.getMobileCode().toString());

                                List<PreventTaskType> typeByJobIds = taskTypeService.getInfoByJobId(jobAndMeasureByJobId.getJobId());

                                int typeTag = 0;

                                for (PreventTaskType typeByJobId : typeByJobIds) {

                                    if (typeByJobId.getType()!= 0) {

                                        typeTag = 1;

                                    }

                                }



                                CJRecordFromTask.setDefend(String.valueOf(typeTag));

                                //封装数据

                                CJRecordFromTaskLists.add(CJRecordFromTask);

                            }

                        }





                            //设置原始数据上报状态

                            handlerReportParam.setId(task.getId());

                            handlerReportParam.setReportTime(new Date());

                            handlerReportParam.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());

                            preventRiskDangerCheckLogService.updateTaskReportStatus(handlerReportParam);



                    }

//                    String checkStatus = null;

//                    if (ObjectUtils.isEmpty(task.getResult() )){

@@ -652,7 +681,6 @@
                        int i = 1;

                        CJDangerInfo.setHazardCategory(taskTypeInfo.getType().toString());

                    }



                    CJDangerInfo.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());

                    CJDangerInfo.setReportTime(null);

                    CJDangerInfo.setDataSource((byte) 1);

@@ -675,9 +703,7 @@
                    handlerReportParam.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());

                    //修改隐患信息附属表状态

                    preventRiskDangerInfoService.updateDangerInfoReportStatus(handlerReportParam);



                }



            }else {

                logger.info("【双重预防】当前无隐患信息需要处理");

            }


 src/main/java/com/ruoyi/doublePrevention/service/RiskService.java

@@ -177,4 +177,6 @@
     * 查询隐患附属表信息

     */

    PreventRiskDangerInfo getDangerInfoById(Long id);



    int updateCheckLog(Long checkId, HiddenDangerCheckPoint hdcp);

}


 src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportOverhaulLogService.java

@@ -1,8 +1,15 @@
package com.ruoyi.doublePrevention.service.baseService;



import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportOverhaulLog;

import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam;



import java.util.List;



public interface PreventCJReportOverhaulLogService {



    int insertCJOverhaulLists(PreventCJReportOverhaulLog cjOverhaulLog);



    List<PreventCJReportOverhaulLog> listReportOverhaulDate();



    int updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);

}


 src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskDangerCheckAndMeasureService.java

@@ -12,4 +12,6 @@
    int insertCheckAndMeasure(PreventRiskDangerCheckAndMeasure checkAndMeasure);



    List<PreventRiskDangerCheckAndMeasure> getByBaseCheckPointId(Long checkPointId);



    PreventRiskDangerCheckAndMeasure getByDangerCheckPointId(Long dangerCheckPointId);

}


 src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskDangerCheckLogService.java

@@ -31,4 +31,6 @@
    PreventRiskDangerCheckLog getByDangerCheckByCheckId(Long checkId);



    PreventRiskDangerCheckLog getByDangerCheckByJobId(Long jobId);



    int updateCheckLog(Long checkId, Long mobileCode);

}


 src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventTaskTypeService.java

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


import com.ruoyi.doublePrevention.entity.PreventTaskType;



import java.util.List;



public interface PreventTaskTypeService {



    PreventTaskType getInfoByTaskId(Long id);



    List<PreventTaskType> getInfoByJobId(Long jobId);



}


 src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportOverhaulLogServiceImpl.java

@@ -2,9 +2,12 @@


import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportOverhaulLog;

import com.ruoyi.doublePrevention.repository.PreventCJReportOverhaulLogRepository;

import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam;

import com.ruoyi.doublePrevention.service.baseService.PreventCJReportOverhaulLogService;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.stereotype.Service;



import java.util.List;



@Service

public class PreventCJReportOverhaulLogServiceImpl implements PreventCJReportOverhaulLogService {

@@ -17,4 +20,14 @@
    public int insertCJOverhaulLists(PreventCJReportOverhaulLog cjOverhaulLog) {

        return cjReportOverhaulLogRepository.insertCJOverhaulLists(cjOverhaulLog);

    }



    @Override

    public List<PreventCJReportOverhaulLog> listReportOverhaulDate() {

        return cjReportOverhaulLogRepository.listReportOverhaulDate();

    }



    @Override

    public int updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam) {

        return cjReportOverhaulLogRepository.updateCJReportStatusById(handlerCJReportParam);

    }

}


 src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskDangerCheckAndMeasureServiceImpl.java

@@ -26,4 +26,9 @@
    public List<PreventRiskDangerCheckAndMeasure> getByBaseCheckPointId(Long checkPointId) {

        return preventRiskDangerCheckAndMeasureRepository.getByBaseCheckPointId(checkPointId);

    }



    @Override

    public PreventRiskDangerCheckAndMeasure getByDangerCheckPointId(Long dangerCheckPointId) {

        return preventRiskDangerCheckAndMeasureRepository.getByDangerCheckPointId(dangerCheckPointId);

    }

}


 src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskDangerCheckLogServiceImpl.java

@@ -63,4 +63,9 @@
    public PreventRiskDangerCheckLog getByDangerCheckByJobId(Long jobId) {

        return preventRiskDangerCheckLogRepository.getByDangerCheckByJobId(jobId);

    }



    @Override

    public int updateCheckLog(Long checkId, Long mobileCode) {

        return preventRiskDangerCheckLogRepository.updateCheckLog(checkId, mobileCode);

    }

}


 src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventTaskTypeServiceImpl.java

@@ -6,6 +6,8 @@
import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.stereotype.Service;



import java.util.List;



@Service("PreventTaskTypeService")

public class PreventTaskTypeServiceImpl implements PreventTaskTypeService {



@@ -17,4 +19,10 @@
    public PreventTaskType getInfoByTaskId(Long taskId) {

        return taskTypeRepository.getInfoByTaskId(taskId);

    }



    @Override

    public List<PreventTaskType> getInfoByJobId(Long jobId) {

        return taskTypeRepository.getInfoByJobId(jobId);

    }



}

 src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java

@@ -1326,6 +1326,21 @@
        PreventRiskDangerInfo dangerInfobyHiddenDangerId = preventRiskDangerInfoService.getByHiddenDangerId(id);

        return dangerInfobyHiddenDangerId;

    }



    @Override

    public int updateCheckLog(Long checkId, HiddenDangerCheckPoint hdcp) {

        return preventRiskDangerCheckLogService.updateCheckLog(checkId, hdcp.getMobileCode());

    }





















    //    /**

//     * 全流程隐患上报-附属表信息插入

//     * */

@@ -1369,4 +1384,6 @@
//

//        return preventRiskDangerInfoService.insertDangerInfo(dangerInfo);

//    }





}

 src/main/java/com/ruoyi/project/mobile/service/ApiDangerScheduleService.java

@@ -7,7 +7,10 @@
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.security.ShiroUtils;
import com.ruoyi.doublePrevention.entity.PreventRiskDangerCheckAndMeasure;
import com.ruoyi.doublePrevention.entity.PreventRiskDangerCheckLog;
import com.ruoyi.doublePrevention.service.RiskService;
import com.ruoyi.doublePrevention.service.baseService.PreventRiskDangerCheckAndMeasureService;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.project.mobile.domain.ApiRequestHeader;
import com.ruoyi.project.mobile.domain.ApiResult;
@@ -22,6 +25,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;

import java.util.ArrayList;
import java.util.HashMap;
@@ -46,6 +50,8 @@
    @Autowired
    private RiskService riskService;

    @Autowired
    private PreventRiskDangerCheckAndMeasureService preventRiskDangerCheckAndMeasureService;
    /**
     * 获取定时任务隐患列表
     *
@@ -138,7 +144,6 @@
            });



            hiddenDangerCheckService.updateHiddenDangerCheck(hiddenDangerCheck);

            hdcpService.getTaskCountTotal(Long.valueOf(header.userId));//查询未执行任务总数量并推送
@@ -153,7 +158,7 @@


    /**
     * 设置为记录正常
     * 设置为记录正常 // todo
     */
    public ApiResult editPointScheduleSetNormal(String str, ApiRequestHeader header) {
        //验证userId,loginName,token,deviceType,deviceId,appType 是否一致
@@ -168,6 +173,12 @@
            hdcp.setWhetherDanger(TrHiddenDangerCheckConstants.WHETHER_DANGER_NOT);//是否为隐患(正常)
            hdcp.setScheduleCheckStatus(TrHiddenDangerCheckConstants.CHECK_STATUS_ALREADY_CHECK);//排查状态(已排查)
            hdcpService.updateHiddenDangerCheckPoint(hdcp);

            PreventRiskDangerCheckAndMeasure dangerCheckPointInfo = preventRiskDangerCheckAndMeasureService.getByDangerCheckPointId(hdcp.getId());
            int result = riskService.updateCheckLog(dangerCheckPointInfo.getCheckId(), hdcp);// todo
            if (result < 1){
                return ApiResult.error("隐患排查记录附属表：写入手机识别码错误");
            }

            hdcpService.getTaskCountTotal(Long.valueOf(header.userId));//查询未执行任务总数量并推送

@@ -212,7 +223,7 @@

            /**
             * 本次查询结果 ：如果未上报过隐患，必定为空
             *      ？同一个检查任务，同一个排查点，可能多次上报隐患。
             *      同一个检查任务，同一个排查点，可能多次上报隐患。
             *      本次查询未用到id,导致数据不唯一
             * */
            List<HiddenDangerCheckPoint> queryExistList =  hdcpService.selectHiddenDangerCheckPointList(queryExist);
@@ -238,6 +249,9 @@
                    throw new RuntimeException("添加隐患附属信息失败");
                }

                PreventRiskDangerCheckAndMeasure dangerCheckPointInfo = preventRiskDangerCheckAndMeasureService.getByDangerCheckPointId(hdcp.getId());
                riskService.updateCheckLog(dangerCheckPointInfo.getCheckId(), hdcp);

            }else{
                hdcp.setUpdateBy(user.getLoginName());
                hdcp.setUpdateTime(DateUtils.getNowDate());
@@ -252,6 +266,9 @@
                if (result< 1){
                    throw new RuntimeException("添加隐患附属信息失败");
                }

                PreventRiskDangerCheckAndMeasure dangerCheckPointInfo = preventRiskDangerCheckAndMeasureService.getByDangerCheckPointId(hdcp.getId());
                riskService.updateCheckLog(dangerCheckPointInfo.getCheckId(), hdcp);
            }
            hdcpService.getTaskCountTotal(Long.valueOf(header.userId));//查询未执行任务总数量并推送


 src/main/java/com/ruoyi/project/mobile/service/ApiHiddenDangerCheckService.java

@@ -287,7 +287,7 @@


    /**
     * 隐患计划执行中---设置为记录正常
     * 隐患计划执行中---设置为记录正常 // todo
     */
    public ApiResult editPointSetNormal(String str, ApiRequestHeader header) {
        //验证userId,loginName,token,deviceType,deviceId,appType 是否一致

 src/main/java/com/ruoyi/project/tr/hiddenDangerCheckPoint/domain/HiddenDangerCheckPoint.java

@@ -484,6 +484,17 @@
    private Byte dangerResult;


    @Transient
    private Long mobileCode;

    public Long getMobileCode() {
        return mobileCode;
    }

    public void setMobileCode(Long mobileCode) {
        this.mobileCode = mobileCode;
    }

    public Byte getDangerResult() {
        return dangerResult;
    }

 src/main/resources/mybatis/doublePrevention/PreventCJReportCheckRecordFromTaskMapper.xml

@@ -20,6 +20,9 @@
        <result column="create_by_mobile" property="createByMobile"/>

        <result column="update_by_mobile" property="updateByMobile"/>

        <result column="task_id" property="taskId"/>



        <result column="mobile_code" property="mobileCode"/>

        <result column="defend" property="defend"/>

    </resultMap>



    <!--IPage<PreventReportCheckRecordFromTask> getReportTaskFromWorkPage(Page<Object> objectPage, PreventReportCheckRecordFromTaskReqDTO queryReqDTO);-->

@@ -56,7 +59,8 @@
        insert into prevent_cj_report_check_record_from_task

        values(null, #{id}, #{companyCode}, #{deleted}, #{createDate}, #{createBy}, #{updateDate}, #{updateBy}

        , #{checkTaskId}, #{checkStatus}, #{checkTime}, #{createByMobile}, #{updateByMobile}

        , #{reportStatus}, #{reportTime}, #{dataSource}, #{taskId})

        , #{reportStatus}, #{reportTime}, #{dataSource}, #{taskId}

        , #{mobileCode}, #{defend})

    </insert>






 src/main/resources/mybatis/doublePrevention/PreventCJReportCheckTaskFromWorkMapper.xml

@@ -18,6 +18,14 @@
        <result column="check_cycle" property="checkCycle"/>

        <result column="check_cycle_unit" property="checkCycleUnit"/>

        <result column="work_id" property="workId"/>



        <result column="troubleshoot_content" property="troubleshootContent"/>

        <result column="task_start_time" property="taskStartTime"/>

        <result column="work_start_time" property="workStartTime"/>

        <result column="work_end_time" property="workEndTime"/>

        <result column="work_day_type" property="workDayType"/>

        <result column="work_type" property="workType"/>

        <result column="task_num" property="taskNum"/>

    </resultMap>



    <!--IPage<PreventReportCheckTaskFromWork> getReportTaskFromWorkPage(Page<Object> objectPage, PreventReportCheckTaskFromWorkReqDTO queryReqDTO);-->

@@ -54,7 +62,8 @@
        insert into prevent_cj_report_check_task_from_work

        values(null, #{id}, #{companyCode}, #{deleted}, #{createDate}, #{createBy}, #{updateDate}, #{updateBy}

        , #{riskMeasureId}, #{checkCycle}, #{checkCycleUnit}

        , #{reportStatus}, #{reportTime}, #{dataSource}, #{workId})

        , #{reportStatus}, #{reportTime}, #{dataSource}, #{workId}

        , #{troubleshootContent},#{taskStartTime},#{workStartTime},#{workEndTime},#{workDayType},#{workType},#{taskNum})

    </insert>



<!--    PreventCJReportCheckTaskFromWork geByMeasureUUidAndJobId(String measureUuid, Long jobId);-->


 src/main/resources/mybatis/doublePrevention/PreventCJReportDangerInfoMapper.xml

@@ -28,6 +28,7 @@
        <result column="danger_manage_deadline" property="dangerManageDeadline"/>

        <result column="danger_state" property="dangerState"/>

        <result column="hazard_danger_type" property="hazardDangerType"/>

        <result column="hazard_category" property="hazardCategory"/>

        <result column="registrant" property="registrant"/>

        <result column="regist_time" property="registTime"/>

        <result column="liable_person" property="liablePerson"/>

@@ -72,7 +73,7 @@
        values(null, #{id}, #{companyCode}, #{deleted}, #{createDate}, #{createBy}, #{updateDate}, #{updateBy}

        , #{hazardCode}, #{riskMeasureId}, #{checkRecordId}, #{dangerName}, #{dangerLevel}, #{dangerSrc}, #{dangerManageType}

        , #{dangerDesc}, #{dangerReason}, #{controlMeasures}, #{cost}, #{dangerManageDeadline}, #{dangerState}, #{hazardDangerType}

        , #{registrant}, #{registTime}, #{liablePerson}, #{checkAcceptPerson}, #{checkAcceptComment}, #{checkAcceptTime},  #{hazardCategory}

        , #{registrant}, #{registTime}, #{liablePerson}, #{checkAcceptPerson}, #{checkAcceptComment}, #{checkAcceptTime}, #{hazardCategory}

        , #{reportStatus}, #{reportTime}, #{dataSource}, #{dangerManagerId})

    </insert>




 src/main/resources/mybatis/doublePrevention/PreventCJReportOverhaulMapper.xml

@@ -2,6 +2,20 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >

<mapper namespace="com.ruoyi.doublePrevention.repository.PreventCJReportOverhaulLogRepository" >



<!--    List<PreventCJReportOverhaulLog> listReportOverhaulDate();-->

    <select id="listReportOverhaulDate" resultType="com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportOverhaulLog">

        select * from prevent_overhaul_log

        where report_status = 1

        limit 200

    </select>



<!--    int updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);-->

    <select id="updateCJReportStatusById">

        update prevent_overhaul_log set

        report_status =  #{reportStatus},

        report_time = #{reportTime}

        where id = #{id}

    </select>



<!--    int insertCJOverhaulLists(PreventOverhaulLog preventOverhaulLog);-->

    <insert id="insertCJOverhaulLists"  parameterType="com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportOverhaulLog">


 src/main/resources/mybatis/doublePrevention/PreventRiskDangerCheckAndMeasureMapper.xml

@@ -23,4 +23,10 @@
        select * from  prevent_risk_danger_check_and_measure
        where base_check_point_id = #{checkPointId}
    </select>

<!--    PreventRiskDangerCheckAndMeasure getByDangerCheckPointId(Long dangerCheckPointId);-->
    <select id="getByDangerCheckPointId" resultMap="BaseResultMap">
        select * from  prevent_risk_danger_check_and_measure
        where danger_check_point_id = #{dangerCheckPointId}
    </select>
</mapper>

 src/main/resources/mybatis/doublePrevention/PreventRiskDangerCheckLogMapper.xml

@@ -12,6 +12,9 @@
        <result column="update_report_data_time" property="updateReportDataTime"/>
        <result column="report_status" property="reportStatus"/>
        <result column="report_switch" property="reportSwitch"/>

        <result column="mobile_code" property="mobileCode"/>
<!--        <result column="danger_check_point_id" property="dangerCheckPointId"/>-->
    </resultMap>


@@ -19,7 +22,7 @@
<!--    int insertDangerCheckLog(PreventRiskDangerCheckLog dangerCheck);-->
    <insert id="insertDangerCheckLog">
        insert into prevent_risk_danger_check_log values
        (null, #{uuid}, #{jobId}, #{checkStatus}, #{checkId}, #{reportTime}, #{updateReportDataTime}, #{reportStatus}, #{reportSwitch})
        (null, #{uuid}, #{jobId}, #{checkStatus}, #{checkId}, #{reportTime}, #{updateReportDataTime}, #{reportStatus}, #{reportSwitch}, #{mobileCode})
    </insert>

<!--    int deleteDangerCheck(Long checkId);-->
@@ -53,6 +56,14 @@
        select * from prevent_risk_danger_check_log
        where job_id = #{jobId}
    </select>

<!--    PreventRiskDangerCheckLog updateCheckLog(Long checkId, Long mobileCode);-->
    <update id="updateCheckLog" >
        update prevent_risk_danger_check_log set
        mobile_code = #{mobileCode}
        where check_id = #{checkId}
    </update>
</mapper>




 src/main/resources/mybatis/doublePrevention/PreventTaskTypeMapper.xml

@@ -18,5 +18,11 @@
        select * from prevent_task_type where delete_status = 0 and task_id = #{taskId}

    </select>



<!--    List<PreventTaskType> getInfoByJobId(Long jobId);-->

    <select id="getInfoByJobId" resultMap="BaseResultMap">

        select * from prevent_task_type where delete_status = 0 and job_id = #{jobId}

    </select>





</mapper>