1、PC巡检打卡列表

2、PC菜单权限-风险分级管控
3、政府数数字化对接优化

RuoYi-Vue-master/RuoYi-Vue-master/doubleDefense/src/main/java/com/ruoyi/doubledefense/domain/CheckTaskInventory.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 org.apache.commons.lang3.builder.ToStringBuilder;
@@ -69,21 +70,25 @@ public class CheckTaskInventory 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;
 
     /**
@@ -99,9 +104,36 @@ public class CheckTaskInventory extends GnhzBaseEntity {
      * 岗位ID集合（排查措施关联的岗位）
      */
     @TableField(exist = false)
-    List<Long> postIdList;
+    private List<Long> postIdList;
 
 
+    /**
+     * 风险分析对象ID
+     */
+    @TableField(exist = false)
+    private String hazardId;
+    /**
+     * 管控措施ID
+     */
+    @TableField(exist = false)
+    private String riskMeasureId;
+
+    public String getHazardId() {
+        return hazardId;
+    }
+
+    public void setHazardId(String hazardId) {
+        this.hazardId = hazardId;
+    }
+
+    public String getRiskMeasureId() {
+        return riskMeasureId;
+    }
+
+    public void setRiskMeasureId(String riskMeasureId) {
+        this.riskMeasureId = riskMeasureId;
+    }
+
     public Long getCheckUserId() {
         return checkUserId;
     }

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

@@ -101,4 +101,15 @@ public class CheckTaskInventoryRecord extends GnhzBaseEntity {
     @TableField(exist = false)
     @JsonIgnore
     private Date endDateLt;
+
+    /**
+     * 风险分析对象ID
+     */
+    @TableField(exist = false)
+    private String hazardId;
+    /**
+     * 管控措施ID
+     */
+    @TableField(exist = false)
+    private String riskMeasureId;
 }

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

@@ -4,6 +4,7 @@ import java.io.Serializable;
 import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -23,67 +24,94 @@ import com.ruoyi.common.core.domain.BaseEntity;
  */
 @TableName("tb_danger")
 @Data
-public class Danger extends GnhzBaseEntity
-{
+public class Danger extends GnhzBaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /** 主键UUID */
+    /**
+     * 主键UUID
+     */
     @TableId(type = IdType.INPUT)
     private String id;
 
 
-    /** 隐患编号(后台自动生成) */
+    /**
+     * 隐患编号(后台自动生成)
+     */
     @ApiModelProperty("隐患编号(后台自动生成)")
     @Excel(name = "隐患编号")
     private String dangerNo;
 
 
-    /** 设备UUID */
+    /**
+     * 设备UUID
+     */
     @Excel(name = "设备UUID")
     private String deviceId;
 
-    /** 排查记录ID */
+    /**
+     * 排查记录ID
+     */
     @Excel(name = "排查记录ID")
     private String checkRecordId;
 
-    /** 隐患名称 */
+    /**
+     * 隐患名称
+     */
     @Excel(name = "隐患名称")
     private String dangerName;
 
-    /** 隐患描述 */
+    /**
+     * 隐患描述
+     */
     @Excel(name = "隐患描述")
     private String dangerDesc;
 
-    /** 隐患等级：0一般隐患，1重大隐患 */
+    /**
+     * 隐患等级：0一般隐患，1重大隐患
+     */
     @Excel(name = "隐患等级：0一般隐患，1重大隐患")
     private Long dangerLevel;
 
-    /** 登记时间 */
+    /**
+     * 登记时间
+     */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "登记时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date registTime;
 
-    /** 所属区域ID */
+    /**
+     * 所属区域ID
+     */
     @Excel(name = "所属区域ID")
     private Long areaId;
 
-    /** 隐患图片，多张以逗号分割 */
+    /**
+     * 隐患图片，多张以逗号分割
+     */
     @Excel(name = "隐患图片，多张以逗号分割")
     private String dangerImage;
 
-    /** 隐患来源：1日常排查，2综合排查，3专业性排查，4季节性排查，5重点时段及节假日前排查，6事故类比排查，7复产复工前排查，8外聘专家诊断式排查，9管控措施失效，10其它 */
+    /**
+     * 隐患来源：1日常排查，2综合排查，3专业性排查，4季节性排查，5重点时段及节假日前排查，6事故类比排查，7复产复工前排查，8外聘专家诊断式排查，9管控措施失效，10其它
+     */
     @Excel(name = "隐患来源：1日常排查，2综合排查，3专业性排查，4季节性排查，5重点时段及节假日前排查，6事故类比排查，7复产复工前排查，8外聘专家诊断式排查，9管控措施失效，10其它")
     private String dangerSrc;
 
-    /** 隐患类型：1安全，2工艺，3电气，4仪表，5消防，6总图，7设备，8其它 */
+    /**
+     * 隐患类型：1安全，2工艺，3电气，4仪表，5消防，6总图，7设备，8其它
+     */
     @Excel(name = "隐患类型：1安全，2工艺，3电气，4仪表，5消防，6总图，7设备，8其它")
     private String hazardDangerType;
 
-    /** 治理类型：0即查即改，1限期整改 */
+    /**
+     * 治理类型：0即查即改，1限期整改
+     */
     @Excel(name = "治理类型：0即查即改，1限期整改")
     private Long dangerManageType;
 
-    /** 隐患状态：隐患状态：10审核中，20认领中，30整改中，40待验收，50已验收，60取消 */
+    /**
+     * 隐患状态：隐患状态：10审核中，20认领中，30整改中，40待验收，50已验收，60取消
+     */
     @Excel(name = "隐患状态：隐患状态：10审核中，20认领中，30整改中，40待验收，50已验收，60取消", readConverterExp = "即=查即改")
     private Integer dangerStatus;
 
@@ -96,12 +124,22 @@ public class Danger extends GnhzBaseEntity
     @Excel(name = "驳回人用户名")
     private String rejectUserName;
 
-    /** 备注 */
+    /**
+     * 备注
+     */
     @Excel(name = "备注")
     private String remarkInfo;
-
-
-
-
-
+    /**
+     * 风险分析对象ID
+     */
+    private String hazardId;
+    /**
+     * 管控措施ID
+     */
+    private String riskMeasureId;
+
+    /**
+     * (选填->巡检上报时需要设置值)隐患排查记录ID
+     */
+    private String checkTaskInventoryRecordId;
 }

RuoYi-Vue-master/RuoYi-Vue-master/doubleDefense/src/main/java/com/ruoyi/doubledefense/dto/DangerDTO.java

@@ -180,4 +180,23 @@ public class DangerDTO extends GnhzBaseEntity
     @ApiModelProperty("筛选发现时间-结束时间")
     private Date registEndTime;
 
+    /**
+     * 风险分析对象ID
+     */
+    private String hazardId;
+    /**
+     * 风险分析对象名称
+     */
+    private String hazardName;
+    /**
+     * 管控措施ID
+     */
+    private String riskMeasureId;
+
+    /**
+     * (选填->巡检上报时需要设置值)隐患排查记录ID
+     */
+    private String checkTaskInventoryRecordId;
+
+
 }

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

@@ -22,6 +22,14 @@ import org.apache.ibatis.annotations.Param;
  */
 public interface CheckTaskInventoryRecordMapper extends BaseMapper<CheckTaskInventoryRecord> {
     /**
+     * 双重预防汇聚计算节点
+     * 查询巡检打卡记录
+     *
+     * @param checkTaskInventoryRecordDTOGov
+     * @return
+     */
+    List<CheckTaskInventoryRecordDTOGov> govSelectCheckTaskInventoryRecordList(CheckTaskInventoryRecordDTOGov checkTaskInventoryRecordDTOGov);
+    /**
      * 查询巡查记录
      *
      * @param id 巡查记录主键
@@ -126,12 +134,5 @@ 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

@@ -20,6 +20,14 @@ public interface CheckTaskMapper extends BaseMapper<CheckTask>
 {
 
     /**
+     * 双重预防汇聚计算节点
+     * 查询隐患排查要求
+     *
+     * @param checkTaskDTOGov
+     * @return
+     */
+    List<CheckTaskDTOGov> govSelectCheckTaskList(CheckTaskDTOGov checkTaskDTOGov);
+    /**
      * 查询隐患排查任务列表
      *
      * @param checkTask 隐患排查任务
@@ -27,12 +35,4 @@ public interface CheckTaskMapper extends BaseMapper<CheckTask>
      */
     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

@@ -21,7 +21,14 @@ import org.apache.ibatis.annotations.Param;
  * @date 2023-08-03
  */
 public interface DangerMapper extends BaseMapper<Danger> {
-
+    /**
+     * 双重预防汇聚计算节点
+     * 查询隐患列表
+     *
+     * @param dangerDTOGov
+     * @return
+     */
+    List<DangerDTOGov> govSelectDangerList(DangerDTOGov dangerDTOGov);
 
     /**
      * 查询隐患信息列表
@@ -53,12 +60,5 @@ 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

@@ -14,7 +14,7 @@ import com.ruoyi.doubledefense.dtoGov.FourColorDiagramDTOGov;
 public interface FourColorDiagramMapper {
     /**
      * 四色图
-     * 重预防汇聚计算节点
+     * 双重预防汇聚计算节点
      *
      * @param fourColorDiagramDTOGov
      * @return

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

@@ -16,7 +16,13 @@ import com.ruoyi.doubledefense.dtoGov.RiskEventDTOGov;
  * @date 2023-08-03
  */
 public interface RiskEventMapper extends BaseMapper<RiskEvent> {
-
+    /**
+     * 双重预防汇聚计算节点
+     * 查询风险事件
+     * @param riskEvent
+     * @return
+     */
+    List<RiskEventDTOGov> govSelectRiskEventList(RiskEventDTOGov riskEvent);
     /**
      * 查询风险事件列表
      *
@@ -25,12 +31,6 @@ public interface RiskEventMapper extends BaseMapper<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

@@ -18,6 +18,13 @@ import com.ruoyi.doubledefense.dtoGov.RiskMeasureDTOGov;
 public interface RiskMeasureMapper extends BaseMapper<RiskMeasure> {
 
     /**
+     * 管控措施
+     * 双重预防汇聚计算节点
+     * @param riskMeasureDTOGov
+     * @return
+     */
+    List<RiskMeasureDTOGov> govSelectRiskMeasureList(RiskMeasureDTOGov riskMeasureDTOGov);
+    /**
      * 查询风险管控措施列表
      *
      * @param riskMeasure 风险管控措施
@@ -25,12 +32,5 @@ 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

@@ -15,20 +15,23 @@ import com.ruoyi.doubledefense.dtoGov.RiskUnitDTOGov;
  * @author ruoyi
  * @date 2023-08-03
  */
-public interface RiskUnitMapper extends BaseMapper<RiskUnit>
-{
+public interface RiskUnitMapper extends BaseMapper<RiskUnit> {
+
     /**
-     * 查询分析单元列表
+     * 双重预防汇聚计算节点
+     * 查询风险分析单元
+     *
      * @param riskUnit
      * @return
      */
-    List<RiskUnitResultDTO> selectRiskUnitList(RiskUnitDTO riskUnit);
+    List<RiskUnitDTOGov> govSelectRiskUnitList(RiskUnitDTOGov riskUnit);
 
     /**
-     * 重预防汇聚计算节点
-     * 查询风险分析单元
+     * 查询分析单元列表
+     *
      * @param riskUnit
      * @return
      */
-    List<RiskUnitDTOGov> govSelectRiskUnitList(RiskUnitDTOGov riskUnit);
+    List<RiskUnitResultDTO> selectRiskUnitList(RiskUnitDTO riskUnit);
+
 }

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

@@ -20,7 +20,7 @@ import com.ruoyi.doubledefense.dtoGov.CheckTaskInventoryRecordDTOGov;
  */
 public interface ICheckTaskInventoryRecordService extends IService<CheckTaskInventoryRecord> {
     /**
-     * 重预防汇聚计算节点
+     * 双重预防汇聚计算节点
      * 查询巡检打卡记录
      * @param checkTaskInventoryRecordDTOGov
      * @return

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

@@ -16,7 +16,7 @@ import com.ruoyi.doubledefense.dtoGov.CheckTaskDTOGov;
  */
 public interface ICheckTaskService {
     /**
-     * 重预防汇聚计算节点
+     * 双重预防汇聚计算节点
      * 查询隐患排查要求
      *
      * @param checkTaskDTOGov

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

@@ -21,7 +21,7 @@ import org.springframework.transaction.annotation.Transactional;
  */
 public interface IDangerService {
     /**
-     * 重预防汇聚计算节点
+     * 双重预防汇聚计算节点
      * 查询隐患列表
      *
      * @param dangerDTOGov

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

@@ -16,7 +16,7 @@ public interface IFourColorDiagramService {
 
     /**
      * 四色图
-     * 重预防汇聚计算节点
+     * 双重预防汇聚计算节点
      *
      * @param fourColorDiagramDTOGov
      * @return

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

@@ -18,7 +18,7 @@ public interface IRiskEventService
 {
 
     /**
-     * 重预防汇聚计算节点
+     * 双重预防汇聚计算节点
      * 查询风险事件
      * @param riskEvent
      * @return

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

@@ -18,7 +18,7 @@ public interface IRiskMeasureService {
 
     /**
      * 管控措施
-     * 重预防汇聚计算节点
+     * 双重预防汇聚计算节点
      * @param riskMeasureDTOGov
      * @return
      */

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

@@ -17,7 +17,7 @@ import com.ruoyi.doubledefense.dtoGov.RiskUnitDTOGov;
 public interface IRiskUnitService
 {
     /**
-     * 重预防汇聚计算节点
+     * 双重预防汇聚计算节点
      * 查询风险分析单元
      * @param riskUnit
      * @return

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

@@ -30,7 +30,7 @@ public class CheckTaskInventoryRecordServiceImpl extends ServiceImpl<CheckTaskIn
     private CheckTaskInventoryRecordMapper checkTaskInventoryRecordMapper;
 
     /**
-     * 重预防汇聚计算节点
+     * 双重预防汇聚计算节点
      * 查询巡检打卡记录
      *
      * @param checkTaskInventoryRecordDTOGov

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

@@ -33,7 +33,7 @@ public class CheckTaskServiceImpl implements ICheckTaskService {
     private CheckTaskMapper checkTaskMapper;
 
     /**
-     * 重预防汇聚计算节点
+     * 双重预防汇聚计算节点
      * 查询隐患排查要求
      *
      * @param checkTaskDTOGov

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

@@ -77,7 +77,7 @@ public class DangerServiceImpl implements IDangerService {
     private TbSysAreaMapper tbSysAreaMapper;
 
     /**
-     * 重预防汇聚计算节点
+     * 双重预防汇聚计算节点
      * 查询隐患列表
      *
      * @param dangerDTOGov
@@ -85,7 +85,7 @@ public class DangerServiceImpl implements IDangerService {
      */
     @Override
     public PageInfo<DangerDTOGov> govSelectDangerList(DangerDTOGov dangerDTOGov) {
-        PageHelper.startPage(dangerDTOGov.getPageNo(),dangerDTOGov.getPageSize());
+        PageHelper.startPage(dangerDTOGov.getPageNo(), dangerDTOGov.getPageSize());
         List<DangerDTOGov> dangerDTOGovList = dangerMapper.govSelectDangerList(dangerDTOGov);
         PageInfo<DangerDTOGov> pageInfo = new PageInfo<>(dangerDTOGovList);
         return pageInfo;
@@ -182,15 +182,12 @@ public class DangerServiceImpl implements IDangerService {
      */
     @Override
     public List<DangerResultDTO> selectDangerList(DangerDTO danger) {
-        //TODO 待发布：开发环境时才生效，线上环境依旧显示全部数据
-        HttpServletRequest request = ServletUtils.getRequest();
-        String localAddr = request.getLocalAddr();
-        if (localAddr.startsWith("192.168.3.")) {
-            //需要查看的人：
-            //如果领导角色就查看全部
-            //上报人：创建人
-            //区域负责人
-            //整改负责人：审核完成以后才可以查看
+
+        //需要查看的人：
+        //如果领导角色就查看全部
+        //上报人：创建人
+        //区域负责人
+        //整改负责人：审核完成以后才可以查看
        /* LoginUser loginUser = null;
         try {
             loginUser = SecurityUtils.getLoginUser();
@@ -203,36 +200,36 @@ public class DangerServiceImpl implements IDangerService {
 //        1、上报人：创建人
 //        2、区域负责人
 //        3、整改负责人：审核完成以后才可以查看（待审核和取消的状态不让查看）
-            String requestToken = JWTUtil.getRequestToken();
+        String requestToken = JWTUtil.getRequestToken();
 
-            String appUserType = null;
-            try {
-                appUserType = JWTUtil.getAppUserType();
-            } catch (Exception e) {
+        String appUserType = null;
+        try {
+            appUserType = JWTUtil.getAppUserType();
+        } catch (Exception e) {
 
+        }
+        //承包商不让查看，直接返回空集合
+        if (appUserType != null && AppUserTypeEnum.CONTRACTOR.getValue() == Integer.parseInt(appUserType)) {
+            return new ArrayList<>();
+        }
+        // APP请求时
+        else if (StringUtils.isNotBlank(requestToken)) {
+            boolean leader = JWTUtil.isLeader();
+            String pcUserId = JWTUtil.getPCUserId();
+            //APP登录人员的岗位集合
+            List<Long> postIdList = JWTUtil.getPostIdList();
+            // 非领导角色不能查看全部，需要筛选
+            if (!leader) {
+                danger.setDataUserId(Long.parseLong(pcUserId));
+                danger.setPostIdList(postIdList);
             }
-            //承包商不让查看，直接返回空集合
-            if (appUserType != null && AppUserTypeEnum.CONTRACTOR.getValue() == Integer.parseInt(appUserType)) {
-                return new ArrayList<>();
-            }
-            // APP请求时
-            else if (StringUtils.isNotBlank(requestToken)) {
-                boolean leader = JWTUtil.isLeader();
-                String pcUserId = JWTUtil.getPCUserId();
-                //APP登录人员的岗位集合
-                List<Long> postIdList = JWTUtil.getPostIdList();
-                // 非领导角色不能查看全部，需要筛选
-                if (!leader) {
-                    danger.setDataUserId(Long.parseLong(pcUserId));
-                    danger.setPostIdList(postIdList);
-                }
-            }
-            //WEB请求
+        }
+        //WEB请求
 //        else if (loginUser != null) {
 //            Long userId = SecurityUtils.getUserId();
 //            String username = SecurityUtils.getUsername();
 //        }
-        }
+//        }
 
         return dangerMapper.selectDangerList(danger);
     }

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

@@ -26,7 +26,7 @@ public class FourColorDiagramServiceImpl implements IFourColorDiagramService {
 
     /**
      * 四色图
-     * 重预防汇聚计算节点
+     * 双重预防汇聚计算节点
      *
      * @param fourColorDiagramDTOGov
      * @return

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

@@ -33,7 +33,7 @@ public class RiskEventServiceImpl implements IRiskEventService
     private RiskEventMapper riskEventMapper;
 
     /**
-     * 重预防汇聚计算节点
+     * 双重预防汇聚计算节点
      * 查询风险事件
      *
      * @param riskEvent

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

@@ -34,7 +34,7 @@ public class RiskMeasureServiceImpl implements IRiskMeasureService {
 
     /**
      * 管控措施
-     * 重预防汇聚计算节点
+     * 双重预防汇聚计算节点
      *
      * @param riskMeasureDTOGov
      * @return

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

@@ -31,7 +31,7 @@ public class RiskUnitServiceImpl implements IRiskUnitService {
 
 
     /**
-     * 重预防汇聚计算节点
+     * 双重预防汇聚计算节点
      * 查询风险分析单元
      *
      * @param riskUnit

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

@@ -125,7 +125,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             tcti.start_date,
             tcti.end_date,
             tcti.status,
-            tsa.id as areaId
+            tsa.id as areaId,
+            th.id AS hazard_id,
+            trm.id AS risk_measure_id
         FROM tb_hazard th
         LEFT JOIN tb_sys_area tsa ON th.area_id = tsa.id AND tsa.is_del = 0
         LEFT JOIN tb_risk_unit tru ON th.id = tru.hazard_id AND tru.is_del = 0

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

@@ -93,7 +93,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             tcti.start_date,
             tcti.end_date,
             tcti.status,
-            tsa.id as areaId
+            tsa.id as areaId,
+            th.id AS hazard_id,
+            trm.id AS risk_measure_id
         FROM tb_hazard th
         LEFT JOIN tb_sys_area tsa ON th.area_id = tsa.id AND tsa.is_del = 0
         LEFT JOIN tb_risk_unit tru ON th.id = tru.hazard_id AND tru.is_del = 0

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

@@ -51,13 +51,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
             sd.dept_name ,
 
-            sum.nick_name as manageUserName
+            sum.nick_name as manageUserName,
+            th.hazard_name
         from tb_danger td
         left join sys_user su on td.create_user_id = su.user_id
         left join tb_danger_manage tdm on td.id = tdm.danger_id
         left join sys_dept sd on tdm.dept_id = sd.dept_id
         left join sys_user sum on tdm.manage_user_id = sum.user_id
         left join tb_sys_area tsa on tsa.id = td.area_id
+        LEFT JOIN tb_hazard th ON th.id = td.hazard_id
         where td.is_del = 0
         <if test="dangerName != null  and dangerName != ''"> and td.danger_name like concat('%', #{dangerName}, '%')</if>
         <if test="dangerDesc != null  and dangerDesc != ''"> and td.danger_desc like concat('%',  #{dangerDesc}, '%')</if>
@@ -171,7 +173,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <!--
-    重预防汇聚计算节点
+    双重预防汇聚计算节点
     查询隐患列表
     -->
     <select id="govSelectDangerList" parameterType="com.ruoyi.doubledefense.dtoGov.DangerDTOGov" resultType="com.ruoyi.doubledefense.dtoGov.DangerDTOGov">

RuoYi-Vue-master/RuoYi-Vue-master/ruoyi-admin/src/main/java/com/ruoyi/app/controller/doubleDefense/HazardForAppController.java

@@ -0,0 +1,54 @@
+package com.ruoyi.app.controller.doubleDefense;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.doubledefense.dto.HazardDTO;
+import com.ruoyi.doubledefense.dto.res.HazardResultDTO;
+import com.ruoyi.doubledefense.service.IHazardService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 风险分析对象Controller
+ *
+ * @author ruoyi
+ * @date 2023-08-03
+ */
+@Api(tags = "APP风险分析对象")
+@RestController
+@RequestMapping("/app/doubledefense/hazard")
+public class HazardForAppController extends BaseController {
+    @Autowired
+    private IHazardService hazardService;
+
+    /**
+     * APP查询风险分析对象列表
+     * 参数：Long areaId 区域ID
+     * 返回值：
+     * id：主键
+     * hazardName：名称
+     */
+    @ApiOperation("APP查询风险分析对象列表")
+    @GetMapping("/list")
+    public AjaxResult list(HazardDTO hazard) {
+        Long areaId = hazard.getAreaId();
+        if (areaId == null) {
+            return success(new ArrayList<>());
+        }
+        List<HazardResultDTO> list = hazardService.selectHazardList(hazard);
+        return success(list);
+    }
+}

RuoYi-Vue-master/RuoYi-Vue-master/ruoyi-admin/src/main/java/com/ruoyi/web/controller/doubleDefense/BasicSafetyCategoryController.java

@@ -38,6 +38,14 @@ public class BasicSafetyCategoryController extends BaseController
     @Autowired
     private IBasicSafetyCategoryService basicSafetyCategoryService;
 
+    @Anonymous
+    @ApiOperation("获取分类树")
+    @GetMapping(value = "getCategoryTree/{parentId}")
+    //TODO 20230920PreAuthorize("@ss.hasPermi('system:category:getCategoryTree')")
+    public AjaxResult getCategoryTree(@PathVariable("parentId") String parentId)
+    {
+        return success(basicSafetyCategoryService.getCategoryTree(parentId));
+    }
     /**
      * 查询【安全基础文档分类】列表
      */
@@ -78,11 +86,12 @@ public class BasicSafetyCategoryController extends BaseController
     /**
      * 编辑【安全基础文档分类】
      */
-//    //TODO 20230920PreAuthorize("@ss.hasPermi('system:category:add')")
+    //TODO 20230920PreAuthorize("@ss.hasPermi('system:category:add')")
     @Log(title = "【安全基础文档分类】", businessType = BusinessType.INSERT)
     @ApiOperation("编辑安全基础文档分类")
     @PostMapping("add")
     @Anonymous
+    @PreAuthorize("@ss.hasPermi('system:category:add')")
     public AjaxResult add(@RequestBody BasicSafetyCategory basicSafetyCategory)
     {
         return toAjax(basicSafetyCategoryService.saveOrUpdate(basicSafetyCategory));
@@ -92,22 +101,16 @@ public class BasicSafetyCategoryController extends BaseController
     /**
      * 删除【安全基础文档分类】
      */
-//    //TODO 20230920PreAuthorize("@ss.hasPermi('system:category:remove')")
+    //TODO 20230920PreAuthorize("@ss.hasPermi('system:category:remove')")
     @Log(title = "【安全基础文档分类】", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
+    @PreAuthorize("@ss.hasPermi('system:category:remove')")
     public AjaxResult remove(@PathVariable String[] ids)
     {
         return toAjax(basicSafetyCategoryService.deleteBasicSafetyCategoryByIds(ids));
     }
 
-//    //TODO 20230920PreAuthorize("@ss.hasPermi('system:category:getCategoryTree')")
-    @Anonymous
-    @ApiOperation("获取分类树")
-    @GetMapping(value = "getCategoryTree/{parentId}")
-    public AjaxResult getCategoryTree(@PathVariable("parentId") String parentId)
-    {
-        return success(basicSafetyCategoryService.getCategoryTree(parentId));
-    }
+
 
 
 

RuoYi-Vue-master/RuoYi-Vue-master/ruoyi-admin/src/main/java/com/ruoyi/web/controller/doubleDefense/BasicSafetyDocumentController.java

@@ -13,29 +13,13 @@ import com.ruoyi.doubledefense.service.IBasicSafetyDocumentService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.io.File;
 import java.util.Arrays;
 import java.util.List;
 import java.util.regex.Matcher;
 
-
-
-
-
-
-
-
-
-
 /**
  * 【请填写功能名称】Controller
  *
@@ -55,9 +39,9 @@ public class BasicSafetyDocumentController extends BaseController
     /**
      * 查询【请填写功能名称】列表
      */
-//    //TODO 20230920PreAuthorize("@("@ss.hasPermi('system:document:list')")
     @GetMapping("/list")
     @Anonymous
+    //TODO 20230920PreAuthorize("@ss.hasPermi('system:document:list')")
     public TableDataInfo list(BasicSafetyDocument basicSafetyDocument)
     {
         startPage();

RuoYi-Vue-master/RuoYi-Vue-master/ruoyi-admin/src/main/java/com/ruoyi/web/controller/doubleDefense/HazardController.java

@@ -38,8 +38,8 @@ public class HazardController extends BaseController {
      * 查询风险分析对象列表
      */
     @ApiOperation("查询风险分析对象列表")
-    //TODO 20230920PreAuthorize("@ss.hasPermi('doubledefense:hazard:list')")
     @GetMapping("/list")
+    @PreAuthorize("@ss.hasPermi('doubledefense:hazard:list')")
     public TableDataInfo list(HazardDTO hazard) {
         startPage();
         List<HazardResultDTO> list = hazardService.selectHazardList(hazard);
@@ -80,9 +80,9 @@ public class HazardController extends BaseController {
             @ApiImplicitParam(name = "hazardLevel", value = "风险等级：1低,2一般,3较大,4重大", dataType = "Long", dataTypeClass = Long.class),
             @ApiImplicitParam(name = "areaId", value = "所属区域ID", dataType = "Long", dataTypeClass = Long.class)
     })
-    //TODO 20230920PreAuthorize("@ss.hasPermi('doubledefense:hazard:add')")
     @Log(title = "风险分析对象", businessType = BusinessType.INSERT)
     @PostMapping
+    @PreAuthorize("@ss.hasPermi('doubledefense:hazard:add')")
     public AjaxResult add(@RequestBody HazardDTO hazard) {
         SysUser sysUser = getLoginUser().getUser();
         hazard.setCreateUserId(sysUser.getUserId());
@@ -104,9 +104,9 @@ public class HazardController extends BaseController {
             @ApiImplicitParam(name = "level", value = "风险等级：1低,2一般,3较大,4重大", dataType = "Long", dataTypeClass = Long.class),
             @ApiImplicitParam(name = "areaId", value = "所属区域ID", dataType = "Long", dataTypeClass = Long.class)
     })
-    //TODO 20230920PreAuthorize("@ss.hasPermi('doubledefense:hazard:edit')")
     @Log(title = "风险分析对象", businessType = BusinessType.UPDATE)
     @PutMapping
+    @PreAuthorize("@ss.hasPermi('doubledefense:hazard:edit')")
     public AjaxResult edit(@RequestBody HazardDTO hazard) {
         SysUser sysUser = getLoginUser().getUser();
         hazard.setUpdateUserId(sysUser.getUserId());
@@ -121,9 +121,9 @@ public class HazardController extends BaseController {
      */
     @ApiOperation("删除风险分析对象")
     @ApiImplicitParam(name = "ids", value = "分析对象ID集合", required = true, dataType = "List", paramType = "path", dataTypeClass = List.class)
-    //TODO 20230920PreAuthorize("@ss.hasPermi('doubledefense:hazard:remove')")
     @Log(title = "风险分析对象", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
+    @PreAuthorize("@ss.hasPermi('doubledefense:hazard:remove')")
     public AjaxResult remove(@PathVariable String[] ids) {
         return toAjax(hazardService.deleteHazardByIds(ids));
     }

RuoYi-Vue-master/RuoYi-Vue-master/ruoyi-admin/src/main/java/com/ruoyi/web/controller/doubleDefense/RiskEventController.java

@@ -37,8 +37,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 @Api(tags = "风险事件")
 @RestController
 @RequestMapping("/doubledefense/event")
-public class RiskEventController extends BaseController
-{
+public class RiskEventController extends BaseController {
     @Autowired
     private IRiskEventService riskEventService;
 
@@ -46,10 +45,9 @@ public class RiskEventController extends BaseController
      * 查询风险事件列表
      */
     @ApiOperation("查询风险分析对象列表")
-    //TODO 20230920PreAuthorize("@ss.hasPermi('doubledefense:event:list')")
     @GetMapping("/list")
-    public TableDataInfo list(RiskEventDTO riskEvent)
-    {
+    @PreAuthorize("@ss.hasPermi('doubledefense:event:list')")
+    public TableDataInfo list(RiskEventDTO riskEvent) {
         startPage();
         List<RiskEventResultDTO> list = riskEventService.selectRiskEventList(riskEvent);
         return getDataTable(list);
@@ -59,11 +57,10 @@ public class RiskEventController extends BaseController
      * 导出风险事件列表
      */
     @ApiOperation("导出风险事件列表")
-    //TODO 20230920PreAuthorize("@ss.hasPermi('doubledefense:event:export')")
     @Log(title = "风险事件", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, RiskEventDTO riskEvent)
-    {
+    @PreAuthorize("@ss.hasPermi('doubledefense:event:export')")
+    public void export(HttpServletResponse response, RiskEventDTO riskEvent) {
         List<RiskEventResultDTO> list = riskEventService.selectRiskEventList(riskEvent);
         ExcelUtil<RiskEventResultDTO> util = new ExcelUtil<RiskEventResultDTO>(RiskEventResultDTO.class);
         util.exportExcel(response, list, "风险事件数据");
@@ -73,10 +70,9 @@ public class RiskEventController extends BaseController
      * 获取风险事件详细信息
      */
     @ApiOperation("获取风险事件详细信息")
-    //TODO 20230920PreAuthorize("@ss.hasPermi('doubledefense:event:query')")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") String id)
-    {
+    @PreAuthorize("@ss.hasPermi('doubledefense:event:query')")
+    public AjaxResult getInfo(@PathVariable("id") String id) {
         return success(riskEventService.selectRiskEventById(id));
     }
 
@@ -89,11 +85,10 @@ public class RiskEventController extends BaseController
             @ApiImplicitParam(name = "riskUnitId", value = "所属风险单元UUID", dataType = "String", dataTypeClass = String.class),
             @ApiImplicitParam(name = "riskEventContent", value = "风险事件内容", dataType = "String", dataTypeClass = String.class)
     })
-    //TODO 20230920PreAuthorize("@ss.hasPermi('doubledefense:event:add')")
     @Log(title = "风险事件", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody RiskEventDTO riskEvent)
-    {
+    @PreAuthorize("@ss.hasPermi('doubledefense:event:add')")
+    public AjaxResult add(@RequestBody RiskEventDTO riskEvent) {
         return toAjax(riskEventService.insertRiskEvent(riskEvent));
     }
 
@@ -107,11 +102,10 @@ public class RiskEventController extends BaseController
             @ApiImplicitParam(name = "riskUnitId", value = "所属风险单元UUID", dataType = "String", dataTypeClass = String.class),
             @ApiImplicitParam(name = "riskEventContent", value = "风险事件内容", dataType = "String", dataTypeClass = String.class)
     })
-    //TODO 20230920PreAuthorize("@ss.hasPermi('doubledefense:event:edit')")
     @Log(title = "风险事件", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody RiskEventDTO riskEvent)
-    {
+    @PreAuthorize("@ss.hasPermi('doubledefense:event:edit')")
+    public AjaxResult edit(@RequestBody RiskEventDTO riskEvent) {
         return toAjax(riskEventService.updateRiskEvent(riskEvent));
     }
 
@@ -119,11 +113,10 @@ public class RiskEventController extends BaseController
      * 删除风险事件
      */
     @ApiOperation("删除风险事件")
-    //TODO 20230920PreAuthorize("@ss.hasPermi('doubledefense:event:remove')")
     @Log(title = "风险事件", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable String[] ids)
-    {
+    @DeleteMapping("/{ids}")
+    @PreAuthorize("@ss.hasPermi('doubledefense:event:remove')")
+    public AjaxResult remove(@PathVariable String[] ids) {
         return toAjax(riskEventService.deleteRiskEventByIds(ids));
     }
 }

RuoYi-Vue-master/RuoYi-Vue-master/ruoyi-admin/src/main/java/com/ruoyi/web/controller/doubleDefense/RiskMeasureController.java

@@ -46,7 +46,7 @@ public class RiskMeasureController extends BaseController
      * 查询风险管控措施列表
      */
     @ApiOperation("查询风险管控措施列表")
-    //TODO 20230920PreAuthorize("@("@ss.hasPermi('doubledefense:measure:list')")
+    @PreAuthorize("@ss.hasPermi('doubledefense:measure:list')")
     @GetMapping("/list")
     public TableDataInfo list(RiskMeasureDTO riskMeasure)
     {
@@ -59,7 +59,7 @@ public class RiskMeasureController extends BaseController
      * 导出风险管控措施列表
      */
     @ApiOperation("风险管控措施导出")
-    //TODO 20230920PreAuthorize("@("@ss.hasPermi('doubledefense:measure:export')")
+    @PreAuthorize("@ss.hasPermi('doubledefense:measure:export')")
     @Log(title = "风险管控措施", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, RiskMeasureDTO riskMeasure)
@@ -74,7 +74,7 @@ public class RiskMeasureController extends BaseController
      */
     @ApiOperation("获取风险管控措施详细信息")
     @ApiImplicitParam(name = "id", value = "管控措施ID", required = true, dataType = "String", paramType = "path", dataTypeClass = String.class)
-    //TODO 20230920PreAuthorize("@("@ss.hasPermi('doubledefense:measure:query')")
+    @PreAuthorize("@ss.hasPermi('doubledefense:measure:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") String id)
     {
@@ -94,7 +94,7 @@ public class RiskMeasureController extends BaseController
             @ApiImplicitParam(name = "item", value = "管控项", dataType = "String", dataTypeClass = String.class),
             @ApiImplicitParam(name = "troubleshootContent", value = "隐患排查内容", dataType = "String", dataTypeClass = String.class),
     })
-    //TODO 20230920PreAuthorize("@("@ss.hasPermi('doubledefense:measure:add')")
+    @PreAuthorize("@ss.hasPermi('doubledefense:measure:add')")
     @Log(title = "风险管控措施", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody RiskMeasureDTO riskMeasure)
@@ -116,7 +116,7 @@ public class RiskMeasureController extends BaseController
             @ApiImplicitParam(name = "item", value = "管控项", dataType = "String", dataTypeClass = String.class),
             @ApiImplicitParam(name = "troubleshootContent", value = "隐患排查内容", dataType = "String", dataTypeClass = String.class),
     })
-    //TODO 20230920PreAuthorize("@("@ss.hasPermi('doubledefense:measure:edit')")
+    @PreAuthorize("@ss.hasPermi('doubledefense:measure:edit')")
     @Log(title = "风险管控措施", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody RiskMeasureDTO riskMeasure)
@@ -129,7 +129,7 @@ public class RiskMeasureController extends BaseController
      */
     @ApiOperation("删除风险管控措施")
     @ApiImplicitParam(name = "ids", value = "管控措施ID集合", required = true, dataType = "List", paramType = "path", dataTypeClass = List.class)
-    //TODO 20230920PreAuthorize("@("@ss.hasPermi('doubledefense:measure:remove')")
+    @PreAuthorize("@ss.hasPermi('doubledefense:measure:remove')")
     @Log(title = "风险管控措施", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable String[] ids)

RuoYi-Vue-master/RuoYi-Vue-master/ruoyi-admin/src/main/java/com/ruoyi/web/controller/doubleDefense/RiskUnitController.java

@@ -58,8 +58,8 @@ public class RiskUnitController extends BaseController {
      * 查询风险分析单元列表
      */
     @ApiOperation("查询风险分析单元列表")
-    //TODO 20230920PreAuthorize("@("@ss.hasPermi('doubledefense:unit:list')")
     @GetMapping("/list")
+    @PreAuthorize("@ss.hasPermi('doubledefense:unit:list')")
     public TableDataInfo list(RiskUnitDTO riskUnit) {
         startPage();
         List<RiskUnitResultDTO> list = riskUnitService.selectRiskUnitList(riskUnit);
@@ -70,9 +70,9 @@ public class RiskUnitController extends BaseController {
      * 导出风险分析单元列表
      */
     @ApiOperation("导出风险分析单元列表")
-    //TODO 20230920PreAuthorize("@("@ss.hasPermi('doubledefense:unit:export')")
     @Log(title = "风险分析单元", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
+    @PreAuthorize("@ss.hasPermi('doubledefense:unit:export')")
     public void export(HttpServletResponse response, RiskUnitDTO riskUnit) {
         List<RiskUnitResultDTO> list = riskUnitService.selectRiskUnitList(riskUnit);
         ExcelUtil<RiskUnitResultDTO> util = new ExcelUtil<RiskUnitResultDTO>(RiskUnitResultDTO.class);
@@ -84,9 +84,10 @@ public class RiskUnitController extends BaseController {
      */
     @ApiOperation("获取分析单元详细信息")
     @ApiImplicitParam(name = "id", value = "分析单元ID", required = true, dataType = "String", paramType = "path", dataTypeClass = String.class)
-    //TODO 20230920PreAuthorize("@("@ss.hasPermi('doubledefense:unit:query')")
     @GetMapping(value = "/{id}")
+    @PreAuthorize("@ss.hasPermi('doubledefense:unit:query')")
     public AjaxResult getInfo(@PathVariable("id") String id) {
+        /*
 
         Map<String, Object> dataMap = new HashMap<>();
 //        List<Object> dataList = new ArrayList<>();
@@ -179,11 +180,9 @@ public class RiskUnitController extends BaseController {
         dangerDTOGov.setPageSize(10);
         PageInfo<DangerDTOGov> govSelectDangerList = dangerService.govSelectDangerList(dangerDTOGov);
         dataMap.put("7、隐患排查信息->隐患列表（APP和PC都可以添加隐患）", govSelectDangerList);
-
-
         return success(dataMap);
-
-//        return success(riskUnitService.selectRiskUnitById(id));
+*/
+        return success(riskUnitService.selectRiskUnitById(id));
     }
 
     /**
@@ -194,9 +193,9 @@ public class RiskUnitController extends BaseController {
             @ApiImplicitParam(name = "hazardId", value = "风险分析对象ID", dataType = "String", dataTypeClass = String.class),
             @ApiImplicitParam(name = "riskUnitName", value = "风险分析单元名称", dataType = "String", dataTypeClass = String.class),
     })
-    //TODO 20230920PreAuthorize("@("@ss.hasPermi('doubledefense:unit:add')")
     @Log(title = "风险分析单元", businessType = BusinessType.INSERT)
     @PostMapping
+    @PreAuthorize("@ss.hasPermi('doubledefense:unit:add')")
     public AjaxResult add(@RequestBody RiskUnitDTO riskUnit) {
         return toAjax(riskUnitService.insertRiskUnit(riskUnit));
     }
@@ -209,9 +208,10 @@ public class RiskUnitController extends BaseController {
             @ApiImplicitParam(name = "id", value = "风险分析单元ID", dataType = "String", dataTypeClass = String.class),
             @ApiImplicitParam(name = "hazardId", value = "风险分析对象ID", dataType = "String", dataTypeClass = String.class),
             @ApiImplicitParam(name = "riskUnitName", value = "风险分析单元名称", dataType = "String", dataTypeClass = String.class),
-    })//TODO 20230920PreAuthorize("@("@ss.hasPermi('doubledefense:unit:edit')")
+    })
     @Log(title = "风险分析单元", businessType = BusinessType.UPDATE)
     @PutMapping
+    @PreAuthorize("@ss.hasPermi('doubledefense:unit:edit')")
     public AjaxResult edit(@RequestBody RiskUnitDTO riskUnit) {
         return toAjax(riskUnitService.updateRiskUnit(riskUnit));
     }
@@ -220,7 +220,7 @@ public class RiskUnitController extends BaseController {
      * 删除风险分析单元
      */
     @ApiOperation("删除分析单元")
-    //TODO 20230920PreAuthorize("@("@ss.hasPermi('doubledefense:unit:remove')")
+    @PreAuthorize("@ss.hasPermi('doubledefense:unit:remove')")
     @Log(title = "风险分析单元", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable String[] ids) {

RuoYi-Vue-master/RuoYi-Vue-master/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/GovSyncTask.java

@@ -33,8 +33,8 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 /**
- * 定时同步：重预防汇聚计算节点
- * 预计是往“重预防汇聚计算节点”推送数据
+ * 定时同步：双重预防汇聚计算节点
+ * 预计是往“双重预防汇聚计算节点”推送数据
  *
  * @author ruoyi
  */
@@ -44,13 +44,19 @@ public class GovSyncTask {
     @Autowired
     private InvokingService invokingService;
 
+    //TODO 同步周期为1天/次，定时任务是每天的凌晨1点执行，同步前一天的数据：开始时间设置为->昨天的00:00:00，结束时间设置为->昨天的23:59:59；
+    private Date startUpdateDate = null;
+    private Date endUpdateDate = null;
+
     /**
      * 定时清理巡检任务清单
      * 定时检查漏检任务清单
      * <p>
      */
     public void sync() {
-        log.info("【重预防汇聚计算节点同步定时器】推送数据开始：{}", DateUtils.getTime());
+        log.info("【双重预防汇聚计算节点同步定时器】推送数据开始：{}", DateUtils.getTime());
+        startUpdateDate = DateUtils.getLastDay(-1, 0, 0, 0, 0);//昨天的00:00:00
+        endUpdateDate = DateUtils.getLastDay(-1, 23, 59, 59, 999);//结束时间设置为->昨天的23:59:59；
 
         //1、查询字典表配置的URL
         SysDictData dictData = new SysDictData();
@@ -79,18 +85,21 @@ public class GovSyncTask {
                 govSelectDangerList(url);//7、隐患排查信息->隐患列表（APP和PC都可以添加隐患）
             }
         }
-        log.info("【重预防汇聚计算节点同步定时器】推送数据结束：{}", DateUtils.getTime());
+        log.info("【双重预防汇聚计算节点同步定时器】推送数据结束：{}", DateUtils.getTime());
     }
 
     /**
      * 1、企业安全风险空间分布接口->四色图
      */
     private void govSelectFourColorDiagramList(String url) {
+        FourColorDiagramDTOGov syncParam = new FourColorDiagramDTOGov();
+        syncParam.setPageNo(1);
+        syncParam.setPageSize(20);//一个企业做多上传20张
+        syncParam.setStartUpdateDate(startUpdateDate);
+        syncParam.setEndUpdateDate(endUpdateDate);
+
         IFourColorDiagramService fourColorDiagramService = SpringUtils.getBean(FourColorDiagramServiceImpl.class);
-        FourColorDiagramDTOGov fourColorDiagramDTOGov = new FourColorDiagramDTOGov();
-        fourColorDiagramDTOGov.setPageNo(1);
-        fourColorDiagramDTOGov.setPageSize(20);//一个企业做多上传20张
-        PageInfo<FourColorDiagramDTOGov> govSelectFourColorDiagramList = fourColorDiagramService.govSelectFourColorDiagramList(fourColorDiagramDTOGov);
+        PageInfo<FourColorDiagramDTOGov> govSelectFourColorDiagramList = fourColorDiagramService.govSelectFourColorDiagramList(syncParam);
         List<FourColorDiagramDTOGov> fourColorDiagramDTOGovList = govSelectFourColorDiagramList.getList();
         Iterator<FourColorDiagramDTOGov> fourColorDiagramDTOGovIterator = fourColorDiagramDTOGovList.iterator();
         while (fourColorDiagramDTOGovIterator.hasNext()) {
@@ -135,11 +144,14 @@ public class GovSyncTask {
      * 2、分析单元
      */
     private void govSelectRiskUnitList(String url) {
+        RiskUnitDTOGov syncParam = new RiskUnitDTOGov();
+        syncParam.setPageNo(1);
+        syncParam.setPageSize(10);
+        syncParam.setStartUpdateDate(startUpdateDate);
+        syncParam.setEndUpdateDate(endUpdateDate);
+
         IRiskUnitService riskUnitService = SpringUtils.getBean(RiskUnitServiceImpl.class);
-        RiskUnitDTOGov ristUnit = new RiskUnitDTOGov();
-        ristUnit.setPageNo(1);
-        ristUnit.setPageSize(10);
-        PageInfo<RiskUnitDTOGov> govSelectRiskUnitList = riskUnitService.govSelectRiskUnitList(ristUnit);
+        PageInfo<RiskUnitDTOGov> govSelectRiskUnitList = riskUnitService.govSelectRiskUnitList(syncParam);
 //        List<RiskUnitDTOGov> list = govSelectRiskUnitList.getList();
 //        for (RiskUnitDTOGov data : list) {
 //            System.out.println();
@@ -166,11 +178,14 @@ public class GovSyncTask {
      * 3、风险事件
      */
     private void govSelectRiskEventList(String url) {
+        RiskEventDTOGov syncParam = new RiskEventDTOGov();
+        syncParam.setPageNo(1);
+        syncParam.setPageSize(10);
+        syncParam.setStartUpdateDate(startUpdateDate);
+        syncParam.setEndUpdateDate(endUpdateDate);
+
         IRiskEventService riskEventService = SpringUtils.getBean(RiskEventServiceImpl.class);
-        RiskEventDTOGov riskEvent = new RiskEventDTOGov();
-        riskEvent.setPageNo(1);
-        riskEvent.setPageSize(10);
-        PageInfo<RiskEventDTOGov> govSelectRiskEventList = riskEventService.govSelectRiskEventList(riskEvent);
+        PageInfo<RiskEventDTOGov> govSelectRiskEventList = riskEventService.govSelectRiskEventList(syncParam);
         System.out.println("3、测试风险事件：" + JSON.toJSONString(govSelectRiskEventList));
 
         //TODO 发送HTTP请求，推送数据到数字化平台
@@ -189,13 +204,14 @@ public class GovSyncTask {
      * 4、安全风险管控措施
      */
     private void govSelectRiskMeasureList(String url) {
-
+        RiskMeasureDTOGov syncParam = new RiskMeasureDTOGov();
+        syncParam.setPageNo(1);
+        syncParam.setPageSize(10);
+        syncParam.setStartUpdateDate(startUpdateDate);
+        syncParam.setEndUpdateDate(endUpdateDate);
 
         IRiskMeasureService riskMeasureService = SpringUtils.getBean(RiskMeasureServiceImpl.class);
-        RiskMeasureDTOGov riskMeasureDTOGov = new RiskMeasureDTOGov();
-        riskMeasureDTOGov.setPageNo(1);
-        riskMeasureDTOGov.setPageSize(10);
-        PageInfo<RiskMeasureDTOGov> govSelectRiskMeasureList = riskMeasureService.govSelectRiskMeasureList(riskMeasureDTOGov);
+        PageInfo<RiskMeasureDTOGov> govSelectRiskMeasureList = riskMeasureService.govSelectRiskMeasureList(syncParam);
 
         System.out.println("：" + JSON.toJSONString(govSelectRiskMeasureList));
 
@@ -215,12 +231,14 @@ public class GovSyncTask {
      * 5、隐患排查任务 -> 隐患排查要求
      */
     private void govSelectCheckTaskList(String url) {
-        //
+        CheckTaskDTOGov syncParam = new CheckTaskDTOGov();
+        syncParam.setPageNo(1);
+        syncParam.setPageSize(10);
+        syncParam.setStartUpdateDate(startUpdateDate);
+        syncParam.setEndUpdateDate(endUpdateDate);
+
         ICheckTaskService checkTaskService = SpringUtils.getBean(CheckTaskServiceImpl.class);
-        CheckTaskDTOGov checkTaskDTOGov = new CheckTaskDTOGov();
-        checkTaskDTOGov.setPageNo(1);
-        checkTaskDTOGov.setPageSize(10);
-        PageInfo<CheckTaskDTOGov> govSelectCheckTaskList = checkTaskService.govSelectCheckTaskList(checkTaskDTOGov);
+        PageInfo<CheckTaskDTOGov> govSelectCheckTaskList = checkTaskService.govSelectCheckTaskList(syncParam);
 
         System.out.println("5、隐患排查任务 -> 隐患排查要求：" + JSON.toJSONString(govSelectCheckTaskList));
 
@@ -240,11 +258,14 @@ public class GovSyncTask {
      * 6、隐患排查记录 -> 巡检记录
      */
     private void govSelectCheckTaskInventoryRecordList(String url) {
+        CheckTaskInventoryRecordDTOGov syncParam = new CheckTaskInventoryRecordDTOGov();
+        syncParam.setPageNo(1);
+        syncParam.setPageSize(20);
+        syncParam.setStartUpdateDate(startUpdateDate);
+        syncParam.setEndUpdateDate(endUpdateDate);
+
         ICheckTaskInventoryRecordService checkTaskInventoryRecordService = SpringUtils.getBean(CheckTaskInventoryRecordServiceImpl.class);
-        CheckTaskInventoryRecordDTOGov checkTaskInventoryRecordDTOGov = new CheckTaskInventoryRecordDTOGov();
-        checkTaskInventoryRecordDTOGov.setPageNo(1);
-        checkTaskInventoryRecordDTOGov.setPageSize(20);
-        PageInfo<CheckTaskInventoryRecordDTOGov> govSelectCheckTaskInventoryRecordList = checkTaskInventoryRecordService.govSelectCheckTaskInventoryRecordList(checkTaskInventoryRecordDTOGov);
+        PageInfo<CheckTaskInventoryRecordDTOGov> govSelectCheckTaskInventoryRecordList = checkTaskInventoryRecordService.govSelectCheckTaskInventoryRecordList(syncParam);
 
         System.out.println("6、隐患排查记录 -> 巡检记录：" + JSON.toJSONString(govSelectCheckTaskInventoryRecordList));
 
@@ -265,11 +286,14 @@ public class GovSyncTask {
      */
     private void govSelectDangerList(String url) {
         //
+        DangerDTOGov syncParam = new DangerDTOGov();
+        syncParam.setPageNo(1);
+        syncParam.setPageSize(10);
+        syncParam.setStartUpdateDate(startUpdateDate);
+        syncParam.setEndUpdateDate(endUpdateDate);
+
         IDangerService dangerService = SpringUtils.getBean(DangerServiceImpl.class);
-        DangerDTOGov dangerDTOGov = new DangerDTOGov();
-        dangerDTOGov.setPageNo(1);
-        dangerDTOGov.setPageSize(10);
-        PageInfo<DangerDTOGov> govSelectDangerList = dangerService.govSelectDangerList(dangerDTOGov);
+        PageInfo<DangerDTOGov> govSelectDangerList = dangerService.govSelectDangerList(syncParam);
 
         System.out.println("7、隐患排查信息->隐患列表（APP和PC都可以添加隐患）：" + JSON.toJSONString(govSelectDangerList));