数字化接口对接

RuoYi-Vue-master/RuoYi-Vue-master/doubleDefense/src/main/java/com/ruoyi/doubledefense/domain/CheckTaskInventoryRecord.java

@@ -3,6 +3,7 @@ package com.ruoyi.doubledefense.domain;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.GnhzBaseEntity;
 import lombok.Data;
@@ -60,8 +61,13 @@ public class CheckTaskInventoryRecord extends GnhzBaseEntity {
      */
     private Long checkUserId;
     /**
+     * 巡检用户姓名
+     */
+    private String checkUserNickName;
+    /**
      * 巡检时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date checkTime;
 
 
@@ -75,20 +81,24 @@ public class CheckTaskInventoryRecord extends GnhzBaseEntity {
     //    @Excel(name = "开始时间查询条件大于等于")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField(exist = false)
+    @JsonIgnore
     private Date startDateGt;
 
     //    @ApiModelProperty("开始时间查询条件小于等于")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField(exist = false)
+    @JsonIgnore
     private Date startDateLt;
 
     //    @ApiModelProperty("结束时间查询条件大于等于")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField(exist = false)
+    @JsonIgnore
     private Date endDateGt;
 
     //    @ApiModelProperty("结束时间查询条件小于等于")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField(exist = false)
+    @JsonIgnore
     private Date endDateLt;
 }

RuoYi-Vue-master/RuoYi-Vue-master/doubleDefense/src/main/java/com/ruoyi/doubledefense/dtoGov/CheckTaskDTOGov.java

@@ -0,0 +1,44 @@
+package com.ruoyi.doubledefense.dtoGov;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+/**
+ * 双重预防汇聚计算节点
+ * 隐患排查要求：tb_check_task
+ */
+@Data
+public class CheckTaskDTOGov extends GovBaseEntity {
+
+    private static final long serialVersionUID = 4551382039921901075L;
+    /**
+     * 主键
+     */
+    @JsonProperty("ID")
+    private String id;
+
+    /**
+     * 管控措施 id
+     */
+    @JsonProperty("RISK_MEASURE_ID")
+    private String riskMeasureId;
+
+    /**
+     * 风险事件名称
+     */
+    @JsonProperty("TROUBLESHOOT_CONTENT")
+    private String troubleshootContent;
+
+    /**
+     * 巡检周期
+     */
+    @JsonProperty("CHECK_CYCLE")
+    private String checkCycle;
+
+    /**
+     * 巡检周期周期单位
+     */
+    @JsonProperty("CHECK_CYCLE_UNIT")
+    private String checkCycleUnit;
+
+}

RuoYi-Vue-master/RuoYi-Vue-master/doubleDefense/src/main/java/com/ruoyi/doubledefense/dtoGov/CheckTaskInventoryRecordDTOGov.java

@@ -0,0 +1,57 @@
+package com.ruoyi.doubledefense.dtoGov;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 巡检打卡记录：tb_check_task_inventory_record
+ * 双重预防汇聚计算节点
+ */
+@Data
+public class CheckTaskInventoryRecordDTOGov extends GovBaseEntity {
+
+    private static final long serialVersionUID = 4551382039921901075L;
+    /**
+     * 主键
+     */
+    @JsonProperty("ID")
+    private String id;
+
+    /**
+     * 隐患排查任务ID
+     */
+    @JsonProperty("CHECK_TASK_ID")
+    private String checkTaskId;
+
+    /**
+     * 排查时间
+     */
+    @JsonProperty("CHECK_TIME")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date checkTime;
+
+
+    /**
+     * 排查结果
+     * 排查结果（正常：0；1-存在隐患；2-未排查；3-其他）
+     */
+    @JsonProperty("CHECK_STATUS")
+    private Integer status;
+
+
+    /**
+     * 创建人手机号
+     */
+    @JsonProperty("CREATE_BY_MOBILE")
+    private String createByMobile;
+
+    /**
+     * 修改人手机号
+     */
+    @JsonProperty("UPDATE_BY_MOBILE")
+    private String updateByMobile;
+
+}

RuoYi-Vue-master/RuoYi-Vue-master/doubleDefense/src/main/java/com/ruoyi/doubledefense/dtoGov/DangerDTOGov.java

@@ -0,0 +1,216 @@
+package com.ruoyi.doubledefense.dtoGov;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 四色图：tb_four_color_diagram
+ * 双重预防汇聚计算节点
+ */
+@Data
+public class DangerDTOGov extends GovBaseEntity {
+
+    private static final long serialVersionUID = 4551382039921901075L;
+    /**
+     * 主键
+     */
+    @JsonProperty("ID")
+    private String id;
+
+    /**
+     * 风险分析对象编码
+     */
+    @JsonProperty("HAZARD_CODE")
+    private String hazardCode;
+
+    /**
+     * 管控措施主键
+     */
+    @JsonProperty("RISK_MEASURE_ID")
+    private String riskMeasureId;
+
+    /**
+     * 隐患排查记录ID巡检ID
+     */
+    @JsonProperty("CHECK_RECORD_ID")
+    private String checkTaskInventoryRecordId;
+
+    /**
+     * 隐患名称
+     */
+    @JsonProperty("DANGER_NAME")
+    private String dangerName;
+
+    /**
+     * 隐患等级
+     * 隐患等级（一般隐
+     * 患：0；重大隐患：
+     * 1）
+     */
+    @JsonProperty("DANGER_LEVEL")
+    private Integer dangerLevel;
+
+    /**
+     * 登记时间
+     */
+    @JsonProperty("REGIST_TIME")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date registTime;
+
+    /**
+     * 登记人姓名
+     */
+    @JsonProperty("REGISTRANT")
+    private String registRant;
+
+    /**
+     * 隐患来源
+     */
+    @JsonProperty("DANGER_SRC")
+    private String dangerSrc;
+
+    /**
+     * 治理类型
+     * 隐患治理类型（
+     * 即查即改：0；
+     * 限期整改：1
+     * ）
+     */
+    @JsonProperty("DANGER_MANAGE_TYPE")
+    private Integer dangerManageType;
+
+    /**
+     * 隐患类型
+     * 隐患类型（安全：1；工艺：2；电气：3；仪表：4；消防：5；总图：6；设备：7；其他：8）
+     */
+    @JsonProperty("HAZARD_DANGER_TYPE")
+    private Integer hazardDangerType;
+
+    /**
+     * 隐患描述
+     */
+    @JsonProperty("DANGER_DESC")
+    private String dangerDesc;
+
+    /**
+     * 原因分析(没有对应的值，始终为空)
+     */
+    @JsonProperty("DANGER_REASON")
+    private String dangerReason;
+
+    /**
+     * 控制措施_管控措施主键对应的文字说明
+     */
+    @JsonProperty("CONTROL_MEASURES")
+    private String riskMeasureDesc;
+
+    /**
+     * 资金
+     */
+    @JsonProperty("COST")
+    private String cost;
+
+    /**
+     * 整改责任人
+     */
+    @JsonProperty("LIABLE_PERSON")
+    private String liablePerson;
+
+    /**
+     * 隐患治理期限
+     */
+    @JsonProperty("DANGER_MANAGE_DEADLINE")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date dangerManageDeaddline;
+
+    /**
+     * 验收人姓名
+     */
+    @JsonProperty("CHECK_ACCEPT_PERSON")
+    private String checkAcceptPerson;
+
+    /**
+     * 验收时间
+     */
+    @JsonProperty("CHECK_ACCEPT_TIME")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date checkAcceptTime;
+
+    /**
+     * 验收情况
+     */
+    @JsonProperty("CHECK_ACCEPT_COMMENT")
+    private String checkAcceptComment;
+
+    /**
+     * 验收状态
+     */
+    @JsonProperty("DANGER_STATE")
+    private Integer dangerState;
+
+    /*
+    SELECT
+      hazard.hazard_code 风险分析对象编码,
+      t1.risk_measure_id 管控措施主键,
+      t1.check_task_inventory_record_id 隐患排查记录ID巡检ID,
+
+      t1.id,
+      t1.danger_name 隐患名称,
+      t1.danger_level 隐患等级,
+      t1.regist_time 登记时间,
+      c_user.nick_name 登记人姓名,
+      t1.danger_src 隐患来源,
+      t1.danger_manage_type 治理类型,
+      t1.hazard_danger_type 隐患类型,
+      t1.danger_desc 隐患描述,
+    --   t1. 原因分析,
+      risk_measure.risk_measure_desc 控制措施_管控措施主键对应的文字说明,
+      t2.cost 资金,
+      m_user.nick_name 整改责任人,
+      t2.danger_manage_deaddline 隐患治理期限,
+      check_user.nick_name 验收人姓名,
+      t2.check_accept_time 验收时间,
+      t2.check_accept_comment 验收情况,
+     -- danger_status 隐患状态：10待审核，20认领中，30整改中，40待验收，50已验收，60取消
+     -- 隐患状态（0-整改中：1-待验收：9-已验收）
+      CASE t1.danger_status
+        WHEN 30 THEN 0
+        WHEN 40 THEN 1
+        WHEN 50 THEN 9
+        END
+        AS 验收状态,
+
+
+      t1.is_del,
+      t1.create_date,
+      IFNULL(c_user.nick_name, '管理员') AS createBy,
+      t1.update_date,
+      IFNULL(u_user.nick_name, '管理员') AS updateBy,
+      t1.company_code AS companyCode
+    FROM tb_danger t1
+    INNER JOIN tb_danger_manage t2 ON t2.danger_id = t1.id
+
+    LEFT JOIN tb_hazard hazard ON hazard.id = t1.hazard_id
+
+    LEFT JOIN tb_risk_measure risk_measure ON risk_measure.id = t1.risk_measure_id
+
+    INNER JOIN sys_user m_user ON m_user.user_id = t2.manage_user_id
+
+    LEFT JOIN sys_user check_user ON check_user.user_id = t2.check_user_id
+
+    LEFT JOIN tb_risk_measure risk_m ON risk_m.id = t1.risk_measure_id
+
+    INNER JOIN sys_user c_user ON c_user.user_id = t1.create_user_id
+    LEFT JOIN sys_user u_user ON u_user.user_id = t1.update_user_id
+    WHERE t1.is_del = 0
+    AND t1.danger_status IN (30,40,50)
+
+    -- GROUP BY t1.id
+    ORDER BY t1.create_date, t1.update_date
+
+     */
+
+}

RuoYi-Vue-master/RuoYi-Vue-master/doubleDefense/src/main/java/com/ruoyi/doubledefense/dtoGov/FourColorDiagramDTOGov.java

@@ -0,0 +1,27 @@
+package com.ruoyi.doubledefense.dtoGov;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+/**
+ * 四色图：tb_four_color_diagram
+ * 双重预防汇聚计算节点
+ */
+@Data
+public class FourColorDiagramDTOGov extends GovBaseEntity {
+
+    private static final long serialVersionUID = 4551382039921901075L;
+    /**
+     * 主键
+     */
+    @JsonProperty("ID")
+    private String id;
+
+    /**
+     * 安全风险空间分布图
+     *
+     * 图片的base64 编码。图片格式为 PNG 或JPEG，图片大小不超过5M。每家企业最多上传 20张图片。
+     */
+    @JsonProperty("IMG")
+    private String colorImg;
+}

RuoYi-Vue-master/RuoYi-Vue-master/doubleDefense/src/main/java/com/ruoyi/doubledefense/dtoGov/GovBaseEntity.java

@@ -0,0 +1,98 @@
+package com.ruoyi.doubledefense.dtoGov;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 双重预防汇聚计算节点的基础对象
+ */
+@Data
+public class GovBaseEntity implements Serializable {
+
+    private static final long serialVersionUID = 503274936000629249L;
+    /**
+     * 删除标志（正常：0；已删除：1）同步的数据不可物理删除，如需删除，标志记为1。
+     */
+    @JsonProperty("DELETED")
+    private Integer isDel;
+    /**
+     * 创建时间
+     */
+    @JsonProperty("CREATE_DATE")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createDate;
+
+    /**
+     * 创建人姓名 varchar(50)
+     */
+    @JsonProperty("CREATE_BY")
+    private String createBy;
+
+    /**
+     * 更新时间
+     */
+    @JsonProperty("UPDATE_DATE")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateDate;
+
+    /**
+     * 更新人姓名 varchar(50)
+     */
+    @JsonProperty("UPDATE_BY")
+    private String updateBy;
+
+    /**
+     * 企业编码 varchar(9)
+     */
+    @JsonProperty("COMPANY_CODE")
+    private String companyCode;
+
+
+    /**
+     * 分页：页码
+     */
+    @TableField(exist = false)
+    //FastJSON序列化排除该属性
+    @JSONField(serialize = false)
+    //Jack序列化排除该属性
+    @JsonIgnore
+    private Integer pageNo;
+
+    /**
+     * 分页：每页条数
+     */
+    @TableField(exist = false)
+    //FastJSON序列化排除该属性
+    @JSONField(serialize = false)
+    //Jack序列化排除该属性
+    @JsonIgnore
+    private Integer pageSize;
+
+    /**
+     * 开始时间
+     */
+    @TableField(exist = false)
+    //FastJSON序列化排除该属性
+    @JSONField(serialize = false)
+    //Jack序列化排除该属性
+    @JsonIgnore
+    private Date startUpdateDate;
+
+    /**
+     * 结束时间
+     */
+    @TableField(exist = false)
+    //FastJSON序列化排除该属性
+    @JSONField(serialize = false)
+    //Jack序列化排除该属性
+    @JsonIgnore
+    private Date endUpdateDate;
+
+}

RuoYi-Vue-master/RuoYi-Vue-master/doubleDefense/src/main/java/com/ruoyi/doubledefense/dtoGov/RiskEventDTOGov.java

@@ -0,0 +1,32 @@
+package com.ruoyi.doubledefense.dtoGov;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+/**
+ * 风险事件：tb_risk_event
+ * 双重预防汇聚计算节点
+ */
+@Data
+public class RiskEventDTOGov extends GovBaseEntity {
+
+    private static final long serialVersionUID = 4551382039921901075L;
+    /**
+     * 主键
+     */
+    @JsonProperty("ID")
+    private String id;
+
+    /**
+     * 分析单元ID
+     */
+    @JsonProperty("RISK_UNIT_ID")
+    private String riskUnitId;
+
+    /**
+     * 风险事件名称
+     */
+    @JsonProperty("RISK_EVENT_NAME")
+    private String riskEventName;
+
+}

RuoYi-Vue-master/RuoYi-Vue-master/doubleDefense/src/main/java/com/ruoyi/doubledefense/dtoGov/RiskMeasureDTOGov.java

@@ -0,0 +1,66 @@
+package com.ruoyi.doubledefense.dtoGov;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+/**
+ * 管控措施：tb_risk_measure
+ * 双重预防汇聚计算节点
+ */
+@Data
+public class RiskMeasureDTOGov extends GovBaseEntity {
+
+    private static final long serialVersionUID = 4551382039921901075L;
+    /**
+     * 主键
+     */
+    @JsonProperty("ID")
+    private String id;
+
+    /**
+     * 风险事件 ID
+     */
+    @JsonProperty("RISK_EVENT_ID")
+    private String riskEventId;
+
+    /**
+     * 管控方式：自动化监控：1；隐患排查：2
+     */
+    @JsonProperty("DATA_SRC")
+    private String dataSrc;
+
+    /**
+     * 管控措施描述
+     */
+    @JsonProperty("RISK_MEASURE_DESC")
+    private String riskMeasureDesc;
+
+    /**
+     * 管控措施分类1：工程技术：1；维护保养：2；操作行为：3；应急措施：4
+     */
+    @JsonProperty("CLASSIFY1")
+    private String classify1;
+
+    /**
+     * 管控措施分类2
+     * 工艺控制:
+     * 1-1；关键设备/部件：1-2；安全附件：1-3；安全仪表：1-4；其它：1-5；动设备：
+     * 2-1；静设备：2-2；其它：2-3；人员资质：
+     * 3-1；操作记录：3-2；交接班：3-3；其它：3-4；应急设施：
+     * 4-1；个体防护：4-2；消防设施：4-3；应急预案：4-4。其它：4-5；
+     */
+    @JsonProperty("CLASSIFY2")
+    private String classify2;
+
+    /**
+     * 管控措施分类3：由 企 业 自 行 定义
+     */
+    @JsonProperty("CLASSIFY3")
+    private String classify3;
+
+    /**
+     * 隐患排查内容
+     */
+    @JsonProperty("TROUBLESHOOT_CONTENT")
+    private String troubleshootContent;
+}

RuoYi-Vue-master/RuoYi-Vue-master/doubleDefense/src/main/java/com/ruoyi/doubledefense/dtoGov/RiskUnitDTOGov.java

@@ -0,0 +1,44 @@
+package com.ruoyi.doubledefense.dtoGov;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+
+/**
+ *  分析单元：tb_risk_unit
+ * 双重预防汇聚计算节点
+ */
+@Data
+public class RiskUnitDTOGov extends GovBaseEntity {
+    /**
+     * 主键 UUID
+     */
+    @JsonProperty("ID")
+    private String id;
+
+    /**
+     * 风险分析对象编码即危险化学品登记信息管理系统中的危险源编码
+     */
+    @JsonProperty("HAZARD_CODE")
+    private String hazardCode;
+
+    /**
+     * 风险分析对象所属部门名称
+     * 责任部门（必选）-> 区域对应的岗位
+     */
+    @JsonProperty("HAZARD_DEP")
+    private String postName;
+
+    /**
+     * 风险分析对象所属部门负责人姓名
+     * 责任人（必选） -> 岗位下的所有人员逗号拼接一下，注意不要超过200个字符
+     */
+    @JsonProperty("HAZARD_LIABLE_PERSON")
+    private String hazardLiablePerson;
+
+    /**
+     * 风险分析单元名称
+     */
+    @JsonProperty("RISK_UNIT_NAME")
+    private String riskUnitName;
+}

RuoYi-Vue-master/RuoYi-Vue-master/doubleDefense/src/main/java/com/ruoyi/doubledefense/mapper/CheckTaskInventoryRecordMapper.java

@@ -11,6 +11,7 @@ import com.ruoyi.doubledefense.dto.CheckTaskInventoryStatisticsPCDTO;
 import com.ruoyi.doubledefense.dto.res.CheckTasRiskUnitkListDTOForApp;
 import com.ruoyi.doubledefense.dto.res.CheckTaskListDTOForApp;
 import com.ruoyi.doubledefense.dto.res.CheckUserCountStatisticsDTO;
+import com.ruoyi.doubledefense.dtoGov.CheckTaskInventoryRecordDTOGov;
 import org.apache.ibatis.annotations.Param;
 
 /**
@@ -125,4 +126,12 @@ public interface CheckTaskInventoryRecordMapper extends BaseMapper<CheckTaskInve
      * @return
      */
     List<CheckUserCountStatisticsDTO> checkUserCountStatistics(@Param("checkTimeStatr") Date checkTimeStatr, @Param("checkTimeEnd") Date checkTimeEnd);
+    /**
+     * 重预防汇聚计算节点
+     * 查询巡检打卡记录
+     *
+     * @param checkTaskInventoryRecordDTOGov
+     * @return
+     */
+    List<CheckTaskInventoryRecordDTOGov> govSelectCheckTaskInventoryRecordList(CheckTaskInventoryRecordDTOGov checkTaskInventoryRecordDTOGov);
 }

RuoYi-Vue-master/RuoYi-Vue-master/doubleDefense/src/main/java/com/ruoyi/doubledefense/mapper/CheckTaskMapper.java

@@ -7,11 +7,12 @@ import com.ruoyi.doubledefense.domain.CheckTask;
 import com.ruoyi.doubledefense.domain.CheckTaskInventory;
 import com.ruoyi.doubledefense.dto.CheckTaskDTO;
 import com.ruoyi.doubledefense.dto.res.CheckTaskResultDTO;
+import com.ruoyi.doubledefense.dtoGov.CheckTaskDTOGov;
 
 
 /**
  * 隐患排查任务Mapper接口
- * 
+ *
  * @author ruoyi
  * @date 2023-08-03
  */
@@ -20,9 +21,18 @@ public interface CheckTaskMapper extends BaseMapper<CheckTask>
 
     /**
      * 查询隐患排查任务列表
-     * 
+     *
      * @param checkTask 隐患排查任务
      * @return 隐患排查任务集合
      */
     public List<CheckTaskResultDTO> selectCheckTaskList(CheckTaskDTO checkTask);
+
+    /**
+     * 重预防汇聚计算节点
+     * 查询隐患排查要求
+     *
+     * @param checkTaskDTOGov
+     * @return
+     */
+    List<CheckTaskDTOGov> govSelectCheckTaskList(CheckTaskDTOGov checkTaskDTOGov);
 }

RuoYi-Vue-master/RuoYi-Vue-master/doubleDefense/src/main/java/com/ruoyi/doubledefense/mapper/DangerMapper.java

@@ -10,6 +10,7 @@ import com.ruoyi.doubledefense.dto.DangerDTO;
 import com.ruoyi.doubledefense.dto.DangerStatisticsDTO;
 import com.ruoyi.doubledefense.dto.DangerStatisticsPCDTO;
 import com.ruoyi.doubledefense.dto.res.DangerResultDTO;
+import com.ruoyi.doubledefense.dtoGov.DangerDTOGov;
 import org.apache.ibatis.annotations.Param;
 
 
@@ -52,4 +53,12 @@ public interface DangerMapper extends BaseMapper<Danger> {
      * @return
      */
     List<DangerResultDTO> pcHomePageDangerList(DangerDTO danger);
+    /**
+     * 重预防汇聚计算节点
+     * 查询隐患列表
+     *
+     * @param dangerDTOGov
+     * @return
+     */
+    List<DangerDTOGov> govSelectDangerList(DangerDTOGov dangerDTOGov);
 }

RuoYi-Vue-master/RuoYi-Vue-master/doubleDefense/src/main/java/com/ruoyi/doubledefense/mapper/FourColorDiagramMapper.java

@@ -1,19 +1,29 @@
 package com.ruoyi.doubledefense.mapper;
 
 import java.util.List;
+
 import com.ruoyi.doubledefense.domain.FourColorDiagram;
+import com.ruoyi.doubledefense.dtoGov.FourColorDiagramDTOGov;
 
 /**
  * 四色图Mapper接口
- * 
+ *
  * @author lyp
  * @date 2023-09-16
  */
-public interface FourColorDiagramMapper 
-{
+public interface FourColorDiagramMapper {
+    /**
+     * 四色图
+     * 重预防汇聚计算节点
+     *
+     * @param fourColorDiagramDTOGov
+     * @return
+     */
+    List<FourColorDiagramDTOGov> govSelectFourColorDiagramList(FourColorDiagramDTOGov fourColorDiagramDTOGov);
+
     /**
      * 查询四色图
-     * 
+     *
      * @param id 四色图主键
      * @return 四色图
      */
@@ -21,7 +31,7 @@ public interface FourColorDiagramMapper
 
     /**
      * 查询四色图列表
-     * 
+     *
      * @param fourColorDiagram 四色图
      * @return 四色图集合
      */
@@ -29,7 +39,7 @@ public interface FourColorDiagramMapper
 
     /**
      * 新增四色图
-     * 
+     *
      * @param fourColorDiagram 四色图
      * @return 结果
      */
@@ -37,7 +47,7 @@ public interface FourColorDiagramMapper
 
     /**
      * 修改四色图
-     * 
+     *
      * @param fourColorDiagram 四色图
      * @return 结果
      */
@@ -45,7 +55,7 @@ public interface FourColorDiagramMapper
 
     /**
      * 删除四色图
-     * 
+     *
      * @param id 四色图主键
      * @return 结果
      */
@@ -53,7 +63,7 @@ public interface FourColorDiagramMapper
 
     /**
      * 批量删除四色图
-     * 
+     *
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */

RuoYi-Vue-master/RuoYi-Vue-master/doubleDefense/src/main/java/com/ruoyi/doubledefense/mapper/RiskEventMapper.java

@@ -7,22 +7,30 @@ import com.ruoyi.doubledefense.domain.Hazard;
 import com.ruoyi.doubledefense.domain.RiskEvent;
 import com.ruoyi.doubledefense.dto.RiskEventDTO;
 import com.ruoyi.doubledefense.dto.res.RiskEventResultDTO;
+import com.ruoyi.doubledefense.dtoGov.RiskEventDTOGov;
 
 /**
  * 风险事件Mapper接口
- * 
+ *
  * @author ruoyi
  * @date 2023-08-03
  */
-public interface RiskEventMapper extends BaseMapper<RiskEvent>
-{
+public interface RiskEventMapper extends BaseMapper<RiskEvent> {
 
     /**
      * 查询风险事件列表
-     * 
+     *
      * @param riskEvent 风险事件
      * @return 风险事件集合
      */
-    public List<RiskEventResultDTO> selectRiskEventList(RiskEventDTO riskEvent);
+    List<RiskEventResultDTO> selectRiskEventList(RiskEventDTO riskEvent);
+
+    /**
+     * 重预防汇聚计算节点
+     * 查询风险事件
+     * @param riskEvent
+     * @return
+     */
+    List<RiskEventDTOGov> govSelectRiskEventList(RiskEventDTOGov riskEvent);
 
 }

RuoYi-Vue-master/RuoYi-Vue-master/doubleDefense/src/main/java/com/ruoyi/doubledefense/mapper/RiskMeasureMapper.java

@@ -7,6 +7,7 @@ import com.ruoyi.doubledefense.domain.RiskEvent;
 import com.ruoyi.doubledefense.domain.RiskMeasure;
 import com.ruoyi.doubledefense.dto.RiskMeasureDTO;
 import com.ruoyi.doubledefense.dto.res.RiskMeasureResultDTO;
+import com.ruoyi.doubledefense.dtoGov.RiskMeasureDTOGov;
 
 /**
  * 风险管控措施Mapper接口
@@ -24,4 +25,12 @@ public interface RiskMeasureMapper extends BaseMapper<RiskMeasure> {
      */
     public List<RiskMeasureResultDTO> selectRiskMeasureList(RiskMeasureDTO riskMeasure);
 
+    /**
+     * 管控措施
+     * 重预防汇聚计算节点
+     * @param riskMeasureDTOGov
+     * @return
+     */
+    List<RiskMeasureDTOGov> govSelectRiskMeasureList(RiskMeasureDTOGov riskMeasureDTOGov);
+
 }

RuoYi-Vue-master/RuoYi-Vue-master/doubleDefense/src/main/java/com/ruoyi/doubledefense/mapper/RiskUnitMapper.java

@@ -7,10 +7,11 @@ import com.ruoyi.doubledefense.domain.RiskMeasure;
 import com.ruoyi.doubledefense.domain.RiskUnit;
 import com.ruoyi.doubledefense.dto.RiskUnitDTO;
 import com.ruoyi.doubledefense.dto.res.RiskUnitResultDTO;
+import com.ruoyi.doubledefense.dtoGov.RiskUnitDTOGov;
 
 /**
  * 风险分析单元Mapper接口
- * 
+ *
  * @author ruoyi
  * @date 2023-08-03
  */
@@ -22,4 +23,12 @@ public interface RiskUnitMapper extends BaseMapper<RiskUnit>
      * @return
      */
     List<RiskUnitResultDTO> selectRiskUnitList(RiskUnitDTO riskUnit);
+
+    /**
+     * 重预防汇聚计算节点
+     * 查询风险分析单元
+     * @param riskUnit
+     * @return
+     */
+    List<RiskUnitDTOGov> govSelectRiskUnitList(RiskUnitDTOGov riskUnit);
 }

RuoYi-Vue-master/RuoYi-Vue-master/doubleDefense/src/main/java/com/ruoyi/doubledefense/service/ICheckTaskInventoryRecordService.java

@@ -4,11 +4,13 @@ import java.util.Date;
 import java.util.List;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.pagehelper.PageInfo;
 import com.ruoyi.doubledefense.domain.CheckTaskInventory;
 import com.ruoyi.doubledefense.domain.CheckTaskInventoryRecord;
 import com.ruoyi.doubledefense.dto.CheckTaskInventoryStatisticsDTO;
 import com.ruoyi.doubledefense.dto.CheckTaskInventoryStatisticsPCDTO;
 import com.ruoyi.doubledefense.dto.res.CheckUserCountStatisticsDTO;
+import com.ruoyi.doubledefense.dtoGov.CheckTaskInventoryRecordDTOGov;
 
 /**
  * 巡查记录Service接口
@@ -18,6 +20,14 @@ import com.ruoyi.doubledefense.dto.res.CheckUserCountStatisticsDTO;
  */
 public interface ICheckTaskInventoryRecordService extends IService<CheckTaskInventoryRecord> {
     /**
+     * 重预防汇聚计算节点
+     * 查询巡检打卡记录
+     * @param checkTaskInventoryRecordDTOGov
+     * @return
+     */
+    PageInfo<CheckTaskInventoryRecordDTOGov> govSelectCheckTaskInventoryRecordList(CheckTaskInventoryRecordDTOGov checkTaskInventoryRecordDTOGov);
+
+    /**
      * 查询巡查记录
      *
      * @param id 巡查记录主键
@@ -101,4 +111,6 @@ public interface ICheckTaskInventoryRecordService extends IService<CheckTaskInve
      * @return
      */
     List<CheckUserCountStatisticsDTO> checkUserCountStatistics(Date checkTimeStatr, Date checkTimeEnd);
+
+
 }

RuoYi-Vue-master/RuoYi-Vue-master/doubleDefense/src/main/java/com/ruoyi/doubledefense/service/ICheckTaskService.java

@@ -1,21 +1,32 @@
 package com.ruoyi.doubledefense.service;
 
 import java.util.List;
+
+import com.github.pagehelper.PageInfo;
 import com.ruoyi.doubledefense.domain.CheckTask;
 import com.ruoyi.doubledefense.dto.CheckTaskDTO;
 import com.ruoyi.doubledefense.dto.res.CheckTaskResultDTO;
+import com.ruoyi.doubledefense.dtoGov.CheckTaskDTOGov;
 
 /**
  * 隐患排查任务Service接口
- * 
+ *
  * @author ruoyi
  * @date 2023-08-03
  */
-public interface ICheckTaskService 
-{
+public interface ICheckTaskService {
+    /**
+     * 重预防汇聚计算节点
+     * 查询隐患排查要求
+     *
+     * @param checkTaskDTOGov
+     * @return
+     */
+    PageInfo<CheckTaskDTOGov> govSelectCheckTaskList(CheckTaskDTOGov checkTaskDTOGov);
+
     /**
      * 查询隐患排查任务
-     * 
+     *
      * @param id 隐患排查任务主键
      * @return 隐患排查任务
      */
@@ -23,7 +34,7 @@ public interface ICheckTaskService
 
     /**
      * 查询隐患排查任务列表
-     * 
+     *
      * @param checkTaskDTO 隐患排查任务
      * @return 隐患排查任务集合
      */
@@ -31,7 +42,7 @@ public interface ICheckTaskService
 
     /**
      * 新增隐患排查任务
-     * 
+     *
      * @param checkTask 隐患排查任务
      * @return 结果
      */
@@ -39,7 +50,7 @@ public interface ICheckTaskService
 
     /**
      * 修改隐患排查任务
-     * 
+     *
      * @param checkTask 隐患排查任务
      * @return 结果
      */
@@ -47,10 +58,9 @@ public interface ICheckTaskService
 
     /**
      * 批量删除隐患排查任务
-     * 
+     *
      * @param ids 需要删除的隐患排查任务主键集合
      * @return 结果
      */
     public int deleteCheckTaskByIds(String[] ids);
-
 }

RuoYi-Vue-master/RuoYi-Vue-master/doubleDefense/src/main/java/com/ruoyi/doubledefense/service/IDangerService.java

@@ -3,12 +3,14 @@ package com.ruoyi.doubledefense.service;
 import java.util.Date;
 import java.util.List;
 
+import com.github.pagehelper.PageInfo;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.doubledefense.domain.Danger;
 import com.ruoyi.doubledefense.dto.DangerDTO;
 import com.ruoyi.doubledefense.dto.DangerStatisticsDTO;
 import com.ruoyi.doubledefense.dto.DangerStatisticsPCDTO;
 import com.ruoyi.doubledefense.dto.res.DangerResultDTO;
+import com.ruoyi.doubledefense.dtoGov.DangerDTOGov;
 import org.springframework.transaction.annotation.Transactional;
 
 /**
@@ -17,8 +19,16 @@ import org.springframework.transaction.annotation.Transactional;
  * @author ruoyi
  * @date 2023-08-03
  */
-public interface IDangerService
-{
+public interface IDangerService {
+    /**
+     * 重预防汇聚计算节点
+     * 查询隐患列表
+     *
+     * @param dangerDTOGov
+     * @return
+     */
+    PageInfo<DangerDTOGov> govSelectDangerList(DangerDTOGov dangerDTOGov);
+
     /**
      * 查询隐患信息
      *
@@ -34,6 +44,7 @@ public interface IDangerService
      * @return 隐患信息集合
      */
     public List<DangerResultDTO> selectDangerList(DangerDTO danger);
+
     /**
      * PC首页统计-双重防御机制：查询隐患列表
      *
@@ -68,6 +79,7 @@ public interface IDangerService
 
     /**
      * 上报隐患
+     *
      * @param dangerDTO
      * @return
      */
@@ -75,19 +87,23 @@ public interface IDangerService
 
     /**
      * 修改隐患
+     *
      * @param dangerDTO
      * @return
      */
-    int updateDangerForApp(DangerDTO dangerDTO,boolean isStatusUpdate);
+    int updateDangerForApp(DangerDTO dangerDTO, boolean isStatusUpdate);
 
     /**
      * 审核隐患
+     *
      * @param dangerDTO
      * @return
      */
     AjaxResult dangerReview(DangerDTO dangerDTO);
+
     /**
      * 认领隐患
+     *
      * @param dangerId
      * @return
      */
@@ -95,6 +111,7 @@ public interface IDangerService
 
     /**
      * 提交整改信息（完成整改）
+     *
      * @param dangerDTO
      * @return
      */
@@ -102,6 +119,7 @@ public interface IDangerService
 
     /**
      * 整改验收
+     *
      * @param dangerDTO
      * @return
      */
@@ -109,14 +127,18 @@ public interface IDangerService
 
     /**
      * APP首页统计-隐患排查
+     *
      * @return
      */
     DangerStatisticsDTO dangerStatistics();
 
     /**
      * PC首页统计-双重预防机制
+     *
      * @param endDate 今天的0点0分的时间
      * @return
      */
     DangerStatisticsPCDTO dangerStatisticsPC(Date endDate);
+
+
 }

RuoYi-Vue-master/RuoYi-Vue-master/doubleDefense/src/main/java/com/ruoyi/doubledefense/service/IFourColorDiagramService.java

@@ -2,7 +2,9 @@ package com.ruoyi.doubledefense.service;
 
 import java.util.List;
 
+import com.github.pagehelper.PageInfo;
 import com.ruoyi.doubledefense.domain.FourColorDiagram;
+import com.ruoyi.doubledefense.dtoGov.FourColorDiagramDTOGov;
 
 /**
  * 四色图Service接口
@@ -11,6 +13,16 @@ import com.ruoyi.doubledefense.domain.FourColorDiagram;
  * @date 2023-09-16
  */
 public interface IFourColorDiagramService {
+
+    /**
+     * 四色图
+     * 重预防汇聚计算节点
+     *
+     * @param fourColorDiagramDTOGov
+     * @return
+     */
+    PageInfo<FourColorDiagramDTOGov> govSelectFourColorDiagramList(FourColorDiagramDTOGov fourColorDiagramDTOGov);
+
     /**
      * 查询四色图
      *

RuoYi-Vue-master/RuoYi-Vue-master/doubleDefense/src/main/java/com/ruoyi/doubledefense/service/IRiskEventService.java

@@ -1,21 +1,33 @@
 package com.ruoyi.doubledefense.service;
 
 import java.util.List;
+
+import com.github.pagehelper.PageInfo;
 import com.ruoyi.doubledefense.domain.RiskEvent;
 import com.ruoyi.doubledefense.dto.RiskEventDTO;
 import com.ruoyi.doubledefense.dto.res.RiskEventResultDTO;
+import com.ruoyi.doubledefense.dtoGov.RiskEventDTOGov;
 
 /**
  * 风险事件Service接口
- * 
+ *
  * @author ruoyi
  * @date 2023-08-03
  */
-public interface IRiskEventService 
+public interface IRiskEventService
 {
+
+    /**
+     * 重预防汇聚计算节点
+     * 查询风险事件
+     * @param riskEvent
+     * @return
+     */
+    PageInfo<RiskEventDTOGov> govSelectRiskEventList(RiskEventDTOGov riskEvent);
+
     /**
      * 查询风险事件
-     * 
+     *
      * @param id 风险事件主键
      * @return 风险事件
      */
@@ -23,7 +35,7 @@ public interface IRiskEventService
 
     /**
      * 查询风险事件列表
-     * 
+     *
      * @param riskEvent 风险事件
      * @return 风险事件集合
      */
@@ -31,7 +43,7 @@ public interface IRiskEventService
 
     /**
      * 新增风险事件
-     * 
+     *
      * @param riskEvent 风险事件
      * @return 结果
      */
@@ -39,7 +51,7 @@ public interface IRiskEventService
 
     /**
      * 修改风险事件
-     * 
+     *
      * @param riskEvent 风险事件
      * @return 结果
      */
@@ -47,7 +59,7 @@ public interface IRiskEventService
 
     /**
      * 批量删除风险事件
-     * 
+     *
      * @param ids 需要删除的风险事件主键集合
      * @return 结果
      */

RuoYi-Vue-master/RuoYi-Vue-master/doubleDefense/src/main/java/com/ruoyi/doubledefense/service/IRiskMeasureService.java

@@ -1,17 +1,30 @@
 package com.ruoyi.doubledefense.service;
 
 import java.util.List;
+
+import com.github.pagehelper.PageInfo;
 import com.ruoyi.doubledefense.domain.RiskMeasure;
 import com.ruoyi.doubledefense.dto.RiskMeasureDTO;
 import com.ruoyi.doubledefense.dto.res.RiskMeasureResultDTO;
+import com.ruoyi.doubledefense.dtoGov.RiskMeasureDTOGov;
 
 /**
  * 风险管控措施Service接口
- * 
+ *
  * @author ruoyi
  * @date 2023-08-03
  */
 public interface IRiskMeasureService {
+
+    /**
+     * 管控措施
+     * 重预防汇聚计算节点
+     * @param riskMeasureDTOGov
+     * @return
+     */
+    PageInfo<RiskMeasureDTOGov> govSelectRiskMeasureList(RiskMeasureDTOGov riskMeasureDTOGov);
+
+
     /**
      * 查询风险管控措施
      *

RuoYi-Vue-master/RuoYi-Vue-master/doubleDefense/src/main/java/com/ruoyi/doubledefense/service/IRiskUnitService.java

@@ -1,21 +1,32 @@
 package com.ruoyi.doubledefense.service;
 
 import java.util.List;
+
+import com.github.pagehelper.PageInfo;
 import com.ruoyi.doubledefense.domain.RiskUnit;
 import com.ruoyi.doubledefense.dto.RiskUnitDTO;
 import com.ruoyi.doubledefense.dto.res.RiskUnitResultDTO;
+import com.ruoyi.doubledefense.dtoGov.RiskUnitDTOGov;
 
 /**
  * 风险分析单元Service接口
- * 
+ *
  * @author ruoyi
  * @date 2023-08-03
  */
-public interface IRiskUnitService 
+public interface IRiskUnitService
 {
     /**
+     * 重预防汇聚计算节点
+     * 查询风险分析单元
+     * @param riskUnit
+     * @return
+     */
+    PageInfo<RiskUnitDTOGov> govSelectRiskUnitList(RiskUnitDTOGov riskUnit);
+
+    /**
      * 查询风险分析单元
-     * 
+     *
      * @param id 风险分析单元主键
      * @return 风险分析单元
      */
@@ -23,7 +34,7 @@ public interface IRiskUnitService
 
     /**
      * 查询风险分析单元列表
-     * 
+     *
      * @param riskUnit 风险分析单元
      * @return 风险分析单元集合
      */
@@ -31,7 +42,7 @@ public interface IRiskUnitService
 
     /**
      * 新增风险分析单元
-     * 
+     *
      * @param riskUnit 风险分析单元
      * @return 结果
      */
@@ -39,7 +50,7 @@ public interface IRiskUnitService
 
     /**
      * 修改风险分析单元
-     * 
+     *
      * @param riskUnit 风险分析单元
      * @return 结果
      */
@@ -47,7 +58,7 @@ public interface IRiskUnitService
 
     /**
      * 批量删除风险分析单元
-     * 
+     *
      * @param ids 需要删除的风险分析单元主键集合
      * @return 结果
      */

RuoYi-Vue-master/RuoYi-Vue-master/doubleDefense/src/main/java/com/ruoyi/doubledefense/service/impl/CheckTaskInventoryRecordServiceImpl.java

@@ -4,11 +4,14 @@ import java.util.Date;
 import java.util.List;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.ruoyi.common.constant.DeletedEnum;
 import com.ruoyi.doubledefense.domain.CheckTaskInventory;
 import com.ruoyi.doubledefense.dto.CheckTaskInventoryStatisticsDTO;
 import com.ruoyi.doubledefense.dto.CheckTaskInventoryStatisticsPCDTO;
 import com.ruoyi.doubledefense.dto.res.CheckUserCountStatisticsDTO;
+import com.ruoyi.doubledefense.dtoGov.CheckTaskInventoryRecordDTOGov;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.doubledefense.mapper.CheckTaskInventoryRecordMapper;
@@ -22,11 +25,27 @@ import com.ruoyi.doubledefense.service.ICheckTaskInventoryRecordService;
  * @date 2023-08-03
  */
 @Service
-public class CheckTaskInventoryRecordServiceImpl extends ServiceImpl<CheckTaskInventoryRecordMapper,CheckTaskInventoryRecord> implements ICheckTaskInventoryRecordService {
+public class CheckTaskInventoryRecordServiceImpl extends ServiceImpl<CheckTaskInventoryRecordMapper, CheckTaskInventoryRecord> implements ICheckTaskInventoryRecordService {
     @Autowired
     private CheckTaskInventoryRecordMapper checkTaskInventoryRecordMapper;
 
     /**
+     * 重预防汇聚计算节点
+     * 查询巡检打卡记录
+     *
+     * @param checkTaskInventoryRecordDTOGov
+     * @return
+     */
+    @Override
+    public PageInfo<CheckTaskInventoryRecordDTOGov> govSelectCheckTaskInventoryRecordList(CheckTaskInventoryRecordDTOGov checkTaskInventoryRecordDTOGov) {
+        PageHelper.startPage(checkTaskInventoryRecordDTOGov.getPageNo(), checkTaskInventoryRecordDTOGov.getPageSize());
+
+        List<CheckTaskInventoryRecordDTOGov> govSelectCheckTaskInventoryRecordList = checkTaskInventoryRecordMapper.govSelectCheckTaskInventoryRecordList(checkTaskInventoryRecordDTOGov);
+        PageInfo<CheckTaskInventoryRecordDTOGov> pageInfo = new PageInfo<>(govSelectCheckTaskInventoryRecordList);
+        return pageInfo;
+    }
+
+    /**
      * 查询巡查记录
      *
      * @param id 巡查记录主键
@@ -116,8 +135,8 @@ public class CheckTaskInventoryRecordServiceImpl extends ServiceImpl<CheckTaskIn
      * @return
      */
     @Override
-    public List<CheckTaskInventoryRecord> selectCheckTaskInventoryRecordListByRistUnitId(String riskUnitId,Integer status) {
-        return checkTaskInventoryRecordMapper.selectCheckTaskInventoryRecordListByRistUnitId(riskUnitId,status);
+    public List<CheckTaskInventoryRecord> selectCheckTaskInventoryRecordListByRistUnitId(String riskUnitId, Integer status) {
+        return checkTaskInventoryRecordMapper.selectCheckTaskInventoryRecordListByRistUnitId(riskUnitId, status);
     }
 
     /**
@@ -160,6 +179,6 @@ public class CheckTaskInventoryRecordServiceImpl extends ServiceImpl<CheckTaskIn
      */
     @Override
     public List<CheckUserCountStatisticsDTO> checkUserCountStatistics(Date checkTimeStatr, Date checkTimeEnd) {
-        return checkTaskInventoryRecordMapper.checkUserCountStatistics(checkTimeStatr,checkTimeEnd);
+        return checkTaskInventoryRecordMapper.checkUserCountStatistics(checkTimeStatr, checkTimeEnd);
     }
 }

RuoYi-Vue-master/RuoYi-Vue-master/doubleDefense/src/main/java/com/ruoyi/doubledefense/service/impl/CheckTaskServiceImpl.java

@@ -2,10 +2,13 @@ package com.ruoyi.doubledefense.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.ruoyi.common.exception.base.BaseException;
 import com.ruoyi.doubledefense.domain.CheckTask;
 import com.ruoyi.doubledefense.dto.CheckTaskDTO;
 import com.ruoyi.doubledefense.dto.res.CheckTaskResultDTO;
+import com.ruoyi.doubledefense.dtoGov.CheckTaskDTOGov;
 import com.ruoyi.doubledefense.mapper.CheckTaskMapper;
 import com.ruoyi.doubledefense.service.ICheckTaskService;
 import org.springframework.beans.BeanUtils;
@@ -29,7 +32,22 @@ public class CheckTaskServiceImpl implements ICheckTaskService {
     @Autowired
     private CheckTaskMapper checkTaskMapper;
 
-//    @Autowired
+    /**
+     * 重预防汇聚计算节点
+     * 查询隐患排查要求
+     *
+     * @param checkTaskDTOGov
+     * @return
+     */
+    @Override
+    public PageInfo<CheckTaskDTOGov> govSelectCheckTaskList(CheckTaskDTOGov checkTaskDTOGov) {
+        PageHelper.startPage(checkTaskDTOGov.getPageNo(), checkTaskDTOGov.getPageSize());
+        List<CheckTaskDTOGov> dataList =checkTaskMapper.govSelectCheckTaskList(checkTaskDTOGov);
+        PageInfo<CheckTaskDTOGov> pageInfo = new PageInfo<>(dataList);
+        return pageInfo;
+    }
+
+    //    @Autowired
 //    private CheckTaskPostRelationMapper checkTaskPostRelationMapper;
 
     /**

RuoYi-Vue-master/RuoYi-Vue-master/doubleDefense/src/main/java/com/ruoyi/doubledefense/service/impl/DangerServiceImpl.java

@@ -2,6 +2,8 @@ package com.ruoyi.doubledefense.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.ruoyi.common.constant.AppUserTypeEnum;
 import com.ruoyi.common.constant.DangerStatusEnum;
 import com.ruoyi.common.constant.DeletedEnum;
@@ -18,6 +20,7 @@ import com.ruoyi.doubledefense.dto.DangerDTO;
 import com.ruoyi.doubledefense.dto.DangerStatisticsDTO;
 import com.ruoyi.doubledefense.dto.DangerStatisticsPCDTO;
 import com.ruoyi.doubledefense.dto.res.DangerResultDTO;
+import com.ruoyi.doubledefense.dtoGov.DangerDTOGov;
 import com.ruoyi.doubledefense.mapper.DangerManageMapper;
 import com.ruoyi.doubledefense.mapper.DangerMapper;
 import com.ruoyi.doubledefense.mapper.DangerOperateRecordMapper;
@@ -73,6 +76,20 @@ public class DangerServiceImpl implements IDangerService {
     @Autowired
     private TbSysAreaMapper tbSysAreaMapper;
 
+    /**
+     * 重预防汇聚计算节点
+     * 查询隐患列表
+     *
+     * @param dangerDTOGov
+     * @return
+     */
+    @Override
+    public PageInfo<DangerDTOGov> govSelectDangerList(DangerDTOGov dangerDTOGov) {
+        PageHelper.startPage(dangerDTOGov.getPageNo(),dangerDTOGov.getPageSize());
+        List<DangerDTOGov> dangerDTOGovList = dangerMapper.govSelectDangerList(dangerDTOGov);
+        PageInfo<DangerDTOGov> pageInfo = new PageInfo<>(dangerDTOGovList);
+        return pageInfo;
+    }
 
     /**
      * 查询隐患信息
@@ -765,4 +782,5 @@ public class DangerServiceImpl implements IDangerService {
     public DangerStatisticsPCDTO dangerStatisticsPC(Date endDate) {
         return dangerMapper.dangerStatisticsPC(endDate);
     }
+
 }

RuoYi-Vue-master/RuoYi-Vue-master/doubleDefense/src/main/java/com/ruoyi/doubledefense/service/impl/FourColorDiagramServiceImpl.java

@@ -3,7 +3,10 @@ package com.ruoyi.doubledefense.service.impl;
 import java.util.List;
 import java.util.UUID;
 
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.doubledefense.dtoGov.FourColorDiagramDTOGov;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.doubledefense.mapper.FourColorDiagramMapper;
@@ -22,6 +25,21 @@ public class FourColorDiagramServiceImpl implements IFourColorDiagramService {
     private FourColorDiagramMapper fourColorDiagramMapper;
 
     /**
+     * 四色图
+     * 重预防汇聚计算节点
+     *
+     * @param fourColorDiagramDTOGov
+     * @return
+     */
+    @Override
+    public PageInfo<FourColorDiagramDTOGov> govSelectFourColorDiagramList(FourColorDiagramDTOGov fourColorDiagramDTOGov) {
+        PageHelper.startPage(fourColorDiagramDTOGov.getPageNo(),fourColorDiagramDTOGov.getPageSize());
+        List<FourColorDiagramDTOGov> fourColorDiagramDTOGovList = fourColorDiagramMapper.govSelectFourColorDiagramList(fourColorDiagramDTOGov);
+        PageInfo<FourColorDiagramDTOGov> pageInfo = new PageInfo<>(fourColorDiagramDTOGovList);
+        return pageInfo;
+    }
+
+    /**
      * 查询四色图
      *
      * @param id 四色图主键

RuoYi-Vue-master/RuoYi-Vue-master/doubleDefense/src/main/java/com/ruoyi/doubledefense/service/impl/HazardServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ruoyi.common.constant.DeletedEnum;
 import com.ruoyi.common.core.domain.entity.TbSysArea;
 import com.ruoyi.common.core.domain.entity.TbSysAreaUser;
+import com.ruoyi.common.utils.CodeUtils;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.doubledefense.domain.Hazard;
@@ -144,7 +145,7 @@ public class HazardServiceImpl implements IHazardService {
         Hazard hazard = new Hazard();
         BeanUtils.copyProperties(hazardDTO, hazard);
         hazard.setId(UUID.randomUUID().toString());
-        hazard.setHazardCode(System.currentTimeMillis() + "");
+        hazard.setHazardCode(CodeUtils.getHazardCode());
         hazard.setCreateDefault();
         return hazardMapper.insert(hazard);
     }

RuoYi-Vue-master/RuoYi-Vue-master/doubleDefense/src/main/java/com/ruoyi/doubledefense/service/impl/RiskEventServiceImpl.java

@@ -5,10 +5,13 @@ import java.util.List;
 import java.util.UUID;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.ruoyi.common.constant.DeletedEnum;
 import com.ruoyi.doubledefense.domain.Hazard;
 import com.ruoyi.doubledefense.dto.RiskEventDTO;
 import com.ruoyi.doubledefense.dto.res.RiskEventResultDTO;
+import com.ruoyi.doubledefense.dtoGov.RiskEventDTOGov;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -19,19 +22,35 @@ import org.springframework.util.CollectionUtils;
 
 /**
  * 风险事件Service业务层处理
- * 
+ *
  * @author ruoyi
  * @date 2023-08-03
  */
 @Service
-public class RiskEventServiceImpl implements IRiskEventService 
+public class RiskEventServiceImpl implements IRiskEventService
 {
     @Autowired
     private RiskEventMapper riskEventMapper;
 
     /**
+     * 重预防汇聚计算节点
      * 查询风险事件
-     * 
+     *
+     * @param riskEvent
+     * @return
+     */
+    @Override
+    public PageInfo<RiskEventDTOGov> govSelectRiskEventList(RiskEventDTOGov riskEvent) {
+        PageHelper.startPage(riskEvent.getPageNo(),riskEvent.getPageSize());
+        List<RiskEventDTOGov> riskEventDTOGovList = riskEventMapper.govSelectRiskEventList(riskEvent);
+
+        PageInfo<RiskEventDTOGov> pageInfo = new PageInfo<>(riskEventDTOGovList);
+        return pageInfo;
+    }
+
+    /**
+     * 查询风险事件
+     *
      * @param id 风险事件主键
      * @return 风险事件
      */
@@ -49,7 +68,7 @@ public class RiskEventServiceImpl implements IRiskEventService
 
     /**
      * 查询风险事件列表
-     * 
+     *
      * @param riskEventDTO 风险事件
      * @return 风险事件
      */
@@ -61,7 +80,7 @@ public class RiskEventServiceImpl implements IRiskEventService
 
     /**
      * 新增风险事件
-     * 
+     *
      * @param riskEventDTO 风险事件
      * @return 结果
      */
@@ -77,7 +96,7 @@ public class RiskEventServiceImpl implements IRiskEventService
 
     /**
      * 修改风险事件
-     * 
+     *
      * @param riskEventDTO 风险事件
      * @return 结果
      */
@@ -92,7 +111,7 @@ public class RiskEventServiceImpl implements IRiskEventService
 
     /**
      * 批量删除风险事件
-     * 
+     *
      * @param ids 需要删除的风险事件主键
      * @return 结果
      */

RuoYi-Vue-master/RuoYi-Vue-master/doubleDefense/src/main/java/com/ruoyi/doubledefense/service/impl/RiskMeasureServiceImpl.java

@@ -5,10 +5,13 @@ import java.util.List;
 import java.util.UUID;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.ruoyi.common.constant.DeletedEnum;
 import com.ruoyi.doubledefense.domain.RiskEvent;
 import com.ruoyi.doubledefense.dto.RiskMeasureDTO;
 import com.ruoyi.doubledefense.dto.res.RiskMeasureResultDTO;
+import com.ruoyi.doubledefense.dtoGov.RiskMeasureDTOGov;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -19,29 +22,43 @@ import org.springframework.util.CollectionUtils;
 
 /**
  * 风险管控措施Service业务层处理
- * 
+ *
  * @author ruoyi
  * @date 2023-08-03
  */
 @Service
-public class RiskMeasureServiceImpl implements IRiskMeasureService 
-{
+public class RiskMeasureServiceImpl implements IRiskMeasureService {
     @Autowired
     private RiskMeasureMapper riskMeasureMapper;
 
+
+    /**
+     * 管控措施
+     * 重预防汇聚计算节点
+     *
+     * @param riskMeasureDTOGov
+     * @return
+     */
+    @Override
+    public PageInfo<RiskMeasureDTOGov> govSelectRiskMeasureList(RiskMeasureDTOGov riskMeasureDTOGov) {
+        PageHelper.startPage(riskMeasureDTOGov.getPageNo(), riskMeasureDTOGov.getPageSize());
+        List<RiskMeasureDTOGov> riskMeasureDTOGovList = riskMeasureMapper.govSelectRiskMeasureList(riskMeasureDTOGov);
+        PageInfo<RiskMeasureDTOGov> riskMeasureDTOGovPageInfo = new PageInfo<>(riskMeasureDTOGovList);
+        return riskMeasureDTOGovPageInfo;
+    }
+
     /**
      * 查询风险管控措施
-     * 
+     *
      * @param id 风险管控措施主键
      * @return 风险管控措施
      */
     @Override
-    public RiskMeasureResultDTO selectRiskMeasureById(String id)
-    {
+    public RiskMeasureResultDTO selectRiskMeasureById(String id) {
         RiskMeasureDTO riskMeasureDTO = new RiskMeasureDTO();
         riskMeasureDTO.setId(id);
         List<RiskMeasureResultDTO> riskMeasureResultDTOS = selectRiskMeasureList(riskMeasureDTO);
-        if(CollectionUtils.isEmpty(riskMeasureResultDTOS)){
+        if (CollectionUtils.isEmpty(riskMeasureResultDTOS)) {
             return null;
         }
         return riskMeasureResultDTOS.get(0);
@@ -49,27 +66,25 @@ public class RiskMeasureServiceImpl implements IRiskMeasureService
 
     /**
      * 查询风险管控措施列表
-     * 
+     *
      * @param riskMeasure 风险管控措施
      * @return 风险管控措施
      */
     @Override
-    public List<RiskMeasureResultDTO> selectRiskMeasureList(RiskMeasureDTO riskMeasure)
-    {
+    public List<RiskMeasureResultDTO> selectRiskMeasureList(RiskMeasureDTO riskMeasure) {
         return riskMeasureMapper.selectRiskMeasureList(riskMeasure);
     }
 
     /**
      * 新增风险管控措施
-     * 
+     *
      * @param riskMeasureDTO 风险管控措施
      * @return 结果
      */
     @Override
-    public int insertRiskMeasure(RiskMeasureDTO riskMeasureDTO)
-    {
+    public int insertRiskMeasure(RiskMeasureDTO riskMeasureDTO) {
         RiskMeasure riskMeasure = new RiskMeasure();
-        BeanUtils.copyProperties(riskMeasureDTO,riskMeasure);
+        BeanUtils.copyProperties(riskMeasureDTO, riskMeasure);
         riskMeasure.setId(UUID.randomUUID().toString());
         riskMeasure.setCreateDefault();
         return riskMeasureMapper.insert(riskMeasure);
@@ -77,34 +92,32 @@ public class RiskMeasureServiceImpl implements IRiskMeasureService
 
     /**
      * 修改风险管控措施
-     * 
+     *
      * @param riskMeasureDTO 风险管控措施
      * @return 结果
      */
     @Override
-    public int updateRiskMeasure(RiskMeasureDTO riskMeasureDTO)
-    {
+    public int updateRiskMeasure(RiskMeasureDTO riskMeasureDTO) {
         RiskMeasure riskMeasure = new RiskMeasure();
-        BeanUtils.copyProperties(riskMeasureDTO,riskMeasure);
+        BeanUtils.copyProperties(riskMeasureDTO, riskMeasure);
         riskMeasure.setUpdateDefault();
         return riskMeasureMapper.updateById(riskMeasure);
     }
 
     /**
      * 批量删除风险管控措施
-     * 
+     *
      * @param ids 需要删除的风险管控措施主键
      * @return 结果
      */
     @Override
-    public int deleteRiskMeasureByIds(String[] ids)
-    {
+    public int deleteRiskMeasureByIds(String[] ids) {
         RiskMeasure riskMeasure = new RiskMeasure();
         riskMeasure.setUpdateDefault();
         riskMeasure.setIsDel(DeletedEnum.INVALID.getValue());
         QueryWrapper<RiskMeasure> queryWrapper = new QueryWrapper<>();
-        queryWrapper.in("id",ids);
-        return riskMeasureMapper.update(riskMeasure,queryWrapper);
+        queryWrapper.in("id", ids);
+        return riskMeasureMapper.update(riskMeasure, queryWrapper);
     }
 
 }

RuoYi-Vue-master/RuoYi-Vue-master/doubleDefense/src/main/java/com/ruoyi/doubledefense/service/impl/RiskUnitServiceImpl.java

@@ -1,51 +1,65 @@
 package com.ruoyi.doubledefense.service.impl;
 
-import java.sql.Wrapper;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.ruoyi.common.constant.DeletedEnum;
 import com.ruoyi.common.utils.uuid.UUID;
-import com.ruoyi.doubledefense.domain.Hazard;
-import com.ruoyi.doubledefense.domain.RiskMeasure;
+import com.ruoyi.doubledefense.domain.RiskUnit;
 import com.ruoyi.doubledefense.dto.RiskUnitDTO;
 import com.ruoyi.doubledefense.dto.res.RiskUnitResultDTO;
+import com.ruoyi.doubledefense.dtoGov.RiskUnitDTOGov;
+import com.ruoyi.doubledefense.mapper.RiskUnitMapper;
+import com.ruoyi.doubledefense.service.IRiskUnitService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.ruoyi.doubledefense.mapper.RiskUnitMapper;
-import com.ruoyi.doubledefense.domain.RiskUnit;
-import com.ruoyi.doubledefense.service.IRiskUnitService;
 import org.springframework.util.CollectionUtils;
 
+import java.util.List;
+
 /**
  * 风险分析单元Service业务层处理
- * 
+ *
  * @author ruoyi
  * @date 2023-08-03
  */
 @Service
-public class RiskUnitServiceImpl implements IRiskUnitService 
-{
+public class RiskUnitServiceImpl implements IRiskUnitService {
     @Autowired
     private RiskUnitMapper riskUnitMapper;
 
+
+    /**
+     * 重预防汇聚计算节点
+     * 查询风险分析单元
+     *
+     * @param riskUnit
+     * @return
+     */
+    @Override
+    public PageInfo<RiskUnitDTOGov> govSelectRiskUnitList(RiskUnitDTOGov riskUnit) {
+        PageHelper.startPage(riskUnit.getPageNo(), riskUnit.getPageSize());
+
+        List<RiskUnitDTOGov> riskUnitDTOGovList = riskUnitMapper.govSelectRiskUnitList(riskUnit);
+
+        PageInfo<RiskUnitDTOGov> pageInfo = new PageInfo<>(riskUnitDTOGovList);
+
+        return pageInfo;
+    }
+
     /**
      * 查询风险分析单元
-     * 
+     *
      * @param id 风险分析单元主键
      * @return 风险分析单元
      */
     @Override
-    public RiskUnitResultDTO selectRiskUnitById(String id)
-    {
+    public RiskUnitResultDTO selectRiskUnitById(String id) {
         RiskUnitDTO riskUnitDTO = new RiskUnitDTO();
         riskUnitDTO.setId(id);
         List<RiskUnitResultDTO> riskUnitResultDTOS = riskUnitMapper.selectRiskUnitList(riskUnitDTO);
-        if(CollectionUtils.isEmpty(riskUnitResultDTOS)){
+        if (CollectionUtils.isEmpty(riskUnitResultDTOS)) {
             return null;
         }
         return riskUnitResultDTOS.get(0);
@@ -53,27 +67,25 @@ public class RiskUnitServiceImpl implements IRiskUnitService
 
     /**
      * 查询风险分析单元列表
-     * 
+     *
      * @param riskUnitDTO 风险分析单元
      * @return 风险分析单元
      */
     @Override
-    public List<RiskUnitResultDTO> selectRiskUnitList(RiskUnitDTO riskUnitDTO)
-    {
+    public List<RiskUnitResultDTO> selectRiskUnitList(RiskUnitDTO riskUnitDTO) {
         return riskUnitMapper.selectRiskUnitList(riskUnitDTO);
     }
 
     /**
      * 新增风险分析单元
-     * 
+     *
      * @param riskUnitDTO 风险分析单元
      * @return 结果
      */
     @Override
-    public int insertRiskUnit(RiskUnitDTO riskUnitDTO)
-    {
+    public int insertRiskUnit(RiskUnitDTO riskUnitDTO) {
         RiskUnit riskUnit = new RiskUnit();
-        BeanUtils.copyProperties(riskUnitDTO,riskUnit);
+        BeanUtils.copyProperties(riskUnitDTO, riskUnit);
         riskUnit.setId(UUID.randomUUID().toString());
         riskUnit.setCreateDefault();
         return riskUnitMapper.insert(riskUnit);
@@ -81,34 +93,32 @@ public class RiskUnitServiceImpl implements IRiskUnitService
 
     /**
      * 修改风险分析单元
-     * 
+     *
      * @param riskUnitDTO 风险分析单元
      * @return 结果
      */
     @Override
-    public int updateRiskUnit(RiskUnitDTO riskUnitDTO)
-    {
+    public int updateRiskUnit(RiskUnitDTO riskUnitDTO) {
         RiskUnit riskUnit = new RiskUnit();
-        BeanUtils.copyProperties(riskUnitDTO,riskUnit);
+        BeanUtils.copyProperties(riskUnitDTO, riskUnit);
         riskUnit.setUpdateDefault();
         return riskUnitMapper.updateById(riskUnit);
     }
 
     /**
      * 批量删除风险分析单元
-     * 
+     *
      * @param ids 需要删除的风险分析单元主键
      * @return 结果
      */
     @Override
-    public int deleteRiskUnitByIds(String[] ids)
-    {
+    public int deleteRiskUnitByIds(String[] ids) {
         RiskUnit riskUnit = new RiskUnit();
         riskUnit.setUpdateDefault();
         riskUnit.setIsDel(DeletedEnum.INVALID.getValue());
         QueryWrapper<RiskUnit> queryWrapper = new QueryWrapper<>();
-        queryWrapper.in("id",ids);
-        return riskUnitMapper.update(riskUnit,queryWrapper);
+        queryWrapper.in("id", ids);
+        return riskUnitMapper.update(riskUnit, queryWrapper);
     }
 
 

RuoYi-Vue-master/RuoYi-Vue-master/doubleDefense/src/main/resources/mapper/doubledefense/CheckTaskInventoryRecordMapper.xml

@@ -9,8 +9,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="checkTaskId"    column="check_task_id"    />
         <!--
         <result property="checkTaskInventoryId"    column="check_task_inventory_id"/>
-        -->
         <result property="checkStatus"    column="check_status"    />
+        -->
         <result property="remarkInfo"    column="remark_info"    />
         <result property="isDel"    column="is_del"    />
         <result property="createDate"    column="create_date"    />
@@ -124,12 +124,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             tcti.end_date,
             tcti.status,
             tcti.remark_info,
+            tcti.check_user_id,
+            tcti.check_time,
+
             tcti.is_del,
             tcti.create_date,
             tcti.create_user_id,
             tcti.update_date,
             tcti.update_user_id,
-            tcti.company_code
+            tcti.company_code,
+            c_user.nick_name as checkUserNickName
         FROM tb_check_task_inventory_record tcti
         INNER JOIN tb_check_task tct on tct.id = tcti.check_task_id AND tct.is_del =0
         INNER JOIN tb_risk_measure trm on trm.id = tct.risk_measure_id AND trm.is_del =0
@@ -137,6 +141,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         INNER join tb_risk_unit tru on tru.id = tre.risk_unit_id AND tru.is_del =0
         INNER join tb_hazard th ON th.id = tru.hazard_id AND th.is_del =0
         INNER join tb_sys_area tsa on tsa.id = th.area_id AND tsa.is_del =0
+        LEFT JOIN tb_app_login app_c_user ON app_c_user.id = tcti.check_user_id
+        LEFT JOIN sys_user c_user ON c_user.user_id = app_c_user.user_id
         where tcti.is_del = 0
         <if test="checkTaskId != null  and checkTaskId != ''">
             and tcti.check_task_id = #{checkTaskId}
@@ -178,12 +184,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="startDateLt != null ">
             and tcti.start_date <![CDATA[<=]]> #{startDateLt}
         </if>
+
         <if test="endDateGt != null ">
             and tcti.end_date >= #{endDateGt}
         </if>
         <if test="endDateLt != null ">
             and tcti.end_date <![CDATA[<=]]> #{endDateLt}
         </if>
+
         <if test="areaId != null  and areaId != ''">
             AND tsa.id = #{areaId}
         </if>
@@ -291,6 +299,71 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         GROUP BY th.id
     </select>
 
+    <select id="govSelectCheckTaskInventoryRecordList" parameterType="com.ruoyi.doubledefense.dtoGov.CheckTaskInventoryRecordDTOGov" resultType="com.ruoyi.doubledefense.dtoGov.CheckTaskInventoryRecordDTOGov">
+        SELECT
+            <!--
+            trm.id 管控措施ID,
+            tct.troubleshoot_content 隐患排查内容,
+            tct.check_cycle 巡检周期,
+            tct.check_cycle_unit 巡检周期单位,
+            CASE
+                WHEN danger.check_task_inventory_record_id IS NULL THEN (
+                                                                            CASE tcti.status
+                                                                            WHEN 1 THEN '0正常'
+                                                                            WHEN 2 THEN '2未排查'
+                                                                            ELSE '3其他'
+                                                                            END
+                                                                        )
+                ELSE '1存在隐患'
+            END AS `status`,
+
+            INNER JOIN tb_risk_measure trm on trm.id = tct.risk_measure_id AND trm.is_del =0
+            INNER join tb_risk_event tre on tre.id = trm.risk_event_id AND tre.is_del =0
+            INNER join tb_risk_unit tru on tru.id = tre.risk_unit_id AND tru.is_del =0
+            INNER join tb_hazard th ON th.id = tru.hazard_id AND th.is_del =0
+            INNER join tb_sys_area tsa on tsa.id = th.area_id AND tsa.is_del =0
+
+            -->
+            tcti.id,
+            tct.id check_task_id,
+            tcti.check_time,
+            CASE
+                WHEN danger.check_task_inventory_record_id IS NULL THEN (
+                                                                            CASE tcti.status
+                                                                            WHEN 1 THEN 0
+                                                                            WHEN 2 THEN 2
+                                                                            ELSE 3
+                                                                            END
+                                                                        )
+                ELSE 1
+            END AS `status`,
+            check_user.nick_name,
+            IFNULL(c_user.phonenumber, '13888261766') createByMobile,
+            IFNULL(u_user.phonenumber, '13888261766') updateByMobile,
+            tcti.is_del,
+            tcti.create_date,
+            IFNULL(c_user.nick_name, '管理员') AS createBy,
+            tcti.update_date,
+            IFNULL(u_user.nick_name, '管理员') AS updateBy,
+            tcti.company_code AS companyCode
+        FROM tb_check_task_inventory_record tcti
+        INNER JOIN tb_check_task tct ON tct.id = tcti.check_task_id AND tct.is_del =0
+        LEFT JOIN sys_user c_user ON c_user.user_id = tct.create_user_id
+        LEFT JOIN sys_user u_user ON u_user.user_id = tcti.update_user_id
+        LEFT JOIN tb_app_login app_check_user ON app_check_user.id = tcti.check_user_id
+        LEFT JOIN sys_user check_user ON check_user.user_id = app_check_user.user_id
+        LEFT JOIN tb_danger danger ON danger.check_task_inventory_record_id = tcti.id
+        WHERE tcti.is_del = 0
+        AND tcti.end_date <![CDATA[ < ]]> DATE_ADD(NOW(), INTERVAL -1 HOUR)
+        <if test="startUpdateDate != null">
+            and tcti.update_date >= #{startUpdateDate}
+        </if>
+        <if test="endUpdateDate != null">
+            and tcti.update_date <![CDATA[<=]]> #{endUpdateDate}
+        </if>
+        GROUP BY tcti.id
+    </select>
+
 
     <insert id="insertCheckTaskInventoryRecord" parameterType="CheckTaskInventoryRecord">
         insert into tb_check_task_inventory_record

RuoYi-Vue-master/RuoYi-Vue-master/doubleDefense/src/main/resources/mapper/doubledefense/CheckTaskMapper.xml

@@ -110,4 +110,41 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by tct.create_date desc
     </select>
 
+    <select id="govSelectCheckTaskList" parameterType="com.ruoyi.doubledefense.dtoGov.CheckTaskDTOGov" resultType="com.ruoyi.doubledefense.dtoGov.CheckTaskDTOGov">
+        SELECT
+           t1.id,
+           t1.risk_measure_id,
+           t1.troubleshoot_content,
+           t1.check_cycle,
+           t1.check_cycle_unit,
+
+           t1.is_del,
+
+           t1.create_date,
+           IFNULL(c_user.nick_name, '管理员') AS createBy,
+
+           t1.update_date,
+           IFNULL(u_user.nick_name, '管理员') AS updateBy,
+           t1.company_code AS companyCode
+        FROM tb_check_task t1
+
+        LEFT JOIN sys_user c_user ON c_user.user_id = t1.create_user_id
+
+        LEFT JOIN sys_user u_user ON u_user.user_id = t1.update_user_id
+
+        WHERE t1.is_del = 0
+        <!--
+        巡查方式：1-单位周期N次；2-时间段内1次；
+        金同步周期同步任务
+        -->
+        AND t1.check_type_count = 1
+        <if test="startUpdateDate != null">
+            and t1.update_date >= #{startUpdateDate}
+        </if>
+        <if test="endUpdateDate != null">
+            and t1.update_date <![CDATA[<=]]> #{endUpdateDate}
+        </if>
+        GROUP BY t1.id
+        ORDER BY t1.update_date
+    </select>
 </mapper>

RuoYi-Vue-master/RuoYi-Vue-master/doubleDefense/src/main/resources/mapper/doubledefense/DangerMapper.xml

@@ -169,4 +169,76 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         INNER JOIN tb_danger_manage t2 ON t2.danger_id = t1.id
         WHERE t1.is_del = 0
     </select>
+
+    <!--
+    重预防汇聚计算节点
+    查询隐患列表
+    -->
+    <select id="govSelectDangerList" parameterType="com.ruoyi.doubledefense.dtoGov.DangerDTOGov" resultType="com.ruoyi.doubledefense.dtoGov.DangerDTOGov">
+        SELECT
+          hazard.hazard_code,
+          t1.risk_measure_id,
+          t1.check_task_inventory_record_id,
+
+          t1.id,
+          t1.danger_name,
+          t1.danger_level,
+          t1.regist_time,
+          c_user.nick_name as registRant,
+          t1.danger_src,
+          t1.danger_manage_type,
+          t1.hazard_danger_type,
+          t1.danger_desc,
+            <!-- t1. 原因分析, -->
+          risk_measure.risk_measure_desc,
+          t2.cost,
+          m_user.nick_name as liablePerson,
+          t2.danger_manage_deaddline,
+          check_user.nick_name as checkAcceptPerson,
+          t2.check_accept_time,
+          t2.check_accept_comment,
+          <!--
+            danger_status 隐患状态：10待审核，20认领中，30整改中，40待验收，50已验收，60取消
+            隐患状态（0-整改中：1-待验收：9-已验收）
+          -->
+         CASE t1.danger_status
+           WHEN 30 THEN 0
+           WHEN 40 THEN 1
+           WHEN 50 THEN 9
+           END
+           AS dangerState,
+
+         t1.is_del,
+         t1.create_date,
+         IFNULL(c_user.nick_name, '管理员') AS createBy,
+         t1.update_date,
+         IFNULL(u_user.nick_name, '管理员') AS updateBy,
+         t1.company_code AS companyCode
+       FROM tb_danger t1
+       INNER JOIN tb_danger_manage t2 ON t2.danger_id = t1.id
+
+       LEFT JOIN tb_hazard hazard ON hazard.id = t1.hazard_id
+
+       LEFT JOIN tb_risk_measure risk_measure ON risk_measure.id = t1.risk_measure_id
+
+       INNER JOIN sys_user m_user ON m_user.user_id = t2.manage_user_id
+
+       LEFT JOIN sys_user check_user ON check_user.user_id = t2.check_user_id
+
+       LEFT JOIN tb_risk_measure risk_m ON risk_m.id = t1.risk_measure_id
+
+       INNER JOIN sys_user c_user ON c_user.user_id = t1.create_user_id
+
+       LEFT JOIN sys_user u_user ON u_user.user_id = t1.update_user_id
+
+       WHERE t1.is_del = 0
+       AND t1.danger_status IN (30,40,50)
+        <if test="startUpdateDate != null">
+            and t1.update_date >= #{startUpdateDate}
+        </if>
+        <if test="endUpdateDate != null">
+            and t1.update_date <![CDATA[<=]]> #{endUpdateDate}
+        </if>
+       ORDER BY t1.create_date, t1.update_date
+   </select>
 </mapper>

RuoYi-Vue-master/RuoYi-Vue-master/doubleDefense/src/main/resources/mapper/doubledefense/FourColorDiagramMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.doubledefense.mapper.FourColorDiagramMapper">
-    
+
     <resultMap type="FourColorDiagram" id="FourColorDiagramResult">
         <result property="id"    column="id"    />
         <result property="colorCode"    column="color_code"    />
@@ -24,18 +24,41 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectFourColorDiagramList" parameterType="FourColorDiagram" resultMap="FourColorDiagramResult">
         <include refid="selectFourColorDiagramVo"/>
-        <where>  
+        <where>
             <if test="colorCode != null  and colorCode != ''"> and color_code = #{colorCode}</if>
             <if test="colorName != null  and colorName != ''"> and color_name like concat('%', #{colorName}, '%')</if>
             <if test="remarkInfo != null  and remarkInfo != ''"> and remark_info like concat('%', #{remarkInfo}, '%')</if>
         </where>
     </select>
-    
+
     <select id="selectFourColorDiagramById" parameterType="String" resultMap="FourColorDiagramResult">
         <include refid="selectFourColorDiagramVo"/>
         where id = #{id}
     </select>
-        
+    <select id="govSelectFourColorDiagramList" parameterType="com.ruoyi.doubledefense.dtoGov.FourColorDiagramDTOGov" resultType="com.ruoyi.doubledefense.dtoGov.FourColorDiagramDTOGov">
+        SELECT
+          t1.id,
+          t1.color_img,
+          t1.is_del,
+          t1.create_date,
+          IFNULL(c_user.nick_name, '管理员') AS createBy,
+          t1.update_date,
+          IFNULL(u_user.nick_name, '管理员') AS updateBy,
+          t1.company_code AS companyCode
+        FROM tb_four_color_diagram t1
+        LEFT JOIN sys_user c_user ON c_user.user_id = t1.create_user_id
+        LEFT JOIN sys_user u_user ON u_user.user_id = t1.update_user_id
+        WHERE t1.is_del = 0
+        <if test="startUpdateDate != null">
+            and t1.update_date >= #{startUpdateDate}
+        </if>
+        <if test="endUpdateDate != null">
+            and t1.update_date <![CDATA[<=]]> #{endUpdateDate}
+        </if>
+        GROUP BY t1.id
+        ORDER BY t1.create_date, t1.update_date
+    </select>
+
     <insert id="insertFourColorDiagram" parameterType="FourColorDiagram">
         insert into tb_four_color_diagram
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -88,9 +111,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteFourColorDiagramByIds" parameterType="String">
-        delete from tb_four_color_diagram where id in 
+        delete from tb_four_color_diagram where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
     </delete>
-</mapper>
+</mapper>

RuoYi-Vue-master/RuoYi-Vue-master/doubleDefense/src/main/resources/mapper/doubledefense/RiskEventMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.doubledefense.mapper.RiskEventMapper">
-    
+
     <resultMap type="RiskEvent" id="RiskEventResult">
         <result property="id"    column="id"    />
         <result property="riskUnitId"    column="risk_unit_id"    />
@@ -35,4 +35,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by re.create_date desc
     </select>
 
-</mapper>
+
+    <select id="govSelectRiskEventList" parameterType="com.ruoyi.doubledefense.dtoGov.RiskEventDTOGov" resultType="com.ruoyi.doubledefense.dtoGov.RiskEventDTOGov">
+        SELECT
+           t1.id,
+           t1.risk_unit_id,
+           t1.risk_event_name,
+
+           t1.is_del,
+
+           t1.create_date,
+           IFNULL(c_user.nick_name, '管理员') AS createBy,
+
+           t1.update_date,
+           IFNULL(u_user.nick_name, '管理员') AS updateBy,
+           t1.company_code AS companyCode
+        FROM tb_risk_event t1
+        LEFT JOIN sys_user c_user ON c_user.user_id = t1.create_user_id
+        LEFT JOIN sys_user u_user ON u_user.user_id = t1.update_user_id
+        WHERE t1.is_del = 0
+        <if test="startUpdateDate != null">
+            and t1.update_date >= #{startUpdateDate}
+        </if>
+        <if test="endUpdateDate != null">
+            and t1.update_date <![CDATA[<=]]> #{endUpdateDate}
+        </if>
+        GROUP BY t1.id
+        ORDER BY t1.update_date
+    </select>
+
+</mapper>

RuoYi-Vue-master/RuoYi-Vue-master/doubleDefense/src/main/resources/mapper/doubledefense/RiskMeasureMapper.xml

@@ -44,4 +44,39 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by trm.create_date desc
     </select>
 
+    <select id="govSelectRiskMeasureList" parameterType="com.ruoyi.doubledefense.dtoGov.RiskMeasureDTOGov" resultType="com.ruoyi.doubledefense.dtoGov.RiskMeasureDTOGov">
+        SELECT
+           t1.id,
+           t1.risk_event_id,
+           t1.data_src,
+           t1.risk_measure_desc,
+           t1.classify1,
+           t1.classify2,
+           t1.troubleshoot_content,
+
+           t1.is_del,
+
+           t1.create_date,
+           IFNULL(c_user.nick_name, '管理员') AS createBy,
+
+           t1.update_date,
+           IFNULL(u_user.nick_name, '管理员') AS updateBy,
+           t1.company_code AS companyCode
+        FROM tb_risk_measure t1
+
+        LEFT JOIN sys_user c_user ON c_user.user_id = t1.create_user_id
+
+        LEFT JOIN sys_user u_user ON u_user.user_id = t1.update_user_id
+
+        WHERE t1.is_del = 0
+        <if test="startUpdateDate != null">
+            and t1.update_date >= #{startUpdateDate}
+        </if>
+        <if test="endUpdateDate != null">
+            and t1.update_date <![CDATA[<=]]> #{endUpdateDate}
+        </if>
+        GROUP BY t1.id
+        ORDER BY t1.update_date
+    </select>
+
 </mapper>

RuoYi-Vue-master/RuoYi-Vue-master/doubleDefense/src/main/resources/mapper/doubledefense/RiskUnitMapper.xml

@@ -43,19 +43,47 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by ru.create_date desc
     </select>
 
-    <!--
-    <select id="selectRiskUnitByAreaIdAndPostId" resultType="com.ruoyi.doubledefense.dto.res.RiskUnitListForApp">
-        select tru.id,tru.risk_unit_name ,count(trm.id) checkTaskCount
-        from tb_hazard th
-         left join tb_sys_area tsa on th.area_id = tsa.id
-         left join tb_risk_unit tru on th.id = tru.hazard_id
-         left join tb_risk_event tre on tre.risk_unit_id = tru.id
-         left join tb_risk_measure trm on trm.risk_event_id = tre.id
-         left join tb_check_task tct on trm.id = tct.risk_measure_id
-         left join tb_check_task_inventory tcti on tcti.check_task_id = tct.id
-        where exists(select 1 from tb_check_task_post_relation tctpr  where tctpr.check_task_id = tct.id and tctpr.post_id=#{postId})
-          and th.is_del=0 and tru.is_del=0 and tre.is_del=0 and trm.is_del = 0 and tct.is_del = 0 and th.area_id = #{areaId}
-        group by trm.id
+
+
+    <select id="govSelectRiskUnitList" parameterType="com.ruoyi.doubledefense.dtoGov.RiskUnitDTOGov" resultType="com.ruoyi.doubledefense.dtoGov.RiskUnitDTOGov">
+        SELECT
+            <!--
+            h.hazard_name 管控对象,
+            ru.hazard_id,
+            ru.remark_info 分析单元备注,
+            t3.area_name 区域,
+            -->
+                h.hazard_code,
+
+                ru.id,
+                ru.risk_unit_name,
+                t4.post_name,
+                GROUP_CONCAT(t6.nick_name) AS hazardLiablePerson,
+
+                ru.is_del,
+
+                ru.create_date,
+                IFNULL(c_user.nick_name, '管理员') AS createBy,
+
+                ru.update_date,
+                IFNULL(u_user.nick_name, '管理员') AS updateBy,
+                ru.company_code as companyCode
+            FROM tb_risk_unit ru
+            INNER JOIN tb_hazard h ON ru.hazard_id = h.id AND h.is_del = 0
+            INNER JOIN tb_sys_area t3 ON h.area_id =  t3.id
+            INNER JOIN sys_post t4 ON t4.post_id = t3.post_id
+            INNER JOIN sys_user_post t5 ON t5.post_id = t4.post_id
+            INNER JOIN sys_user t6 ON t6.user_id = t5.user_id
+            LEFT JOIN sys_user c_user ON c_user.user_id = ru.create_user_id
+            LEFT JOIN sys_user u_user ON u_user.user_id = ru.update_user_id
+            WHERE ru.is_del = 0
+            <if test="startUpdateDate != null">
+                and ru.update_date >= #{startUpdateDate}
+            </if>
+            <if test="endUpdateDate != null">
+                and ru.update_date <![CDATA[<=]]> #{endUpdateDate}
+            </if>
+            GROUP BY ru.id
+            ORDER BY ru.update_date
     </select>
-    -->
 </mapper>