From 90c11c1c0c95075ba802889f0436394067af0748 Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期四, 15 六月 2023 17:02:31 +0800
Subject: [PATCH] 临时提交-检修记录数据采集
---
src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java | 333 +++++++----
src/main/java/com/ruoyi/project/mobile/service/ApiHiddenDangerCheckService.java | 23
src/main/java/com/ruoyi/doublePrevention/enums/SyncEnum.java | 1
src/main/java/com/ruoyi/doublePrevention/scheduls/ExecCJReportDateSchedule.java | 2
src/main/java/com/ruoyi/doublePrevention/entity/dto/resp/PreventOverhaulLogRespDTO.java | 64 ++
src/main/resources/mybatis/doublePrevention/PreventOverhaulMapper.xml | 112 ++++
src/main/resources/mybatis/doublePrevention/PreventCJReportOverhaulMapper.xml | 53 ++
src/main/java/com/ruoyi/doublePrevention/entity/PreventOverhaulLog.java | 94 +++
src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java | 30
src/main/java/com/ruoyi/project/tr/OverhaulLog/controller/OverhaulLogController.java | 120 ++++
src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportDangerInfo.java | 15
src/main/java/com/ruoyi/doublePrevention/entity/PreventTaskType.java | 83 +++
src/main/java/com/ruoyi/doublePrevention/entity/dto/req/PreventOverhaulLogInsertReqBO.java | 36 +
src/main/resources/mybatis/doublePrevention/PreventTaskTypeMapper.xml | 22
src/main/java/com/ruoyi/doublePrevention/entity/dto/req/PreventOverhaulLogReqBO.java | 50 +
src/main/java/com/ruoyi/doublePrevention/repository/PreventOverhaulLogRepository.java | 29 +
src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventTaskTypeService.java | 8
src/main/java/com/ruoyi/doublePrevention/repository/PreventTaskTypeRepository.java | 11
src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerAcceptController.java | 1
src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportOverhaulLogService.java | 8
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportOverhaulLogServiceImpl.java | 20
src/main/resources/mybatis/doublePrevention/PreventCJReportDangerInfoMapper.xml | 2
src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportOverhaulLogRepository.java | 11
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventOverhaulLogServiceImpl.java | 236 +++++++++
src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventOverhaulLogService.java | 28 +
src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportOverhaulLog.java | 84 +++
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventTaskTypeServiceImpl.java | 20
src/main/java/com/ruoyi/doublePrevention/entity/dto/req/PreventOverhaulLogUpdateReqBO.java | 41 +
28 files changed, 1,393 insertions(+), 144 deletions(-)
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportDangerInfo.java b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportDangerInfo.java
index 1641dda..0764c72 100644
--- a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportDangerInfo.java
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportDangerInfo.java
@@ -138,6 +138,13 @@
* 数据来源 1-本系统排查任务产生；2-同步数据
*/
private Long dangerManagerId;
+ /**
+ * 隐患类别(其他隐患0 ;主要负责人隐患1;技术负责人隐患2 ;操作负责人隐患3
+ */
+ private String hazardCategory;
+
+
+
public Long getDangerManagerId() {
return dangerManagerId;
@@ -147,6 +154,14 @@
this.dangerManagerId = dangerManagerId;
}
+ public String getHazardCategory() {
+ return hazardCategory;
+ }
+
+ public void setHazardCategory(String hazardCategory) {
+ this.hazardCategory = hazardCategory;
+ }
+
public Integer getIndexId() {
return indexId;
}
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportOverhaulLog.java b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportOverhaulLog.java
new file mode 100644
index 0000000..8ab05f5
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportOverhaulLog.java
@@ -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;
+
+
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/PreventOverhaulLog.java b/src/main/java/com/ruoyi/doublePrevention/entity/PreventOverhaulLog.java
new file mode 100644
index 0000000..5f9621a
--- /dev/null
+++ b/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;
+
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/PreventTaskType.java b/src/main/java/com/ruoyi/doublePrevention/entity/PreventTaskType.java
new file mode 100644
index 0000000..cb22dc5
--- /dev/null
+++ b/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;
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/dto/req/PreventOverhaulLogInsertReqBO.java b/src/main/java/com/ruoyi/doublePrevention/entity/dto/req/PreventOverhaulLogInsertReqBO.java
new file mode 100644
index 0000000..395d28a
--- /dev/null
+++ b/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;
+
+
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/dto/req/PreventOverhaulLogReqBO.java b/src/main/java/com/ruoyi/doublePrevention/entity/dto/req/PreventOverhaulLogReqBO.java
new file mode 100644
index 0000000..4915040
--- /dev/null
+++ b/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;
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/dto/req/PreventOverhaulLogUpdateReqBO.java b/src/main/java/com/ruoyi/doublePrevention/entity/dto/req/PreventOverhaulLogUpdateReqBO.java
new file mode 100644
index 0000000..1be2082
--- /dev/null
+++ b/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;
+
+
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/dto/resp/PreventOverhaulLogRespDTO.java b/src/main/java/com/ruoyi/doublePrevention/entity/dto/resp/PreventOverhaulLogRespDTO.java
new file mode 100644
index 0000000..a104ec4
--- /dev/null
+++ b/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;
+
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/enums/SyncEnum.java b/src/main/java/com/ruoyi/doublePrevention/enums/SyncEnum.java
index 3b3ba20..215065b 100644
--- a/src/main/java/com/ruoyi/doublePrevention/enums/SyncEnum.java
+++ b/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
diff --git a/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportOverhaulLogRepository.java b/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportOverhaulLogRepository.java
new file mode 100644
index 0000000..f42bcee
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportOverhaulLogRepository.java
@@ -0,0 +1,11 @@
+package com.ruoyi.doublePrevention.repository;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportOverhaulLog;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface PreventCJReportOverhaulLogRepository extends BaseMapper<PreventCJReportOverhaulLog> {
+
+ int insertCJOverhaulLists(PreventCJReportOverhaulLog cjOverhaulLog);
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/repository/PreventOverhaulLogRepository.java b/src/main/java/com/ruoyi/doublePrevention/repository/PreventOverhaulLogRepository.java
new file mode 100644
index 0000000..1467639
--- /dev/null
+++ b/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);
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/repository/PreventTaskTypeRepository.java b/src/main/java/com/ruoyi/doublePrevention/repository/PreventTaskTypeRepository.java
new file mode 100644
index 0000000..6053de6
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/repository/PreventTaskTypeRepository.java
@@ -0,0 +1,11 @@
+package com.ruoyi.doublePrevention.repository;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.doublePrevention.entity.PreventTaskType;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface PreventTaskTypeRepository extends BaseMapper<PreventTaskType> {
+
+ PreventTaskType getInfoByTaskId(Long taskId);
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/scheduls/ExecCJReportDateSchedule.java b/src/main/java/com/ruoyi/doublePrevention/scheduls/ExecCJReportDateSchedule.java
index 057e4de..a465e18 100644
--- a/src/main/java/com/ruoyi/doublePrevention/scheduls/ExecCJReportDateSchedule.java
+++ b/src/main/java/com/ruoyi/doublePrevention/scheduls/ExecCJReportDateSchedule.java
@@ -87,7 +87,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 {
diff --git a/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java b/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java
index 5d1c8bf..04bab21 100644
--- a/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java
+++ b/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java
@@ -24,7 +24,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
@@ -95,11 +94,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(){
@@ -553,137 +560,211 @@
}
-// /**
-// * 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("检修记录数据上报已关闭");
+ }
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportOverhaulLogService.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportOverhaulLogService.java
new file mode 100644
index 0000000..e0818d9
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportOverhaulLogService.java
@@ -0,0 +1,8 @@
+package com.ruoyi.doublePrevention.service.baseService;
+
+import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportOverhaulLog;
+
+public interface PreventCJReportOverhaulLogService {
+
+ int insertCJOverhaulLists(PreventCJReportOverhaulLog cjOverhaulLog);
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventOverhaulLogService.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventOverhaulLogService.java
new file mode 100644
index 0000000..58a1d96
--- /dev/null
+++ b/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);
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventTaskTypeService.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventTaskTypeService.java
new file mode 100644
index 0000000..89aae8e
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventTaskTypeService.java
@@ -0,0 +1,8 @@
+package com.ruoyi.doublePrevention.service.baseService;
+
+import com.ruoyi.doublePrevention.entity.PreventTaskType;
+
+public interface PreventTaskTypeService {
+
+ PreventTaskType getInfoByTaskId(Long id);
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportOverhaulLogServiceImpl.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportOverhaulLogServiceImpl.java
new file mode 100644
index 0000000..a84bde5
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportOverhaulLogServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ruoyi.doublePrevention.service.baseService.impl;
+
+import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportOverhaulLog;
+import com.ruoyi.doublePrevention.repository.PreventCJReportOverhaulLogRepository;
+import com.ruoyi.doublePrevention.service.baseService.PreventCJReportOverhaulLogService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class PreventCJReportOverhaulLogServiceImpl implements PreventCJReportOverhaulLogService {
+
+ @Autowired
+ private PreventCJReportOverhaulLogRepository cjReportOverhaulLogRepository;
+
+
+ @Override
+ public int insertCJOverhaulLists(PreventCJReportOverhaulLog cjOverhaulLog) {
+ return cjReportOverhaulLogRepository.insertCJOverhaulLists(cjOverhaulLog);
+ }
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventOverhaulLogServiceImpl.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventOverhaulLogServiceImpl.java
new file mode 100644
index 0000000..497b9f5
--- /dev/null
+++ b/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);
+ }
+
+
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventTaskTypeServiceImpl.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventTaskTypeServiceImpl.java
new file mode 100644
index 0000000..f5827be
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventTaskTypeServiceImpl.java
@@ -0,0 +1,20 @@
+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;
+
+@Service("PreventTaskTypeService")
+public class PreventTaskTypeServiceImpl implements PreventTaskTypeService {
+
+ @Autowired
+ private PreventTaskTypeRepository taskTypeRepository;
+
+
+ @Override
+ public PreventTaskType getInfoByTaskId(Long taskId) {
+ return taskTypeRepository.getInfoByTaskId(taskId);
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java b/src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java
index 089841f..436ccd9 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java
+++ b/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());
diff --git a/src/main/java/com/ruoyi/project/mobile/service/ApiHiddenDangerCheckService.java b/src/main/java/com/ruoyi/project/mobile/service/ApiHiddenDangerCheckService.java
index 8d108f0..f2647f9 100644
--- a/src/main/java/com/ruoyi/project/mobile/service/ApiHiddenDangerCheckService.java
+++ b/src/main/java/com/ruoyi/project/mobile/service/ApiHiddenDangerCheckService.java
@@ -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("异常");
@@ -204,6 +221,12 @@
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) {
return ApiResult.error("异常");
diff --git a/src/main/java/com/ruoyi/project/tr/OverhaulLog/controller/OverhaulLogController.java b/src/main/java/com/ruoyi/project/tr/OverhaulLog/controller/OverhaulLogController.java
new file mode 100644
index 0000000..c66c852
--- /dev/null
+++ b/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));
+ }
+
+
+}
diff --git a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerAcceptController.java b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerAcceptController.java
index 2fc3b40..4edeb2d 100644
--- a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerAcceptController.java
+++ b/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("隐患验收信息保存失败");
diff --git a/src/main/resources/mybatis/doublePrevention/PreventCJReportDangerInfoMapper.xml b/src/main/resources/mybatis/doublePrevention/PreventCJReportDangerInfoMapper.xml
index 1387083..7a79f5a 100644
--- a/src/main/resources/mybatis/doublePrevention/PreventCJReportDangerInfoMapper.xml
+++ b/src/main/resources/mybatis/doublePrevention/PreventCJReportDangerInfoMapper.xml
@@ -72,7 +72,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>
diff --git a/src/main/resources/mybatis/doublePrevention/PreventCJReportOverhaulMapper.xml b/src/main/resources/mybatis/doublePrevention/PreventCJReportOverhaulMapper.xml
new file mode 100644
index 0000000..e3ba077
--- /dev/null
+++ b/src/main/resources/mybatis/doublePrevention/PreventCJReportOverhaulMapper.xml
@@ -0,0 +1,53 @@
+<?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" >
+
+
+<!-- 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>
+
diff --git a/src/main/resources/mybatis/doublePrevention/PreventOverhaulMapper.xml b/src/main/resources/mybatis/doublePrevention/PreventOverhaulMapper.xml
new file mode 100644
index 0000000..719fb49
--- /dev/null
+++ b/src/main/resources/mybatis/doublePrevention/PreventOverhaulMapper.xml
@@ -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>
+
diff --git a/src/main/resources/mybatis/doublePrevention/PreventTaskTypeMapper.xml b/src/main/resources/mybatis/doublePrevention/PreventTaskTypeMapper.xml
new file mode 100644
index 0000000..caf03d8
--- /dev/null
+++ b/src/main/resources/mybatis/doublePrevention/PreventTaskTypeMapper.xml
@@ -0,0 +1,22 @@
+<?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>
+
+</mapper>
+
--
Gitblit v1.9.2