| 2023-06-26 | 16639036659 |  |
| 2023-06-15 | 16639036659 | |
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; } }
@@ -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; } }
@@ -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; } }
对比新文件 @@ -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; } }
@@ -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; } }
@@ -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 { /** @@ -138,261 +140,12 @@ * 数据来源 1-本系统排查任务产生；2-同步数据 */ private Long dangerManagerId; /** * 隐患类别(其他隐患0 ;主要负责人隐患1;技术负责人隐患2 ;操作负责人隐患3 */ private String hazardCategory; public Long getDangerManagerId() { return dangerManagerId; } public void setDangerManagerId(Long dangerManagerId) { this.dangerManagerId = dangerManagerId; } 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; } }
对比新文件 @@ -0,0 +1,84 @@ package com.ruoyi.doublePrevention.entity.CJReport; 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_cj_report_overhaul_log") public class PreventCJReportOverhaulLog { /** * 主键 */ @TableId(value = "id" , type = IdType.AUTO) private Integer indexId; /** * 主键 */ private String id; /** * 删除标志：0-有效，1-删除 */ private String deleted; /** * 公司编码 */ private String companyCode; /** * 风险分析对象编码 */ private String hazardCode; /** * 所属安全风险分析单元uuid */ private String riskUnitId; /** * 装置停用或者检维修开始时间 */ private Date stopStartTime; /** * 装置停用或者检维修结束时间 */ private Date stopEndTime; /** * 描述停用原因 */ private String stopReason; /** * 上报时间 */ private Date reportTime; /** * 上报状态 1-待上报；2-已上报；3-不上报 */ private Byte reportStatus; /** * 数据来源 1-本系统排查任务产生；2-同步数据 */ private Byte dataSource; /** * 创建时间 */ private Date createDate; /** * 创建人 */ private String createBy; /** * 最后修改时间 */ private Date updateDate; /** * 修改人 */ private String updateBy; } src/main/java/com/ruoyi/doublePrevention/entity/PreventOverhaulLog.java
对比新文件 @@ -0,0 +1,94 @@ package com.ruoyi.doublePrevention.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import java.time.LocalDateTime; import java.util.Date; @Data @TableName("prevent_overhaul_log") public class PreventOverhaulLog { /** * 主键id * */ @TableId(value = "id" , type = IdType.AUTO) private Long id; private String uuid; /** * 删除标志：0-有效，1-删除 */ private Byte deleteStatus; /** * 创建时间 */ private Date gmtCreate; /** * 最后修改时间 */ private Date gmtModitify; /** * 创建人 */ private String createByUserName; /** * 修改人 */ private String lastEditUserName; /** * 所属安全风险分析单元id */ private Long riskUnitId; /** * 所属安全风险分析单元uuid */ private String riskUnitUuid; /** * 企业id */ private Long enterpriseId; /** * 企业uuid */ private String enterpriseUuid; /** * 装置停用或者检维修开始时间 */ private Date stopStartTime; /** * 装置停用或者检维修结束时间 */ private Date stopEndTime; /** * 描述停用原因 */ private String stopReason; /** * 风险分析对象编码 */ private String hazardCode; /** * 同步时间 */ private Date reportTime; /** * 同步数据修改时间 */ private Date updateReportDataTime; /** * 上报状态 1-待上报；2-已上报；3-不上报 */ private Byte reportStatus; /** * 上报开关 1-上报；2-不上报 */ private Byte reportSwitch; } 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/entity/PreventTaskType.java
对比新文件 @@ -0,0 +1,83 @@ package com.ruoyi.doublePrevention.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @TableName("prevent_task_type") public class PreventTaskType { /** * 主键id * */ @TableId(value = "id" , type = IdType.AUTO) private Long id; private Long jobId; private String jobName; private Long taskId; private String jobUuid; private Byte type; private Byte deleteStatus; public Long getId() { return id; } public void setId(Long id) { this.id = id; } public Long getJobId() { return jobId; } public void setJobId(Long jobId) { this.jobId = jobId; } public String getJobName() { return jobName; } public void setJobName(String jobName) { this.jobName = jobName; } public Long getTaskId() { return taskId; } public void setTaskId(Long taskId) { this.taskId = taskId; } public String getJobUuid() { return jobUuid; } public void setJobUuid(String jobUuid) { this.jobUuid = jobUuid; } public Byte getType() { return type; } public void setType(Byte type) { this.type = type; } public Byte getDeleteStatus() { return deleteStatus; } public void setDeleteStatus(Byte deleteStatus) { this.deleteStatus = deleteStatus; } } src/main/java/com/ruoyi/doublePrevention/entity/dto/req/PreventOverhaulLogInsertReqBO.java
对比新文件 @@ -0,0 +1,36 @@ package com.ruoyi.doublePrevention.entity.dto.req; import lombok.Data; import java.util.Date; @Data public class PreventOverhaulLogInsertReqBO { /** * 风险分析对象编码 */ private String hazardCode; /** * 所属安全风险分析单元id */ private Long riskUnitId; /** * 所属安全风险分析单元uuid */ private String riskUnitUuid; /** * 装置停用或者检维修开始时间 */ private Date stopStartTime; /** * 装置停用或者检维修结束时间 */ private Date stopEndTime; /** * 描述停用原因 */ private String stopReason; } src/main/java/com/ruoyi/doublePrevention/entity/dto/req/PreventOverhaulLogReqBO.java
对比新文件 @@ -0,0 +1,50 @@ package com.ruoyi.doublePrevention.entity.dto.req; import lombok.Data; import java.util.Date; @Data public class PreventOverhaulLogReqBO { private Integer pageNum; private Integer pageSize; /** * 创建时间 */ private Date gmtCreate; /** * 最后修改时间 */ private Date gmtModitify; /** * 所属安全风险分析单元id */ private Long riskUnitId; /** * 所属安全风险分析单元uuid */ private String riskUnitUuid; /** * 企业id */ private Long enterpriseId; /** * 企业uuid */ private String enterpriseUuid; /** * 装置停用或者检维修开始时间 */ private Date stopStartTime; /** * 装置停用或者检维修结束时间 */ private Date stopEndTime; /** * 风险分析对象编码 */ private String hazardCode; } src/main/java/com/ruoyi/doublePrevention/entity/dto/req/PreventOverhaulLogUpdateReqBO.java
对比新文件 @@ -0,0 +1,41 @@ package com.ruoyi.doublePrevention.entity.dto.req; import lombok.Data; import java.util.Date; @Data public class PreventOverhaulLogUpdateReqBO { /** * 风险分析对象编码 */ private Long id; /** * 风险分析对象编码 */ private String hazardCode; /** * 所属安全风险分析单元id */ private Long riskUnitId; /** * 所属安全风险分析单元uuid */ private String riskUnitUuid; /** * 装置停用或者检维修开始时间 */ private Date stopStartTime; /** * 装置停用或者检维修结束时间 */ private Date stopEndTime; /** * 描述停用原因 */ private String stopReason; } src/main/java/com/ruoyi/doublePrevention/entity/dto/resp/PreventOverhaulLogRespDTO.java
对比新文件 @@ -0,0 +1,64 @@ package com.ruoyi.doublePrevention.entity.dto.resp; import lombok.Data; import java.util.Date; @Data public class PreventOverhaulLogRespDTO { private Long id; private String uuid; /** * 创建时间 */ private Date gmtCreate; /** * 最后修改时间 */ private Date gmtModitify; /** * 创建人 */ private String createByUserName; /** * 修改人 */ private String lastEditUserName; /** * 所属安全风险分析单元id */ private Long riskUnitId; /** * 所属安全风险分析单元uuid */ private String riskUnitUuid; /** * 企业id */ private Long enterpriseId; /** * 企业uuid */ private String enterpriseUuid; /** * 装置停用或者检维修开始时间 */ private Date stopStartTime; /** * 装置停用或者检维修结束时间 */ private Date stopEndTime; /** * 描述停用原因 */ private String stopReason; /** * 风险分析对象编码 */ private String hazardCode; } src/main/java/com/ruoyi/doublePrevention/enums/SyncEnum.java
@@ -24,6 +24,7 @@ REPORT_CONFIG_TASK_FROM_WORK((byte) 4, "隐患排查任务配置"), REPORT_CONFIG__CHECK_RECORD((byte) 5, "隐患排查任务记录"), REPORT_CONFIG_DANGER_INFO((byte) 6, "隐患信息"), OVERHAUL_LOG_DANGER_INFO((byte) 7, "隐患信息"), ; byte code; @JsonValue 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
对比新文件 @@ -0,0 +1,18 @@ package com.ruoyi.doublePrevention.repository; 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/PreventOverhaulLogRepository.java
对比新文件 @@ -0,0 +1,29 @@ package com.ruoyi.doublePrevention.repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.doublePrevention.entity.PreventOverhaulLog; import com.ruoyi.doublePrevention.entity.dto.req.PreventOverhaulLogReqBO; import com.ruoyi.doublePrevention.entity.dto.req.PreventOverhaulLogUpdateReqBO; import com.ruoyi.doublePrevention.repository.param.HandlerReportParam; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; import java.util.List; @Repository public interface PreventOverhaulLogRepository extends BaseMapper<PreventOverhaulLog> { List<PreventOverhaulLog> selectOverhaulLogPage(@Param("overhaulLogReqBO") PreventOverhaulLogReqBO overhaulLogReqBO); int savePreventOverhaulLog(PreventOverhaulLog preventOverhaulLog); PreventOverhaulLog getOverhaulLogById(Long id); int updateOverhaulLog(PreventOverhaulLogUpdateReqBO updateReqBO); int deleteOverhaulLogByIds(String[] ids); List<PreventOverhaulLog> listReportOverhaulLog(); int updateOverhaulReportStatus(HandlerReportParam handlerReportParam); } 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
对比新文件 @@ -0,0 +1,15 @@ package com.ruoyi.doublePrevention.repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; 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=="; @@ -87,7 +89,7 @@ @Transactional @Scheduled(cron = "0 0 23 * * ?") //每天晚上23点执行一次 // @Scheduled(cron = "0 0 23 * * ?") //每天晚上23点执行一次 // @Scheduled(cron = "0 0/2 * * * ? ") // 分钟 //@Scheduled(cron = "0/30 * * * * ?") public void execReportDateSchedule() throws UnsupportedEncodingException { @@ -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
@@ -28,6 +28,8 @@ 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; @@ -38,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; @@ -95,11 +99,19 @@ @Autowired private PreventRiskDangerCheckAndMeasureService riskDangerCheckAndMeasureService;//管控措施，任务清单对应关系。基础排查点附属表 @Autowired private PreventTaskTypeService taskTypeService;//管控措施，任务清单对应关系。基础排查点附属表 @Autowired private PreventOverhaulLogService overhaulLogService; @Autowired private PreventCJReportOverhaulLogService reportOverhaulLogService; @Transactional // @Scheduled(cron = "0 0/1 * * * ? ") // 分钟 // @Scheduled(cron = "0/30 * * * * ?") // 30秒 @Scheduled(cron = "0 0 0/2 * * ?") // 小时 // @Scheduled(cron = "0 0 0/2 * * ?") // 小时 public void searchReportDate(){ @@ -387,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); //设置原始数据上报状态 @@ -394,7 +425,6 @@ handlerReportParam.setReportTime(new Date()); handlerReportParam.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode()); preventRiskJobAndMeasureService.updateWorkReportStatus(handlerReportParam); } }else { logger.info("【双重预防】当前无任务配置数据需要处理"); @@ -441,7 +471,6 @@ * 1.找到每个点的提交接口，进行数据处理 * 2.写一个定时任务处理（备用） * */ /** * todo 排查后的任务才上报 * examineUserName，checkTime 任务执行后，不为空 不使用; @@ -463,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()); @@ -510,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() )){ @@ -553,137 +589,208 @@ } // /** // * 6、隐患信息数据 // * */ // //读取安全风险管控措施数据上报主配置信息 // PreventReportConfig dangerReportConfig = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_DANGER_INFO.getCode()); // //如果安全风险管控措施主配置开启上报 // if (dangerReportConfig.getReportState().equals(SyncEnum.REPORT_ON.getCode())){ // // //logger.info("【##】4.检索隐患信息数据..."); // // //查询所有 选择上报的数据 && (reportTime == null 或者 reportTime < updateReportDataTime） // List<PreventRiskDangerInfo> dangerManages = preventRiskDangerInfoService.listReportDanger(); // //获取上报数据list // List<PreventCJReportDangerInfo> CJDangerInfoLists = new ArrayList<>(); // // if (ObjectUtils.isNotEmpty(dangerManages)){ // HandlerReportParam handlerReportParam = new HandlerReportParam(); // //遍历，封装数据 // for (PreventRiskDangerInfo dangerManage : dangerManages) { // // //获取隐患信息主表信息 // HiddenDangerCheckPoint hiddenDanger = trHiddenDangerCheckPointService.getHiddenDangerCheckPointById(dangerManage.getDangerCheckPointId()); // //获取上报数据对象 // PreventCJReportDangerInfo CJDangerInfo = new PreventCJReportDangerInfo(); // // //通过用户名，获取涉及到的各位用户的真实姓名 // User createUser = trUserService.getUserByLoginName(hiddenDanger.getCreateBy()); // User updateUser = trUserService.getUserByLoginName(hiddenDanger.getUpdateBy()); // if (ObjectUtils.isNotEmpty(hiddenDanger.getRegisterUserName())){ // User registerUser = trUserService.getUserByLoginName(hiddenDanger.getRegisterUserName()); // //登记人信息 // CJDangerInfo.setRegistrant(registerUser.getUserName());//登记人 // CJDangerInfo.setRegistTime(hiddenDanger.getRegisterCreateTime());//登记时间 // } // // if (ObjectUtils.isNotEmpty(hiddenDanger.getRectifyUserName())){ // User rectifyUser = trUserService.getUserByLoginName(hiddenDanger.getRectifyUserName()); // //整改人信息 // CJDangerInfo.setLiablePerson(rectifyUser.getUserName());//整改责任人 // } // // if (ObjectUtils.isNotEmpty(hiddenDanger.getAcceptUserName())){ // User acceptUser = trUserService.getUserByLoginName(hiddenDanger.getUpdateBy()); // //验收人信息 // CJDangerInfo.setCheckAcceptPerson(acceptUser.getUserName());//验收人 // CJDangerInfo.setCheckAcceptComment(hiddenDanger.getAcceptOpinion());//验收情况 // CJDangerInfo.setCheckAcceptTime(hiddenDanger.getAcceptCreateTime());//验收时间 // } // //如果排查任务正常存在，封装任务相关数据 // HiddenDangerCheck dangerCheckById = trHiddenDangerCheckService.getHiddenDangerCheckById(hiddenDanger.getCheckId()); // if (ObjectUtils.isNotEmpty(dangerCheckById)){ // // PreventRiskDangerCheckLog dangerCheckLogByCheckId = preventRiskDangerCheckLogService.getByDangerCheckByCheckId(hiddenDanger.getCheckId()); // CJDangerInfo.setCheckRecordId(dangerCheckLogByCheckId.getUuid());//隐患排查任务记录uuid // //找排查点，然后查措施 // PreventRiskCheckUnit unit = preventRiskCheckUnitService.getUnitByBaseCheckPointId(hiddenDanger.getCheckPointId()); // //查管控措施 // PreventRiskControlMeasure controlMeasureById = preventRiskControlMeasureService.getPreventRiskControlMeasureById(unit.getControlMeasureId()); // CJDangerInfo.setRiskMeasureId(controlMeasureById.getUuid());//管控措施uuid // CJDangerInfo.setControlMeasures(controlMeasureById.getCheckContent());//控制措施 ,整改措施 // }else { // CJDangerInfo.setCheckRecordId(null);//隐患排查任务记录uuid // CJDangerInfo.setRiskMeasureId(null);//管控措施uuid // } // // if (dangerManage.getReportStatus().equals(SyncEnum.SYNC_EXEC_SUCCESS.getCode())){ // CJDangerInfo.setDeleted("2");//数据更新状态标识，目前仅昌吉州需要 2022-08-10 // }else { // CJDangerInfo.setDeleted("0"); // } // CJDangerInfo.setId(dangerManage.getUuid()); // CJDangerInfo.setCompanyCode(companyCode); // CJDangerInfo.setHazardCode(dangerManage.getHazardCode());//风险分析对象编码 // CJDangerInfo.setCreateBy(createUser.getUserName()); // CJDangerInfo.setCreateDate(hiddenDanger.getCreateTime()); // // if (ObjectUtils.isEmpty(updateUser)){ // CJDangerInfo.setUpdateBy(createUser.getUserName()); // CJDangerInfo.setUpdateDate(hiddenDanger.getCreateTime()); // }else { // CJDangerInfo.setUpdateBy(updateUser.getUserName()); // CJDangerInfo.setUpdateDate(hiddenDanger.getUpdateTime()); // } // // CJDangerInfo.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode()); // CJDangerInfo.setReportTime(null); // CJDangerInfo.setDataSource((byte) 1); // CJDangerInfo.setDangerName(hiddenDanger.getDangerName()); // CJDangerInfo.setDangerLevel(hiddenDanger.getDangerLevel());//隐患等级 // CJDangerInfo.setDangerSrc(dangerManage.getDangerSrc().toString());//隐患来源 // CJDangerInfo.setDangerManageType(hiddenDanger.getRectifyType());//隐患治理类型 // CJDangerInfo.setDangerDesc(hiddenDanger.getDangerDescription());//隐患描述 // CJDangerInfo.setDangerReason(dangerManage.getDangerReason());//隐患产生原因 // CJDangerInfo.setCost(hiddenDanger.getRectifyFund());//资金 // CJDangerInfo.setDangerManageDeadline(hiddenDanger.getRectifyDeadlineTime());//治理期限 // CJDangerInfo.setDangerState(dangerManage.getDangerState().toString());//隐患状态 // CJDangerInfo.setHazardDangerType(dangerManage.getHazardDangerType().toString());//隐患类型 // CJDangerInfo.setDangerManagerId(dangerManage.getId()); // //封装数据 // CJDangerInfoLists.add(CJDangerInfo); // //设置原始数据上报状态 // handlerReportParam.setId(dangerManage.getId()); // handlerReportParam.setReportTime(new Date()); // handlerReportParam.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode()); // //修改隐患信息附属表状态 // preventRiskDangerInfoService.updateDangerInfoReportStatus(handlerReportParam); // } // }else { // logger.info("【双重预防】当前无隐患信息需要处理"); // } // // //插入上报昌吉州转换表 // for (PreventCJReportDangerInfo CJDanger : CJDangerInfoLists) { // logger.info("【双重预防】隐患信息插入..."); // int result = CJDangerInfoService.insert(CJDanger); // if (result < 0){ // throw new AusinessException(E.ADD_FAIL.getCode(), "隐患信息插入失败"); // } // logger.info("【双重预防】隐患信息：数据处理..."); // } // }else { // logger.info("隐患信息数据上报已关闭"); // } /** * 6、隐患信息数据 * */ //读取安全风险管控措施数据上报主配置信息 PreventReportConfig dangerReportConfig = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_DANGER_INFO.getCode()); //如果安全风险管控措施主配置开启上报 if (dangerReportConfig.getReportState().equals(SyncEnum.REPORT_ON.getCode())){ //logger.info("【##】6.检索隐患数据..."); //查询所有 选择上报的数据 && (reportTime == null 或者 reportTime < updateReportDataTime） List<PreventRiskDangerInfo> dangerManages = preventRiskDangerInfoService.listReportDanger(); //获取上报数据list List<PreventCJReportDangerInfo> CJDangerInfoLists = new ArrayList<>(); if (ObjectUtils.isNotEmpty(dangerManages)){ HandlerReportParam handlerReportParam = new HandlerReportParam(); //遍历，封装数据 for (PreventRiskDangerInfo dangerManage : dangerManages) { //获取隐患信息主表信息 HiddenDangerCheckPoint hiddenDanger = trHiddenDangerCheckPointService.getHiddenDangerCheckPointById(dangerManage.getDangerCheckPointId()); //获取上报数据对象 PreventCJReportDangerInfo CJDangerInfo = new PreventCJReportDangerInfo(); //通过用户名，获取涉及到的各位用户的真实姓名 User createUser = new User(); createUser = trUserService.getUserByLoginName(hiddenDanger.getCreateBy()); if(ObjectUtils.isEmpty(createUser)){ createUser = trUserService.getUserByName(hiddenDanger.getCreateBy()); } User updateUser = trUserService.getUserByLoginName(hiddenDanger.getUpdateBy()); if (ObjectUtils.isNotEmpty(hiddenDanger.getRegisterUserName())){ User registerUser = trUserService.getUserByLoginName(hiddenDanger.getRegisterUserName()); //登记人信息 CJDangerInfo.setRegistrant(registerUser.getUserName());//登记人 CJDangerInfo.setRegistTime(hiddenDanger.getRegisterCreateTime());//登记时间 } if (ObjectUtils.isNotEmpty(hiddenDanger.getRectifyUserName())){ User rectifyUser = trUserService.getUserByLoginName(hiddenDanger.getRectifyUserName()); //整改人信息 CJDangerInfo.setLiablePerson(rectifyUser.getUserName());//整改责任人 } if (ObjectUtils.isNotEmpty(hiddenDanger.getAcceptUserName())){ //验收人信息 CJDangerInfo.setCheckAcceptPerson(hiddenDanger.getAcceptUserName());//验收人 CJDangerInfo.setCheckAcceptComment(hiddenDanger.getAcceptOpinion());//验收情况 CJDangerInfo.setCheckAcceptTime(hiddenDanger.getAcceptCreateTime());//验收时间 } //如果排查任务正常存在，封装任务相关数据 if (Integer.parseInt(hiddenDanger.getDangerSources()) != 2){ HiddenDangerCheck dangerCheckById = trHiddenDangerCheckService.getHiddenDangerCheckById(hiddenDanger.getCheckId()); PreventRiskDangerCheckLog dangerCheckLogByCheckId = preventRiskDangerCheckLogService.getByDangerCheckByCheckId(hiddenDanger.getCheckId()); CJDangerInfo.setCheckRecordId(dangerCheckLogByCheckId.getUuid());//隐患排查任务记录uuid //找排查点，然后查措施 PreventRiskCheckUnit unit = preventRiskCheckUnitService.getUnitByBaseCheckPointId(hiddenDanger.getCheckPointId()); //查管控措施 PreventRiskControlMeasure controlMeasureById = preventRiskControlMeasureService.getPreventRiskControlMeasureById(unit.getControlMeasureId()); CJDangerInfo.setRiskMeasureId(controlMeasureById.getUuid());//管控措施uuid CJDangerInfo.setControlMeasures(controlMeasureById.getCheckContent());//控制措施 ,整改措施 }else { CJDangerInfo.setCheckRecordId(null);//隐患排查任务记录uuid CJDangerInfo.setRiskMeasureId(null);//管控措施uuid } if (dangerManage.getReportStatus().equals(SyncEnum.SYNC_EXEC_SUCCESS.getCode())){ CJDangerInfo.setDeleted("2");//数据更新状态标识，目前仅昌吉州需要 2022-08-10 }else { CJDangerInfo.setDeleted("0"); } CJDangerInfo.setId(dangerManage.getUuid()); CJDangerInfo.setCompanyCode(companyCode); CJDangerInfo.setHazardCode(dangerManage.getHazardCode());//风险分析对象编码 CJDangerInfo.setCreateBy(createUser.getUserName()); CJDangerInfo.setCreateDate(hiddenDanger.getCreateTime()); if (ObjectUtils.isEmpty(updateUser)){ CJDangerInfo.setUpdateBy(createUser.getUserName()); CJDangerInfo.setUpdateDate(hiddenDanger.getCreateTime()); }else { CJDangerInfo.setUpdateBy(updateUser.getUserName()); CJDangerInfo.setUpdateDate(hiddenDanger.getUpdateTime()); } CJDangerInfo.setHazardCategory("0"); if (dangerManage.getId() <= 383){ PreventTaskType taskTypeInfo = taskTypeService.getInfoByTaskId(dangerManage.getId()); int i = 1; CJDangerInfo.setHazardCategory(taskTypeInfo.getType().toString()); } CJDangerInfo.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode()); CJDangerInfo.setReportTime(null); CJDangerInfo.setDataSource((byte) 1); CJDangerInfo.setDangerName(hiddenDanger.getDangerName()); CJDangerInfo.setDangerLevel(hiddenDanger.getDangerLevel());//隐患等级 CJDangerInfo.setDangerSrc(dangerManage.getDangerSrc().toString());//隐患来源 CJDangerInfo.setDangerManageType(hiddenDanger.getRectifyType());//隐患治理类型 CJDangerInfo.setDangerDesc(hiddenDanger.getDangerDescription());//隐患描述 CJDangerInfo.setDangerReason(dangerManage.getDangerReason());//隐患产生原因 CJDangerInfo.setCost(hiddenDanger.getRectifyFund());//资金 CJDangerInfo.setDangerManageDeadline(hiddenDanger.getRectifyDeadlineTime());//治理期限 CJDangerInfo.setDangerState(dangerManage.getDangerState().toString());//隐患状态 CJDangerInfo.setHazardDangerType(dangerManage.getHazardDangerType().toString());//隐患类型 CJDangerInfo.setDangerManagerId(dangerManage.getId()); //封装数据 CJDangerInfoLists.add(CJDangerInfo); //设置原始数据上报状态 handlerReportParam.setId(dangerManage.getId()); handlerReportParam.setReportTime(new Date()); handlerReportParam.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode()); //修改隐患信息附属表状态 preventRiskDangerInfoService.updateDangerInfoReportStatus(handlerReportParam); } }else { logger.info("【双重预防】当前无隐患信息需要处理"); } //插入上报昌吉州转换表 for (PreventCJReportDangerInfo CJDanger : CJDangerInfoLists) { logger.info("【双重预防】隐患信息插入..."); int result = CJDangerInfoService.insert(CJDanger); if (result < 0){ throw new AusinessException(E.ADD_FAIL.getCode(), "隐患信息插入失败"); } logger.info("【双重预防】隐患信息：数据处理..."); } }else { logger.info("隐患信息数据上报已关闭"); } /** * 7、检索检修记录数据 * */ //读取风险分析单元数据上报主配置信息 PreventReportConfig overhaulReportConfig = preventReportConfigService.getReportConfigById(SyncEnum.OVERHAUL_LOG_DANGER_INFO.getCode()); //如果风险事件主配置开启上报 if (overhaulReportConfig.getReportState().equals(SyncEnum.REPORT_ON.getCode())){ //logger.info("【##】2.检索检修记录..."); //查询所有 选择上报的数据 && (reportTime == null 或者 reportTime < updateReportDataTime） List<PreventOverhaulLog> preventOverhaulLogList = overhaulLogService.listReportOverhaulLog(); //获取上报数据对象与list List<PreventCJReportOverhaulLog> CJOverhaulLogLists = new ArrayList<>(); if (ObjectUtils.isNotEmpty(preventOverhaulLogList)){ //遍历，封装数据 for (PreventOverhaulLog preventOverhaulLog : preventOverhaulLogList) { HandlerReportParam handlerReportParam = new HandlerReportParam(); PreventCJReportOverhaulLog CJOverhaulLog = new PreventCJReportOverhaulLog(); //封装上报昌吉州检修记录数据 CJOverhaulLog.setId(preventOverhaulLog.getUuid()); if (preventOverhaulLog.getReportStatus().equals(SyncEnum.SYNC_EXEC_SUCCESS.getCode())){ CJOverhaulLog.setDeleted("2");//数据更新状态标识，目前仅昌吉州需要 2022-08-10 }else { CJOverhaulLog.setDeleted("0"); } CJOverhaulLog.setCompanyCode(companyCode); CJOverhaulLog.setHazardCode(preventOverhaulLog.getHazardCode()); CJOverhaulLog.setRiskUnitId(preventOverhaulLog.getRiskUnitUuid()); CJOverhaulLog.setStopStartTime(preventOverhaulLog.getStopStartTime()); CJOverhaulLog.setStopEndTime(preventOverhaulLog.getStopEndTime()); CJOverhaulLog.setStopReason(preventOverhaulLog.getStopReason()); CJOverhaulLog.setCreateBy(preventOverhaulLog.getCreateByUserName()); CJOverhaulLog.setCreateDate(preventOverhaulLog.getGmtCreate()); CJOverhaulLog.setUpdateBy(preventOverhaulLog.getCreateByUserName()); CJOverhaulLog.setUpdateDate(preventOverhaulLog.getGmtModitify()); CJOverhaulLog.setReportTime(null); CJOverhaulLog.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode()); CJOverhaulLog.setDataSource((byte) 1); //封装数据 CJOverhaulLogLists.add(CJOverhaulLog); //设置原始数据上报状态 handlerReportParam.setId(preventOverhaulLog.getId()); handlerReportParam.setReportTime(new Date()); handlerReportParam.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode()); int result = overhaulLogService.updateOverhaulReportStatus(handlerReportParam); if (result < 1){ throw new AusinessException(E.ADD_FAIL.getCode(), "检修记录数据状态修改失败"); } } }else { logger.info("【检修记录】当前无检修记录数据需要处理"); } //写入昌吉州转换表 for (PreventCJReportOverhaulLog cjOverhaulLog : CJOverhaulLogLists) { int result = reportOverhaulLogService.insertCJOverhaulLists(cjOverhaulLog); if (result < 1){ throw new AusinessException(E.ADD_FAIL.getCode(), "检修记录数据状态修改失败"); } logger.info("【检修记录】2.检修记录CJ：数据处理..."); } step = 3; }else { step = 3; logger.info("检修记录数据上报已关闭"); }
@@ -177,4 +177,6 @@ * 查询隐患附属表信息 */ PreventRiskDangerInfo getDangerInfoById(Long id); int updateCheckLog(Long checkId, HiddenDangerCheckPoint hdcp); } src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportOverhaulLogService.java
对比新文件 @@ -0,0 +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/PreventOverhaulLogService.java
对比新文件 @@ -0,0 +1,28 @@ package com.ruoyi.doublePrevention.service.baseService; import com.ruoyi.doublePrevention.entity.PreventOverhaulLog; import com.ruoyi.doublePrevention.entity.dto.req.PreventOverhaulLogInsertReqBO; import com.ruoyi.doublePrevention.entity.dto.req.PreventOverhaulLogReqBO; import com.ruoyi.doublePrevention.entity.dto.req.PreventOverhaulLogUpdateReqBO; import com.ruoyi.doublePrevention.entity.dto.resp.PreventOverhaulLogRespDTO; import com.ruoyi.doublePrevention.repository.param.HandlerReportParam; import com.ruoyi.doublePrevention.vo.ResultVO; import java.util.List; public interface PreventOverhaulLogService { ResultVO<PreventOverhaulLogRespDTO> selectOverhaulLogPage(PreventOverhaulLogReqBO overhaulLogReqBO); ResultVO<PreventOverhaulLog> savePreventOverhaulLog(PreventOverhaulLogInsertReqBO insertReqBO); PreventOverhaulLog getOverhaulLogById(Long id); ResultVO<PreventOverhaulLog> updateOverhaulLog(PreventOverhaulLogUpdateReqBO updateReqBO); int deleteOverhaulLogByIds(String ids); List<PreventOverhaulLog> listReportOverhaulLog(); int updateOverhaulReportStatus(HandlerReportParam handlerReportParam); } 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
对比新文件 @@ -0,0 +1,13 @@ package com.ruoyi.doublePrevention.service.baseService; 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
对比新文件 @@ -0,0 +1,33 @@ package com.ruoyi.doublePrevention.service.baseService.impl; 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 { @Autowired private PreventCJReportOverhaulLogRepository cjReportOverhaulLogRepository; @Override 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/PreventOverhaulLogServiceImpl.java
对比新文件 @@ -0,0 +1,236 @@ package com.ruoyi.doublePrevention.service.baseService.impl; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; import com.ruoyi.common.exception.BusinessException; import com.ruoyi.common.utils.BeanCopyUtils; import com.ruoyi.common.utils.text.Convert; import com.ruoyi.doublePrevention.entity.PreventOverhaulLog; import com.ruoyi.doublePrevention.entity.PreventReportConfig; import com.ruoyi.doublePrevention.entity.dto.req.PreventOverhaulLogInsertReqBO; import com.ruoyi.doublePrevention.entity.dto.req.PreventOverhaulLogReqBO; import com.ruoyi.doublePrevention.entity.dto.req.PreventOverhaulLogUpdateReqBO; import com.ruoyi.doublePrevention.entity.dto.resp.PreventOverhaulLogRespDTO; import com.ruoyi.doublePrevention.enums.ErrorCodes; import com.ruoyi.doublePrevention.enums.SyncEnum; import com.ruoyi.doublePrevention.repository.PreventOverhaulLogRepository; import com.ruoyi.doublePrevention.repository.param.HandlerReportParam; import com.ruoyi.doublePrevention.service.baseService.PreventOverhaulLogService; import com.ruoyi.doublePrevention.service.baseService.PreventReportConfigService; import com.ruoyi.doublePrevention.vo.ResultVO; import com.ruoyi.project.system.user.domain.User; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; import java.util.Date; import java.util.List; import java.util.UUID; import static com.ruoyi.common.utils.security.ShiroUtils.getSysUser; @Service public class PreventOverhaulLogServiceImpl implements PreventOverhaulLogService { @Autowired private PreventOverhaulLogRepository overhaulLogRepository; @Autowired private PreventReportConfigService preventReportConfigService; @Override public ResultVO<PreventOverhaulLogRespDTO> selectOverhaulLogPage(PreventOverhaulLogReqBO overhaulLogReqBO) { ResultVO resultVO = new ResultVO<>(); if (ObjectUtils.isEmpty(overhaulLogReqBO.getPageSize())){ throw new BusinessException("分页信息不能为空"); } if (ObjectUtils.isEmpty(overhaulLogReqBO.getPageNum())){ throw new BusinessException("分页信息不能为空"); } Integer pageIndex = overhaulLogReqBO.getPageNum(); Integer pageSize = overhaulLogReqBO.getPageSize(); Page<PreventOverhaulLog> page = PageHelper.startPage(pageIndex, pageSize); List<PreventOverhaulLog> preventOverhaulLogs = overhaulLogRepository.selectOverhaulLogPage(overhaulLogReqBO); List<PreventOverhaulLog> result = page.getResult(); resultVO.setData(result); resultVO.setCount((int) page.getTotal()); resultVO.setPageNum(page.getPageNum()); resultVO.setPageSize(page.getPageSize()); return resultVO; } @Override public ResultVO<PreventOverhaulLog> savePreventOverhaulLog(PreventOverhaulLogInsertReqBO insertReqBO) { User sysUser = getSysUser(); ResultVO resultVO = new ResultVO<>(); resultVO.setCode(ErrorCodes.REQUEST_PARAM_ERROR.getCode()); if (insertReqBO.getHazardCode().isEmpty()){ resultVO.setMsg("风险分析对象编码"); return resultVO; } if (ObjectUtils.isEmpty(insertReqBO.getRiskUnitId())){ resultVO.setMsg("所属安全风险分析单元"); return resultVO; } if (ObjectUtils.isEmpty(insertReqBO.getStopStartTime())){ resultVO.setMsg("装置停用或者检维修开始时间"); return resultVO; } if (ObjectUtils.isEmpty(insertReqBO.getStopEndTime())){ resultVO.setMsg("装置停用或者检维修结束时间"); return resultVO; } if (insertReqBO.getStopReason().isEmpty()){ resultVO.setMsg("描述停用原因"); return resultVO; } Date date = new Date(); String uuid = UUID.randomUUID().toString(); PreventOverhaulLog preventOverhaulLog = BeanCopyUtils.copyBean(insertReqBO, PreventOverhaulLog.class); preventOverhaulLog.setUuid(uuid); preventOverhaulLog.setDeleteStatus((byte) 0); preventOverhaulLog.setCreateByUserName(sysUser.getUserName()); preventOverhaulLog.setGmtCreate(date); preventOverhaulLog.setLastEditUserName(sysUser.getUserName()); preventOverhaulLog.setGmtModitify(date); preventOverhaulLog.setRiskUnitId(null);// todo 暂时未设置 //todo 对所属企业id和uuid没有进行设置 PreventReportConfig reportConfigById = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_RISK_ANA_UNIT.getCode()); //设置上报时间为空 preventOverhaulLog.setReportTime(null); //设置本条数据上报更新时间 preventOverhaulLog.setUpdateReportDataTime(date); //读取上报主配置，进行任务记录上报配置,如果开启上报功能，且设置为自动上报,开启上报相关配置 if (reportConfigById.getReportState() == SyncEnum.REPORT_ON.getCode() && reportConfigById.getReportType() == SyncEnum.REPORT_HAND_EXEC_CONFIG.getCode()){ //设置上报状态为-等待上报 preventOverhaulLog.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode()); //设置本条数据上报开关为-开启 preventOverhaulLog.setReportSwitch(SyncEnum.REPORT_ON.getCode()); //其他情况默认不开启上报数据，如果是手动上报，可对单条数据进行操作 }else { //设置上报状态为-不上报 preventOverhaulLog.setReportStatus(SyncEnum.SYNC_NOT_EXEC.getCode()); //设置本条数据上报开关为-关闭 preventOverhaulLog.setReportSwitch(SyncEnum.REPORT_OFF.getCode()); } int result = overhaulLogRepository.savePreventOverhaulLog(preventOverhaulLog); resultVO.setCount(result); resultVO.setCode("200"); resultVO.setMsg("保存成功"); return resultVO; } /** * 查询 by id * */ @Override public PreventOverhaulLog getOverhaulLogById(Long id) { return overhaulLogRepository.getOverhaulLogById(id); } /** * 修改保存 * */ @Override public ResultVO<PreventOverhaulLog> updateOverhaulLog(PreventOverhaulLogUpdateReqBO updateReqBO) { User sysUser = getSysUser(); ResultVO resultVO = new ResultVO<>(); resultVO.setCode(ErrorCodes.REQUEST_PARAM_ERROR.getCode()); if (updateReqBO.getHazardCode().isEmpty()){ resultVO.setMsg("风险分析对象编码"); return resultVO; } if (ObjectUtils.isEmpty(updateReqBO.getRiskUnitId())){ resultVO.setMsg("所属安全风险分析单元"); return resultVO; } if (ObjectUtils.isEmpty(updateReqBO.getStopStartTime())){ resultVO.setMsg("装置停用或者检维修开始时间"); return resultVO; } if (ObjectUtils.isEmpty(updateReqBO.getStopEndTime())){ resultVO.setMsg("装置停用或者检维修结束时间"); return resultVO; } if (updateReqBO.getStopReason().isEmpty()){ resultVO.setMsg("描述停用原因"); return resultVO; } Date date = new Date(); String uuid = UUID.randomUUID().toString(); PreventOverhaulLog preventOverhaulLog = BeanCopyUtils.copyBean(updateReqBO, PreventOverhaulLog.class); preventOverhaulLog.setUuid(uuid); preventOverhaulLog.setDeleteStatus((byte) 0); preventOverhaulLog.setLastEditUserName(sysUser.getUserName()); preventOverhaulLog.setGmtModitify(date); preventOverhaulLog.setRiskUnitId(null);// todo 暂时未设置 //todo 对所属企业id和uuid没有进行设置 PreventReportConfig reportConfigById = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_RISK_ANA_UNIT.getCode()); //设置上报时间为空 preventOverhaulLog.setReportTime(null); //设置本条数据上报更新时间 preventOverhaulLog.setUpdateReportDataTime(date); //读取上报主配置，进行任务记录上报配置,如果开启上报功能，且设置为自动上报,开启上报相关配置 if (reportConfigById.getReportState() == SyncEnum.REPORT_ON.getCode() && reportConfigById.getReportType() == SyncEnum.REPORT_HAND_EXEC_CONFIG.getCode()){ //设置上报状态为-等待上报 preventOverhaulLog.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode()); //设置本条数据上报开关为-开启 preventOverhaulLog.setReportSwitch(SyncEnum.REPORT_ON.getCode()); //其他情况默认不开启上报数据，如果是手动上报，可对单条数据进行操作 }else { //设置上报状态为-不上报 preventOverhaulLog.setReportStatus(SyncEnum.SYNC_NOT_EXEC.getCode()); //设置本条数据上报开关为-关闭 preventOverhaulLog.setReportSwitch(SyncEnum.REPORT_OFF.getCode()); } int result = overhaulLogRepository.updateOverhaulLog(updateReqBO); resultVO.setCount(result); resultVO.setCode("200"); resultVO.setMsg("保存成功"); return resultVO; } @Override public int deleteOverhaulLogByIds(String ids) { return overhaulLogRepository.deleteOverhaulLogByIds(Convert.toStrArray(ids)); } @Override public List<PreventOverhaulLog> listReportOverhaulLog() { return overhaulLogRepository.listReportOverhaulLog(); } @Override public int updateOverhaulReportStatus(HandlerReportParam handlerReportParam) { return overhaulLogRepository.updateOverhaulReportStatus(handlerReportParam); } } 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
对比新文件 @@ -0,0 +1,28 @@ package com.ruoyi.doublePrevention.service.baseService.impl; import com.ruoyi.doublePrevention.entity.PreventTaskType; import com.ruoyi.doublePrevention.repository.PreventTaskTypeRepository; import com.ruoyi.doublePrevention.service.baseService.PreventTaskTypeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @Service("PreventTaskTypeService") public class PreventTaskTypeServiceImpl implements PreventTaskTypeService { @Autowired private PreventTaskTypeRepository taskTypeRepository; @Override 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
@@ -1047,21 +1047,21 @@ dangerInfo.setDangerReason(hdcp.getDangerReason()); dangerInfo.setDangerResult(hdcp.getDangerResult()); dangerInfo.setHazardDangerType(hdcp.getHazardDangerType()); //隐患状态 0未验收 1验收通过 2验收未通过 ，新建时为空 // if (hdcp.getAcceptStatus() == null){ // //设置为 空 // dangerInfo.setDangerState(null); // } else if (hdcp.getAcceptStatus().equals(0)){ // //设置为整改中 // dangerInfo.setDangerState(StatusEnum.RECTIFY_ING.getCode()); // } else if (hdcp.getAcceptStatus().equals(1)) { // //设置为已验收 // dangerInfo.setDangerState(StatusEnum.ACCEPT_SUCCESS.getCode()); // }else if (hdcp.getAcceptStatus().equals(2)){ // //设置为超期未整改 // dangerInfo.setDangerState(StatusEnum.RECTIFY_TIMEOUT_AND_FAIL.getCode()); // } dangerInfo.setDangerState(null); //设置为 空 //隐患状态 0未验收 1验收通过 2验收未通过 if (hdcp.getAcceptStatus() == null){ //设置为 空 dangerInfo.setDangerState(StatusEnum.RECTIFY_ING.getCode()); } else if (hdcp.getAcceptStatus().equals(0)){ //设置为整改中 dangerInfo.setDangerState(StatusEnum.RECTIFY_ING.getCode()); } else if (hdcp.getAcceptStatus().equals(1)) { //设置为已验收 dangerInfo.setDangerState(StatusEnum.ACCEPT_SUCCESS.getCode()); }else if (hdcp.getAcceptStatus().equals(2)){ //设置为超期未整改 dangerInfo.setDangerState(StatusEnum.RECTIFY_TIMEOUT_AND_FAIL.getCode()); } // dangerInfo.setDangerState(null); //设置为 空 dangerInfo.setTimeoutFlag(null);//暂时不清楚是否需要此功能，先设为空 //获取上报主配置信息 PreventReportConfig reportConfigById = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_DANGER_INFO.getCode()); @@ -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));//查询未执行任务总数量并推送
@@ -7,6 +7,7 @@ import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.security.ShiroUtils; import com.ruoyi.doublePrevention.service.RiskService; import com.ruoyi.framework.web.domain.AjaxResult; import com.ruoyi.project.mobile.domain.ApiRequestHeader; import com.ruoyi.project.mobile.domain.ApiResult; @@ -45,6 +46,9 @@ @Autowired IUserService userService;//用户Service @Autowired private RiskService riskService; /** * 获取隐患列表 @@ -141,6 +145,14 @@ hdcpService.getTaskCountTotal(Long.valueOf(header.userId));//查询未执行任务总数量并推送 // todo-2022 此处插入附属表 // HiddenDangerCheckPoint hiddenDangerCheckPointById = hiddenDangerCheckPointService.getHiddenDangerCheckPointById(hiddenDangerCheckPoint.getId()); int result = riskService.insertDangerInfo(hdcp.getId(), hdcp); if (result< 1){ throw new RuntimeException("添加隐患附属信息失败"); } return ApiResult.success("隐患核查保存成功"); } catch (Exception e) { return ApiResult.error("异常"); @@ -168,6 +180,11 @@ hdcpService.getTaskCountTotal(Long.valueOf(header.userId));//查询未执行任务总数量并推送 // todo-2022 隐患信息附属表 int result = riskService.updateDangerInfoRectify(hdcp); if (result < 1){ throw new RuntimeException("整改信息保存失败"); } return ApiResult.success("隐患整改保存成功"); } catch (Exception e) { return ApiResult.error("异常"); @@ -203,6 +220,12 @@ hdcpService.updateHiddenDangerCheckPoint(hdcp); hdcpService.getTaskCountTotal(Long.valueOf(header.userId));//查询未执行任务总数量并推送 // todo-2022 验收通过,修改为已验收状态 int result = riskService.updateDangerInfoAccept(hdcp); if (result < 1){ throw new RuntimeException("隐患验收信息保存失败"); } return ApiResult.success("隐患验收保存成功"); } catch (Exception e) { @@ -264,7 +287,7 @@ /** * 隐患计划执行中---设置为记录正常 * 隐患计划执行中---设置为记录正常 // todo */ public ApiResult editPointSetNormal(String str, ApiRequestHeader header) { //验证userId,loginName,token,deviceType,deviceId,appType 是否一致 src/main/java/com/ruoyi/project/tr/OverhaulLog/controller/OverhaulLogController.java
对比新文件 @@ -0,0 +1,120 @@ package com.ruoyi.project.tr.OverhaulLog.controller; import com.ruoyi.doublePrevention.entity.PreventOverhaulLog; import com.ruoyi.doublePrevention.entity.PreventRiskControlMeasure; import com.ruoyi.doublePrevention.entity.dto.req.*; import com.ruoyi.doublePrevention.entity.dto.resp.PreventOverhaulLogRespDTO; import com.ruoyi.doublePrevention.entity.dto.resp.PreventRiskControlMeasureRespDTO; import com.ruoyi.doublePrevention.entity.dto.resp.PreventRiskEventListQueryRespDTO; import com.ruoyi.doublePrevention.service.baseService.PreventOverhaulLogService; import com.ruoyi.doublePrevention.vo.ResultVO; import com.ruoyi.framework.aspectj.lang.annotation.Log; import com.ruoyi.framework.aspectj.lang.enums.BusinessType; import com.ruoyi.framework.web.controller.BaseController; import com.ruoyi.framework.web.domain.AjaxResult; import com.ruoyi.framework.web.page.TableDataInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.*; import java.util.List; @Controller @RequestMapping("/tr/overhaulLog") public class OverhaulLogController extends BaseController { private String prefix = "tr/overhaulLog"; @Autowired private PreventOverhaulLogService overhaulLogService; @GetMapping() public String overhaulLog() { return prefix + "/riskType"; } /** * 查询 * */ public TableDataInfo selectOverhaulLogPage(PreventOverhaulLogReqBO overhaulLogReqBO, ModelMap mmap){ ResultVO<PreventOverhaulLogRespDTO> result = overhaulLogService.selectOverhaulLogPage(overhaulLogReqBO); List<PreventOverhaulLogRespDTO> data = (List<PreventOverhaulLogRespDTO>) result.getData(); TableDataInfo dataTable = getDataTable(data); dataTable.setTotal(result.getCount()); return dataTable; } /** * 新增检修记录 */ @GetMapping("/add") public String add() { return prefix + "/add"; } /** * 新增保存检修记录 */ @PostMapping("/add") @ResponseBody public AjaxResult addSave(PreventOverhaulLogInsertReqBO insertReqBO) { ResultVO<PreventOverhaulLog> resultVO = overhaulLogService.savePreventOverhaulLog(insertReqBO); String code = resultVO.getCode(); if ("200".equals(code)){ return toAjax(1); }else { return AjaxResult.error(resultVO.getMsg()); } } /** * 修改检修记录 */ @GetMapping("/edit/{id}") public String edit(@PathVariable("id") Long id, ModelMap mmap) { PreventOverhaulLog overhaulLogById = overhaulLogService.getOverhaulLogById(id); mmap.put("overhaulLogById",overhaulLogById); return prefix + "/edit"; } /** * 修改保存 */ @PostMapping("/edit") @ResponseBody public AjaxResult editSave(PreventOverhaulLogUpdateReqBO updateReqBO) { ResultVO<PreventOverhaulLog> resultVO = overhaulLogService.updateOverhaulLog(updateReqBO); String code = resultVO.getCode(); if ("200".equals(code)){ return toAjax(1); }else { return AjaxResult.error(resultVO.getMsg()); } } /** * 删除检修记录 */ @Log(title = "风险单元类型", businessType = BusinessType.DELETE) @PostMapping( "/remove") @ResponseBody public AjaxResult remove(String ids) { return toAjax(overhaulLogService.deleteOverhaulLogByIds(ids)); } } src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerAcceptController.java
@@ -96,7 +96,6 @@ int i = hiddenDangerCheckPointService.updateHiddenDangerCheckPoint(hiddenDangerCheckPoint); // todo-2022 验收通过,修改为已验收状态 int result = riskService.updateDangerInfoAccept(hiddenDangerCheckPoint); if (result < 1){ throw new RuntimeException("隐患验收信息保存失败"); 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>
@@ -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} , #{registrant}, #{registTime}, #{liablePerson}, #{checkAcceptPerson}, #{checkAcceptComment}, #{checkAcceptTime}, #{hazardCategory} , #{reportStatus}, #{reportTime}, #{dataSource}, #{dangerManagerId}) </insert>
对比新文件 @@ -0,0 +1,67 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > <mapper namespace="com.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"> insert into prevent_overhaul_log <trim prefix="(" suffix=")" suffixOverrides=","> <if test="id != null ">id,</if> <if test="deleteStatus != null ">delete_status,</if> <if test="companyCode != null ">company_code,</if> <if test="gmtCreate != null ">gmt_create,</if> <if test="createByUserName != null">create_by_user_name,</if> <if test="gmtModitify != null ">gmt_moditify,</if> <if test="lastEditUserName != null ">last_edit_user_name,</if> <if test="reportTime != null ">report_time,</if> <if test="reportStatus != null ">report_status,</if> <if test="dataSource != null ">data_source,</if> <if test="hazardCode != null ">hazard_code,</if> <if test="riskUnitId != null ">risk_unit_id,</if> <if test="stopStartTime != null ">stop_start_time,</if> <if test="stopEndTime != null ">stop_end_time,</if> <if test="stopReason != null ">stop_reason,</if> </trim> <trim prefix="values (" suffix=")" suffixOverrides=","> <if test="uuid != null ">#{uuid},</if> <if test="deleteStatus != null ">#{deleteStatus},</if> <if test="companyCode != null ">#{companyCode},</if> <if test="gmtCreate != null ">#{gmtCreate},</if> <if test="createByUserName != null ">#{createByUserName},</if> <if test="gmtModitify != null ">#{gmtModitify},</if> <if test="lastEditUserName != null ">#{lastEditUserName},</if> <if test="reportTime != null ">#{reportTime},</if> <if test="reportStatus != null ">#{reportStatus},</if> <if test="dataSource != null ">#{dataSource},</if> <if test="hazardCode != null ">#{hazardCode},</if> <if test="riskUnitId != null ">#{riskUnitId},</if> <if test="stopStartTime != null ">#{stopStartTime},</if> <if test="stopEndTime != null ">#{stopEndTime},</if> <if test="stopReason != null ">#{stopReason},</if> </trim> </insert> </mapper>
对比新文件 @@ -0,0 +1,112 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > <mapper namespace="com.ruoyi.doublePrevention.repository.PreventOverhaulLogRepository" > <resultMap id="BaseResultMap" type="com.ruoyi.doublePrevention.entity.PreventOverhaulLog"> <id column="id" property="id"/> <result column="delete_status" property="deleteStatus" /> </resultMap> <!-- List<PreventOverhaulLog> selectOverhaulLogPage(@Param("overhaulLogReqBO") PreventOverhaulLogReqBO overhaulLogReqBO);--> <select id="selectOverhaulLogPage" resultType="com.ruoyi.doublePrevention.entity.PreventOverhaulLog"> select * from prevent_overhaul_log <where> delete_status = 0 <if test="overhaulLogReqBO.hazardCode != null and overhaulLogReqBO.hazardCode != ''"> and hazard_code = #{overhaulLogReqBO.hazardCode} </if> </where> </select> <!-- PreventOverhaulLog getOverhaulLogById(Long id);--> <select id="getOverhaulLogById" resultType="com.ruoyi.doublePrevention.entity.PreventOverhaulLog"> select * from prevent_overhaul_log where delete_status = 0 and id = #{id} </select> <!-- List<PreventOverhaulLog> listReportOverhaulLog();--> <select id="listReportOverhaulLog" resultType="com.ruoyi.doublePrevention.entity.PreventOverhaulLog"> select * from prevent_overhaul_log where report_switch = 0 and delete_status = 0 and (update_report_data_time > report_time or report_time is null) </select> <!-- int savePreventOverhaulLog(PreventOverhaulLog preventOverhaulLog);--> <insert id="savePreventOverhaulLog" parameterType="com.ruoyi.doublePrevention.entity.PreventOverhaulLog"> insert into prevent_overhaul_log <trim prefix="(" suffix=")" suffixOverrides=","> <if test="uuid != null ">uuid,</if> <if test="deleteStatus != null ">delete_status,</if> <if test="gmtCreate != null ">gmt_create,</if> <if test="createByUserName != null and createByUserName != '' ">create_by_user_name,</if> <if test="gmtModitify != null ">gmt_moditify,</if> <if test="lastEditUserName != null and lastEditUserName != '' ">last_edit_user_name,</if> <if test="enterpriseId != null and enterpriseId != '' ">enterprise_id,</if> <if test="enterpriseUuid != null and enterpriseUuid != '' ">enterprise_uuid,</if> <if test="reportTime != null ">report_time,</if> <if test="updateReportDataTime != null ">update_report_data_time,</if> <if test="reportStatus != null ">report_status,</if> <if test="reportSwitch != null ">report_switch,</if> <if test="hazardCode != null and hazardCode != '' ">hazard_code,</if> <if test="riskUnitId != null and riskUnitId != '' ">risk_unit_id,</if> <if test="riskUnitUuid != null ">risk_unit_uuid,</if> <if test="stopStartTime != null ">stop_start_time,</if> <if test="stopEndTime != null ">stop_end_time,</if> <if test="stopReason != null ">stop_reason,</if> </trim> <trim prefix="values (" suffix=")" suffixOverrides=","> <if test="uuid != null ">#{uuid},</if> <if test="deleteStatus != null ">#{deleteStatus},</if> <if test="gmtCreate != null ">#{gmtCreate},</if> <if test="createByUserName != null and createByUserName != '' ">#{createByUserName},</if> <if test="gmtModitify != null ">#{gmtModitify},</if> <if test="lastEditUserName != null and lastEditUserName != '' ">#{lastEditUserName},</if> <if test="enterpriseId != null and enterpriseId != '' ">#{enterpriseId},</if> <if test="enterpriseUuid != null and enterpriseUuid != '' ">#{enterpriseUuid},</if> <if test="reportTime != null ">#{reportTime},</if> <if test="updateReportDataTime != null ">#{updateReportDataTime},</if> <if test="reportStatus != null ">#{reportStatus},</if> <if test="reportSwitch != null ">#{reportSwitch},</if> <if test="hazardCode != null and hazardCode != '' ">#{hazardCode},</if> <if test="riskUnitId != null and riskUnitId != '' ">#{riskUnitId},</if> <if test="riskUnitUuid != null ">#{riskUnitUuid},</if> <if test="stopStartTime != null ">#{stopStartTime},</if> <if test="stopEndTime != null ">#{stopEndTime},</if> <if test="stopReason != null ">#{stopReason},</if> </trim> </insert> <!-- int updateOverhaulLog(PreventOverhaulLogUpdateReqBO updateReqBO);--> <update id="updateOverhaulLog" parameterType="com.ruoyi.doublePrevention.entity.PreventOverhaulLog"> update prevent_overhaul_log <trim prefix="SET" suffixOverrides=","> <if test="hazardCode != null and hazardCode != ''">hazard_code = #{updateReqBO.id},</if> <if test="riskUnitId != null ">risk_unit_id = #{updateReqBO.riskUnitId},</if> <if test="riskUnitUuid != null and riskUnitUuid != ''">risk_unit_uuid = #{updateReqBO.riskUnitUuid},</if> <if test="stopStartTime != null ">stop_start_time = #{updateReqBO.stopStartTime},</if> <if test="stopEndTime != null ">stop_end_time = #{updateReqBO.stopEndTime},</if> <if test="stopReason != null and stopReason != ''">stop_reason = #{updateReqBO.stopReason},</if> </trim> where id = #{updateReqBO.id} </update> <!-- int deleteOverhaulLogByIds(String[] ids);--> <delete id="deleteOverhaulLogByIds" parameterType="String"> delete from prevent_overhaul_log where id in <foreach item="id" collection="array" open="(" separator="," close=")"> #{id} </foreach> </delete> <!-- int updateOverhaulReportStatus(HandlerReportParam handlerReportParam);--> <update id="updateOverhaulReportStatus" parameterType="com.ruoyi.doublePrevention.entity.PreventOverhaulLog"> update prevent_overhaul_log set report_status = #{reportStatus}, report_time = #{reportTime} where id = #{handlerReportParam.id} </update> </mapper>
@@ -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>
对比新文件 @@ -0,0 +1,28 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > <mapper namespace="com.ruoyi.doublePrevention.repository.PreventTaskTypeRepository" > <resultMap id="BaseResultMap" type="com.ruoyi.doublePrevention.entity.PreventTaskType"> <id column="id" property="id"/> <result column="job_id" property="jobId"/> <result column="job_name" property="jobName" /> <result column="task_id" property="taskId" /> <result column="job_uuid" property="jobUuid" /> <result column="type" property="type" /> <result column="delete_status" property="deleteStatus" /> </resultMap> <!-- PreventTaskType getByTaskId(Long taskId);--> <select id="getInfoByTaskId" resultMap="BaseResultMap"> 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>
