update gitignore

kongzy

2024-08-14 135a322f44708b1187d37ea4b6859b5d82113e89

update gitignore

 .gitignore

@@ -13,3 +13,4 @@

# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
logs/

 TR.iml

对比新文件
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<module version="4">
  <component name="AdditionalModuleElements">
    <content url="file://$MODULE_DIR$" dumb="true">
      <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
    </content>
  </component>
</module>

 pom.xml

@@ -67,6 +67,7 @@
            <scope>test</scope>
        </dependency>


        <!-- SpringBoot 拦截器 -->
        <dependency>
            <groupId>org.springframework.boot</groupId>
@@ -96,6 +97,7 @@
        <dependency>
            <groupId>mysql</groupId>
            <artifactId>mysql-connector-java</artifactId>
<!--            <version>5.1.40</version>-->
        </dependency>

        <!-- SpringBoot集成mybatis框架 -->

 src/main/java/com/ruoyi/common/utils/BeanCopyUtils.java

@@ -1,55 +1,55 @@
package com.ruoyi.common.utils;



import org.springframework.beans.BeanUtils;



import java.util.List;

import java.util.stream.Collectors;



public class BeanCopyUtils {



    private BeanCopyUtils() {

    }



    /**练习

    public static Object copyBean(Object source, Class clazz) {

        //创建目标对象

        Object result = null;

        try {

            result = clazz.newInstance();

            //实现属性copy

            BeanUtils.copyProperties(source, result);



        } catch (Exception e) {

            e.printStackTrace();

        }

        //返回结果

        return result;

    }*/



    public static <V> V copyBean(Object source,Class<V> clazz) {

        //创建目标对象

        V result = null;

        try {

            result = clazz.newInstance();

            //实现属性copy

            BeanUtils.copyProperties(source, result);

        } catch (Exception e) {

            e.printStackTrace();

        }

        //返回结果

        return result;

    }



    /**练习

     *  public static <V> List<V>  copyBeanList(List<Object> list, Class<V> clazz){

            return list.stream()

                    .map(o -> copyBean(o, clazz))

                    .collect(Collectors.toList());

        }*/



    public static <O,V> List<V> copyBeanList(List<O> list, Class<V> clazz){

        return list.stream()

                .map(o -> copyBean(o, clazz))

                .collect(Collectors.toList());

    }

}

package com.ruoyi.common.utils;

import org.springframework.beans.BeanUtils;

import java.util.List;
import java.util.stream.Collectors;

public class BeanCopyUtils {

    private BeanCopyUtils() {
    }

    /**练习
    public static Object copyBean(Object source, Class clazz) {
        //创建目标对象
        Object result = null;
        try {
            result = clazz.newInstance();
            //实现属性copy
            BeanUtils.copyProperties(source, result);

        } catch (Exception e) {
            e.printStackTrace();
        }
        //返回结果
        return result;
    }*/

    public static <V> V copyBean(Object source,Class<V> clazz) {
        //创建目标对象
        V result = null;
        try {
            result = clazz.newInstance();
            //实现属性copy
            BeanUtils.copyProperties(source, result);
        } catch (Exception e) {
            e.printStackTrace();
        }
        //返回结果
        return result;
    }

    /**练习
     *  public static <V> List<V>  copyBeanList(List<Object> list, Class<V> clazz){
            return list.stream()
                    .map(o -> copyBean(o, clazz))
                    .collect(Collectors.toList());
        }*/

    public static <O,V> List<V> copyBeanList(List<O> list, Class<V> clazz){
        return list.stream()
                .map(o -> copyBean(o, clazz))
                .collect(Collectors.toList());
    }
}

 src/main/java/com/ruoyi/doublePrevention/controller/RiskAndPeopleInfoController.java

@@ -1,39 +1,39 @@
package com.ruoyi.doublePrevention.controller;



import com.ruoyi.doublePrevention.entity.dto.req.RiskAndPeopleInfoReqBO;

import com.ruoyi.doublePrevention.entity.dto.resp.RiskAndPeopleInfoRespDTO;

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

import com.ruoyi.doublePrevention.vo.ResultVO;

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

import org.springframework.web.bind.annotation.PostMapping;

import org.springframework.web.bind.annotation.RequestBody;

import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RestController;





@RestController

@RequestMapping("/riskAndPeople")

public class RiskAndPeopleInfoController {



    @Autowired

    private RiskAndPeopleInfoService riskAndPeopleInfoService;



    /**

     * 查看包保责任制信息 及统计信息

     */

    @PostMapping("/selectRiskAndPeoplePage")

    public ResultVO<RiskAndPeopleInfoRespDTO> listRiskAndPeoplePage(@RequestBody RiskAndPeopleInfoReqBO reqBO){

        ResultVO resultVO = new ResultVO<>();

        resultVO.setCode("200");

        resultVO.setMsg("查询成功");



        ResultVO<RiskAndPeopleInfoRespDTO> result = riskAndPeopleInfoService.listRiskAndPeoplePage(reqBO);



        resultVO.setPageSize(result.getPageSize());

        resultVO.setPageNum(result.getPageNum());

        resultVO.setCount(result.getCount());

        resultVO.setData(result.getData());



        return  resultVO;

    }

}

package com.ruoyi.doublePrevention.controller;

import com.ruoyi.doublePrevention.entity.dto.req.RiskAndPeopleInfoReqBO;
import com.ruoyi.doublePrevention.entity.dto.resp.RiskAndPeopleInfoRespDTO;
import com.ruoyi.doublePrevention.service.baseService.RiskAndPeopleInfoService;
import com.ruoyi.doublePrevention.vo.ResultVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;


@RestController
@RequestMapping("/riskAndPeople")
public class RiskAndPeopleInfoController {

    @Autowired
    private RiskAndPeopleInfoService riskAndPeopleInfoService;

    /**
     * 查看包保责任制信息 及统计信息
     */
    @PostMapping("/selectRiskAndPeoplePage")
    public ResultVO<RiskAndPeopleInfoRespDTO> listRiskAndPeoplePage(@RequestBody RiskAndPeopleInfoReqBO reqBO){
        ResultVO resultVO = new ResultVO<>();
        resultVO.setCode("200");
        resultVO.setMsg("查询成功");

        ResultVO<RiskAndPeopleInfoRespDTO> result = riskAndPeopleInfoService.listRiskAndPeoplePage(reqBO);

        resultVO.setPageSize(result.getPageSize());
        resultVO.setPageNum(result.getPageNum());
        resultVO.setCount(result.getCount());
        resultVO.setData(result.getData());

        return  resultVO;
    }
}

 src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/CJReportResultData.java

@@ -1,45 +1,45 @@
package com.ruoyi.doublePrevention.entity.CJReport.CJdto;









public class CJReportResultData{



    /**

     * 返回code

     * */

    private String code;

    /**

     *

     * */

    private String data;

    /**

     * 上报数据来源标识

     * */

    private String errorMsg;



    public String getCode() {

        return code;

    }



    public void setCode(String code) {

        this.code = code;

    }



    public String getData() {

        return data;

    }



    public void setData(String data) {

        this.data = data;

    }



    public String getErrorMsg() {

        return errorMsg;

    }



    public void setErrorMsg(String errorMsg) {

        this.errorMsg = errorMsg;

    }



}

package com.ruoyi.doublePrevention.entity.CJReport.CJdto;




public class CJReportResultData{

    /**
     * 返回code
     * */
    private String code;
    /**
     *
     * */
    private String data;
    /**
     * 上报数据来源标识
     * */
    private String errorMsg;

    public String getCode() {
        return code;
    }

    public void setCode(String code) {
        this.code = code;
    }

    public String getData() {
        return data;
    }

    public void setData(String data) {
        this.data = data;
    }

    public String getErrorMsg() {
        return errorMsg;
    }

    public void setErrorMsg(String errorMsg) {
        this.errorMsg = errorMsg;
    }

}

 src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/Data.java

@@ -1,18 +1,18 @@
package com.ruoyi.doublePrevention.entity.CJReport.CJdto;





import java.io.Serializable;

import java.util.List;



public class Data {



    private List<ErrorMsgDetails> errorMsgDetails;



    public List<ErrorMsgDetails> getErrorMsgDetails() {

        return errorMsgDetails;

    }



    public void setErrorMsgDetails(List<ErrorMsgDetails> errorMsgDetails) {

        this.errorMsgDetails = errorMsgDetails;

    }

}

package com.ruoyi.doublePrevention.entity.CJReport.CJdto;


import java.io.Serializable;
import java.util.List;

public class Data {

    private List<ErrorMsgDetails> errorMsgDetails;

    public List<ErrorMsgDetails> getErrorMsgDetails() {
        return errorMsgDetails;
    }

    public void setErrorMsgDetails(List<ErrorMsgDetails> errorMsgDetails) {
        this.errorMsgDetails = errorMsgDetails;
    }
}

 src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/ErrorMsgDetails.java

@@ -1,31 +1,31 @@
package com.ruoyi.doublePrevention.entity.CJReport.CJdto;



import java.io.Serializable;



public class ErrorMsgDetails{



    /**

     * 存在错误的数据id

     * */

    private String id;

    /**

     * 错误信息

    * */

    private String msg;



    public String getId() {

        return id;

    }



    public void setId(String id) {

        this.id = id;

    }



    public String getMsg() {

        return msg;

    }



    public void setMsg(String msg) {

        this.msg = msg;

    }

}

package com.ruoyi.doublePrevention.entity.CJReport.CJdto;

import java.io.Serializable;

public class ErrorMsgDetails{

    /**
     * 存在错误的数据id
     * */
    private String id;
    /**
     * 错误信息
    * */
    private String msg;

    public String getId() {
        return id;
    }

    public void setId(String id) {
        this.id = id;
    }

    public String getMsg() {
        return msg;
    }

    public void setMsg(String msg) {
        this.msg = msg;
    }
}

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

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



import lombok.Data;



@Data

public class CJReportCheckRecordFromTaskDTO {

    /**

     * 主键

     */

    private String id;

    /**

     * 公司编码

     */

    private String companyCode;

    /**

     * 隐患排查作业UUID

     */

    private String checkTaskId;

    /**

     * 排查时间

     */

    private String checkTime;



    private String mobileMe;



    private String isDefend;

    /**

     * 创建人

     */

    private String createBy;

    /**

     * 创建人手机号

     */

    private String createByMobile;







//    /**

//     * 排 查 结 果

//     */

//    private String checkStatus;

//    /**

//     * 修改人手机号

//     */

//    private String updateByMobile;

//    /**

//     * 创建时间

//     */

//    private String createDate;

//    /**

//     * 最后修改时间

//     */

//    private String updateDate;

//    /**

//     * 修改人

//     */

//    private String updateBy;





}



package com.ruoyi.doublePrevention.entity.CJReport.CJdto.HandlerDO;

import lombok.Data;

@Data
public class CJReportCheckRecordFromTaskDTO {
    /**
     * 主键
     */
    private String id;
    /**
     * 公司编码
     */
    private String companyCode;
    /**
     * 隐患排查作业UUID
     */
    private String checkTaskId;
    /**
     * 排查时间
     */
    private String checkTime;

    private String mobileMe;

    private String isDefend;
    /**
     * 创建人
     */
    private String createBy;
    /**
     * 创建人手机号
     */
    private String createByMobile;



//    /**
//     * 排 查 结 果
//     */
//    private String checkStatus;
//    /**
//     * 修改人手机号
//     */
//    private String updateByMobile;
//    /**
//     * 创建时间
//     */
//    private String createDate;
//    /**
//     * 最后修改时间
//     */
//    private String updateDate;
//    /**
//     * 修改人
//     */
//    private String updateBy;


}


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

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



import com.baomidou.mybatisplus.annotation.TableName;

import lombok.Data;



import java.io.Serializable;

import java.util.Date;





@Data

public class CJReportCheckTaskFromWorkDTO implements Serializable {

    /**

     * 主键

     */

    private String id;

    /**

     * 公司编码

     */

    private String companyCode;

    /**

     * 管控措施UUID

     */

    private String riskMeasureId;

    /**

     * 隐患排查内容

     */

    private String troubleshootContent;

    /**

     * 巡检周期

     */

    private Integer checkCycle;

    /**

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

     */

    private String checkCycleUnit;



    /**

     *任务开始时间

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

     */

    private String taskStartTime;

    /**

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

     */

    private String workStartTime;

    /**

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

     */

    private String workEndTime;

    /**

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

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

     */

    private String workDayType;

    /**

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

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

     * 0

     */

    private String workType;

    /**

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

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

     */

    private String taskNum;





    /**

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

     */

    private String deleted;

    /**

     * 创建时间

     */

    private String createDate;

    /**

     * 创建人

     */

    private String createBy;

    /**

     * 最后修改时间

     */

    private String updateDate;

    /**

     * 修改人

     */

    private String updateBy;





}



package com.ruoyi.doublePrevention.entity.CJReport.CJdto.HandlerDO;

import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;


@Data
public class CJReportCheckTaskFromWorkDTO implements Serializable {
    /**
     * 主键
     */
    private String id;
    /**
     * 公司编码
     */
    private String companyCode;
    /**
     * 管控措施UUID
     */
    private String riskMeasureId;
    /**
     * 隐患排查内容
     */
    private String troubleshootContent;
    /**
     * 巡检周期
     */
    private Integer checkCycle;
    /**
     * 巡检周期单位 小时，日，月，年
     */
    private String checkCycleUnit;

    /**
     *任务开始时间
     * 指该任 务首次开始执行的时间，必填
     */
    private String taskStartTime;
    /**
     *当巡检周期是小时的时候为必填
     */
    private String workStartTime;
    /**
     *当巡检周期是小时的时候为必填
     */
    private String workEndTime;
    /**
     *工作日类型(每天：0；法定工作日(除法定
     * 放假以外的所有)：1 ；非法定工作日(除了放假的时候)：2)
     */
    private String workDayType;
    /**
     *任务类型 任务类型(日常任务： 0；主要负责人
     * 任务：1 ；技术负责人任务：2；操作负责人任务：3；) 默认为日常任务：
     * 0
     */
    private String workType;
    /**
     *包保任务对应项 当任务类型为主要负责人任务、
     * 技术负责人任务、操作负责人任务时，此项为必填。
     */
    private String taskNum;


    /**
     * 删除标志：0-有效，1-删除
     */
    private String deleted;
    /**
     * 创建时间
     */
    private String createDate;
    /**
     * 创建人
     */
    private String createBy;
    /**
     * 最后修改时间
     */
    private String updateDate;
    /**
     * 修改人
     */
    private String updateBy;


}


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

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



import com.baomidou.mybatisplus.annotation.TableName;

import lombok.Data;



import java.io.Serializable;

import java.util.Date;



@Data

public class CJReportDangerInfoDTO{

    /**

     * 主键

     */

    private String id;

    /**

     * 公司编码

     */

    private String companyCode;

    /**

     * 安全风险分析对象编码

     */

    private String hazardCode;

    /**

     * 管控措施 ID-->管控措施UUID

     */

    private String riskMeasureId;

    /**

     * 隐患排查记录 ID-->隐患排查任务UUID

     */

    private String checkRecordId;

    /**

     * 隐患名称

     */

    private String dangerName;

    /**

     * 隐患等级

     */

    private String dangerLevel;

    /**

     *  隐患来源

     */

    private String dangerSrc;

    /**

     * 隐患治理类型

     */

    private String dangerManageType;

    /**

     * 隐患描述

     */

    private String dangerDesc;

    /**

     * 隐患产生原因

     */

    private String dangerReason;

    /**

     * 控制措施

     */

    private String controlMeasures;

    /**

     * 资金

     */

    private String cost;

    /**

     * 隐患治理期限

     */

    private String dangerManageDeadline;

    /**

     * 隐患状态

     */

    private String dangerState;

    /**

     * 隐患类型

     */

    private String hazardDangerType;

    /**

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

     */

    private String hazardCategory;

    /**

     * 登记人姓名

     */

    private String registrant;

    /**

     * 登记时间

     */

    private String registTime;

    /**

     * 整改责任人姓名

     */

    private String liablePerson;

    /**

     * 验收人

     */

    private String checkAcceptPerson;

    /**

     * 验收情况

     */

    private String checkAcceptComment;

    /**

     * 验收时间

     */

    private String checkAcceptTime;

    /**

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

     */

    private String deleted;

    /**

     * 创建时间

     */

    private String createDate;

    /**

     * 创建人

     */

    private String createBy;

    /**

     * 最后修改时间

     */

    private String updateDate;

    /**

     * 修改人

     */

    private String updateBy;





}



package com.ruoyi.doublePrevention.entity.CJReport.CJdto.HandlerDO;

import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;

@Data
public class CJReportDangerInfoDTO{
    /**
     * 主键
     */
    private String id;
    /**
     * 公司编码
     */
    private String companyCode;
    /**
     * 安全风险分析对象编码
     */
    private String hazardCode;
    /**
     * 管控措施 ID-->管控措施UUID
     */
    private String riskMeasureId;
    /**
     * 隐患排查记录 ID-->隐患排查任务UUID
     */
    private String checkRecordId;
    /**
     * 隐患名称
     */
    private String dangerName;
    /**
     * 隐患等级
     */
    private String dangerLevel;
    /**
     *  隐患来源
     */
    private String dangerSrc;
    /**
     * 隐患治理类型
     */
    private String dangerManageType;
    /**
     * 隐患描述
     */
    private String dangerDesc;
    /**
     * 隐患产生原因
     */
    private String dangerReason;
    /**
     * 控制措施
     */
    private String controlMeasures;
    /**
     * 资金
     */
    private String cost;
    /**
     * 隐患治理期限
     */
    private String dangerManageDeadline;
    /**
     * 隐患状态
     */
    private String dangerState;
    /**
     * 隐患类型
     */
    private String hazardDangerType;
    /**
     * 隐患类别(其他隐患0 ;主要负责人隐患1;技术负责人隐患2 ;操作负责人隐患3
     */
    private String hazardCategory;
    /**
     * 登记人姓名
     */
    private String registrant;
    /**
     * 登记时间
     */
    private String registTime;
    /**
     * 整改责任人姓名
     */
    private String liablePerson;
    /**
     * 验收人
     */
    private String checkAcceptPerson;
    /**
     * 验收情况
     */
    private String checkAcceptComment;
    /**
     * 验收时间
     */
    private String checkAcceptTime;
    /**
     * 删除标志：0-有效，1-删除
     */
    private String deleted;
    /**
     * 创建时间
     */
    private String createDate;
    /**
     * 创建人
     */
    private String createBy;
    /**
     * 最后修改时间
     */
    private String updateDate;
    /**
     * 修改人
     */
    private String updateBy;


}


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

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



import lombok.Data;





@Data

public class CJReportOverhaulLogDTO {



    /**

     * 主键

     */

    private String id;

    /**

     * 公司编码

     */

    private String companyCode;

    /**

     * 风险分析对象编码

     */

    private String hazardCode;

    /**

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

     */

    private String riskUnitId;

    /**

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

     */

    private String stopStartTime;

    /**

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

     */

    private String stopEndTime;

    /**

     * 描述停用原因

     */

    private String stopReason;

    /**

     * 创建时间

     */

    private String createDate;

    /**

     * 创建人

     */

    private String createBy;

    /**

     * 最后修改时间

     */

    private String updateDate;

    /**

     * 修改人

     */

    private String updateBy;





//    /**

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

//     */

//    private String deleted;





}

package com.ruoyi.doublePrevention.entity.CJReport.CJdto.HandlerDO;

import lombok.Data;


@Data
public class CJReportOverhaulLogDTO {

    /**
     * 主键
     */
    private String id;
    /**
     * 公司编码
     */
    private String companyCode;
    /**
     * 风险分析对象编码
     */
    private String hazardCode;
    /**
     * 所属安全风险分析单元uuid
     */
    private String riskUnitId;
    /**
     * 装置停用或者检维修开始时间
     */
    private String stopStartTime;
    /**
     * 装置停用或者检维修结束时间
     */
    private String stopEndTime;
    /**
     * 描述停用原因
     */
    private String stopReason;
    /**
     * 创建时间
     */
    private String createDate;
    /**
     * 创建人
     */
    private String createBy;
    /**
     * 最后修改时间
     */
    private String updateDate;
    /**
     * 修改人
     */
    private String updateBy;


//    /**
//     * 删除标志：0-有效，1-删除
//     */
//    private String deleted;


}

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

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



import com.baomidou.mybatisplus.annotation.TableName;



import java.io.Serializable;

import java.util.Date;



//@TableName("prevent_cj_report_point")

public class CJReportPointDTO implements Serializable {

    /**

     * 主键

     */

    private String id;

    /**

     * 公司编码

     */

    private String companyCode;

    /**

     * 删除标志：0-未删除、1-已删除、2-更新

     */

    private String deleted;

    /**

     * 创建时间

     */

    private Date createDate;

    /**

     * 创建人

     */

    private String createBy;

    /**

     * 最后修改时间

     */

    private Date updateDate;

    /**

     * 修改人

     */

    private String updateBy;

    /**

     * 风险单元

     */

    private String riskUnitIds;

    /**

     * 风险事件

     */

    private String riskEventIds;

    /**

     * 管控措施

     */

    private String riskMeasureIds;

    /**

     * 责任部门

     */

    private String hazardDep;

    /**

     * 安全风险分析对象编码

     */

    private String hazardCode;

    /**

     * 责任人姓名

     */

    private String hazardLiablePerson;



    public String getRiskUnitIds() {

        return riskUnitIds;

    }



    public void setRiskUnitIds(String riskUnitIds) {

        this.riskUnitIds = riskUnitIds;

    }



    public String getRiskEventIds() {

        return riskEventIds;

    }



    public void setRiskEventIds(String riskEventIds) {

        this.riskEventIds = riskEventIds;

    }



    public String getRiskMeasureIds() {

        return riskMeasureIds;

    }



    public void setRiskMeasureIds(String riskMeasureIds) {

        this.riskMeasureIds = riskMeasureIds;

    }



    public String getHazardCode() {

        return hazardCode;

    }



    public void setHazardCode(String hazardCode) {

        this.hazardCode = hazardCode;

    }



    public String getHazardDep() {

        return hazardDep;

    }



    public void setHazardDep(String hazardDep) {

        this.hazardDep = hazardDep;

    }



    public String getHazardLiablePerson() {

        return hazardLiablePerson;

    }



    public void setHazardLiablePerson(String hazardLiablePerson) {

        this.hazardLiablePerson = hazardLiablePerson;

    }



    public String getDeleted() {

        return deleted;

    }

    public void setDeleted(String deleted) {

        this.deleted = deleted;

    }



    public String getId() {

        return id;

    }



    public void setId(String id) {

        this.id = id;

    }



    public String getCompanyCode() {

        return companyCode;

    }



    public void setCompanyCode(String companyCode) {

        this.companyCode = companyCode;

    }



    public Date getCreateDate() {

        return createDate;

    }



    public void setCreateDate(Date createDate) {

        this.createDate = createDate;

    }



    public String getCreateBy() {

        return createBy;

    }



    public void setCreateBy(String createBy) {

        this.createBy = createBy;

    }



    public Date getUpdateDate() {

        return updateDate;

    }



    public void setUpdateDate(Date updateDate) {

        this.updateDate = updateDate;

    }



    public String getUpdateBy() {

        return updateBy;

    }



    public void setUpdateBy(String updateBy) {

        this.updateBy = updateBy;

    }





}



package com.ruoyi.doublePrevention.entity.CJReport.CJdto.HandlerDO;

import com.baomidou.mybatisplus.annotation.TableName;

import java.io.Serializable;
import java.util.Date;

//@TableName("prevent_cj_report_point")
public class CJReportPointDTO implements Serializable {
    /**
     * 主键
     */
    private String id;
    /**
     * 公司编码
     */
    private String companyCode;
    /**
     * 删除标志：0-未删除、1-已删除、2-更新
     */
    private String deleted;
    /**
     * 创建时间
     */
    private Date createDate;
    /**
     * 创建人
     */
    private String createBy;
    /**
     * 最后修改时间
     */
    private Date updateDate;
    /**
     * 修改人
     */
    private String updateBy;
    /**
     * 风险单元
     */
    private String riskUnitIds;
    /**
     * 风险事件
     */
    private String riskEventIds;
    /**
     * 管控措施
     */
    private String riskMeasureIds;
    /**
     * 责任部门
     */
    private String hazardDep;
    /**
     * 安全风险分析对象编码
     */
    private String hazardCode;
    /**
     * 责任人姓名
     */
    private String hazardLiablePerson;

    public String getRiskUnitIds() {
        return riskUnitIds;
    }

    public void setRiskUnitIds(String riskUnitIds) {
        this.riskUnitIds = riskUnitIds;
    }

    public String getRiskEventIds() {
        return riskEventIds;
    }

    public void setRiskEventIds(String riskEventIds) {
        this.riskEventIds = riskEventIds;
    }

    public String getRiskMeasureIds() {
        return riskMeasureIds;
    }

    public void setRiskMeasureIds(String riskMeasureIds) {
        this.riskMeasureIds = riskMeasureIds;
    }

    public String getHazardCode() {
        return hazardCode;
    }

    public void setHazardCode(String hazardCode) {
        this.hazardCode = hazardCode;
    }

    public String getHazardDep() {
        return hazardDep;
    }

    public void setHazardDep(String hazardDep) {
        this.hazardDep = hazardDep;
    }

    public String getHazardLiablePerson() {
        return hazardLiablePerson;
    }

    public void setHazardLiablePerson(String hazardLiablePerson) {
        this.hazardLiablePerson = hazardLiablePerson;
    }

    public String getDeleted() {
        return deleted;
    }
    public void setDeleted(String deleted) {
        this.deleted = deleted;
    }

    public String getId() {
        return id;
    }

    public void setId(String id) {
        this.id = id;
    }

    public String getCompanyCode() {
        return companyCode;
    }

    public void setCompanyCode(String companyCode) {
        this.companyCode = companyCode;
    }

    public Date getCreateDate() {
        return createDate;
    }

    public void setCreateDate(Date createDate) {
        this.createDate = createDate;
    }

    public String getCreateBy() {
        return createBy;
    }

    public void setCreateBy(String createBy) {
        this.createBy = createBy;
    }

    public Date getUpdateDate() {
        return updateDate;
    }

    public void setUpdateDate(Date updateDate) {
        this.updateDate = updateDate;
    }

    public String getUpdateBy() {
        return updateBy;
    }

    public void setUpdateBy(String updateBy) {
        this.updateBy = updateBy;
    }


}


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

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





public class CJReportRiskAnaUnitDTO {

    /**

     * 主键

     */

    private String id;

    /**

     * 公司编码

     */

    private String companyCode;

    /**

     * 安全风险分析对象编码

     */

    private String hazardCode;

    /**

     * 安全风险分析单元名称

     */

    private String riskUnitName;

    /**

     * 责任部门

     */

    private String hazardDep;

    /**

     * 责任人姓名

     */

    private String hazardLiablePerson;

    /**

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

     */

    private String deleted;

    /**

     * 创建时间

     */

    private String createDate;

    /**

     * 创建人

     */

    private String createBy;

    /**

     * 最后修改时间

     */

    private String updateDate;

    /**

     * 修改人

     */

    private String updateBy;



    public String getId() {

        return id;

    }



    public void setId(String id) {

        this.id = id;

    }



    public String getCompanyCode() {

        return companyCode;

    }



    public void setCompanyCode(String companyCode) {

        this.companyCode = companyCode;

    }



    public String getRiskUnitName() {

        return riskUnitName;

    }



    public void setRiskUnitName(String riskUnitName) {

        this.riskUnitName = riskUnitName;

    }



    public String getHazardCode() {

        return hazardCode;

    }



    public void setHazardCode(String hazardCode) {

        this.hazardCode = hazardCode;

    }



    public String getHazardDep() {

        return hazardDep;

    }



    public void setHazardDep(String hazardDep) {

        this.hazardDep = hazardDep;

    }



    public String getHazardLiablePerson() {

        return hazardLiablePerson;

    }



    public void setHazardLiablePerson(String hazardLiablePerson) {

        this.hazardLiablePerson = hazardLiablePerson;

    }



    public String getCreateBy() {

        return createBy;

    }



    public void setCreateBy(String createBy) {

        this.createBy = createBy;

    }



    public String getUpdateBy() {

        return updateBy;

    }



    public void setUpdateBy(String updateBy) {

        this.updateBy = updateBy;

    }



    public String getDeleted() {

        return deleted;

    }



    public void setDeleted(String deleted) {

        this.deleted = deleted;

    }



    public String getCreateDate() {

        return createDate;

    }



    public void setCreateDate(String createDate) {

        this.createDate = createDate;

    }



    public String getUpdateDate() {

        return updateDate;

    }



    public void setUpdateDate(String updateDate) {

        this.updateDate = updateDate;

    }

}



package com.ruoyi.doublePrevention.entity.CJReport.CJdto.HandlerDO;


public class CJReportRiskAnaUnitDTO {
    /**
     * 主键
     */
    private String id;
    /**
     * 公司编码
     */
    private String companyCode;
    /**
     * 安全风险分析对象编码
     */
    private String hazardCode;
    /**
     * 安全风险分析单元名称
     */
    private String riskUnitName;
    /**
     * 责任部门
     */
    private String hazardDep;
    /**
     * 责任人姓名
     */
    private String hazardLiablePerson;
    /**
     * 删除标志：0-有效，1-删除
     */
    private String deleted;
    /**
     * 创建时间
     */
    private String createDate;
    /**
     * 创建人
     */
    private String createBy;
    /**
     * 最后修改时间
     */
    private String updateDate;
    /**
     * 修改人
     */
    private String updateBy;

    public String getId() {
        return id;
    }

    public void setId(String id) {
        this.id = id;
    }

    public String getCompanyCode() {
        return companyCode;
    }

    public void setCompanyCode(String companyCode) {
        this.companyCode = companyCode;
    }

    public String getRiskUnitName() {
        return riskUnitName;
    }

    public void setRiskUnitName(String riskUnitName) {
        this.riskUnitName = riskUnitName;
    }

    public String getHazardCode() {
        return hazardCode;
    }

    public void setHazardCode(String hazardCode) {
        this.hazardCode = hazardCode;
    }

    public String getHazardDep() {
        return hazardDep;
    }

    public void setHazardDep(String hazardDep) {
        this.hazardDep = hazardDep;
    }

    public String getHazardLiablePerson() {
        return hazardLiablePerson;
    }

    public void setHazardLiablePerson(String hazardLiablePerson) {
        this.hazardLiablePerson = hazardLiablePerson;
    }

    public String getCreateBy() {
        return createBy;
    }

    public void setCreateBy(String createBy) {
        this.createBy = createBy;
    }

    public String getUpdateBy() {
        return updateBy;
    }

    public void setUpdateBy(String updateBy) {
        this.updateBy = updateBy;
    }

    public String getDeleted() {
        return deleted;
    }

    public void setDeleted(String deleted) {
        this.deleted = deleted;
    }

    public String getCreateDate() {
        return createDate;
    }

    public void setCreateDate(String createDate) {
        this.createDate = createDate;
    }

    public String getUpdateDate() {
        return updateDate;
    }

    public void setUpdateDate(String updateDate) {
        this.updateDate = updateDate;
    }
}


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

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



import java.io.Serializable;



public class CJReportRiskControlMeasureDTO implements Serializable {

    /**

     * 主键

     */

    private String id;

    /**

     * 公司编码

     */

    private String companyCode;

    /**

     * 风险事件单元 UUID

     */

    private String riskEventId;

    /**

     * 管控方式

     */

    private String dataSrc;

    /**

     * 管控措施描述

     */

    private String riskMeasureDesc;

    /**

     * 隐患排查内容

     */

    private String troubleshootContent;

    /**

     * 管控措施分类1

     */

    private String classify1;

    /**

     * 管控措施分类2

     */

    private String classify2;

    /**

     * 管控措施分类3

     */

    private String classify3;



    /**

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

     */

    private String deleted;

    /**

     * 创建时间

     */

    private String createDate;

    /**

     * 创建人

     */

    private String createBy;

    /**

     * 最后修改时间

     */

    private String updateDate;

    /**

     * 修改人

     */

    private String updateBy;



    public String getId() {

        return id;

    }



    public void setId(String id) {

        this.id = id;

    }



    public String getCompanyCode() {

        return companyCode;

    }



    public void setCompanyCode(String companyCode) {

        this.companyCode = companyCode;

    }



    public String getCreateDate() {

        return createDate;

    }



    public void setCreateDate(String createDate) {

        this.createDate = createDate;

    }



    public String getUpdateDate() {

        return updateDate;

    }



    public void setUpdateDate(String updateDate) {

        this.updateDate = updateDate;

    }



    public String getCreateBy() {

        return createBy;

    }



    public void setCreateBy(String createBy) {

        this.createBy = createBy;

    }



    public String getUpdateBy() {

        return updateBy;

    }



    public void setUpdateBy(String updateBy) {

        this.updateBy = updateBy;

    }



    public String getRiskEventId() {

        return riskEventId;

    }



    public void setRiskEventId(String riskEventId) {

        this.riskEventId = riskEventId;

    }



    public String getDataSrc() {

        return dataSrc;

    }



    public void setDataSrc(String dataSrc) {

        this.dataSrc = dataSrc;

    }



    public String getRiskMeasureDesc() {

        return riskMeasureDesc;

    }



    public void setRiskMeasureDesc(String riskMeasureDesc) {

        this.riskMeasureDesc = riskMeasureDesc;

    }



    public String getTroubleshootContent() {

        return troubleshootContent;

    }



    public void setTroubleshootContent(String troubleshootContent) {

        this.troubleshootContent = troubleshootContent;

    }



    public String getDeleted() {

        return deleted;

    }



    public void setDeleted(String deleted) {

        this.deleted = deleted;

    }



    public String getClassify1() {

        return classify1;

    }



    public void setClassify1(String classify1) {

        this.classify1 = classify1;

    }



    public String getClassify2() {

        return classify2;

    }



    public void setClassify2(String classify2) {

        this.classify2 = classify2;

    }



    public String getClassify3() {

        return classify3;

    }



    public void setClassify3(String classify3) {

        this.classify3 = classify3;

    }

}



package com.ruoyi.doublePrevention.entity.CJReport.CJdto.HandlerDO;

import java.io.Serializable;

public class CJReportRiskControlMeasureDTO implements Serializable {
    /**
     * 主键
     */
    private String id;
    /**
     * 公司编码
     */
    private String companyCode;
    /**
     * 风险事件单元 UUID
     */
    private String riskEventId;
    /**
     * 管控方式
     */
    private String dataSrc;
    /**
     * 管控措施描述
     */
    private String riskMeasureDesc;
    /**
     * 隐患排查内容
     */
    private String troubleshootContent;
    /**
     * 管控措施分类1
     */
    private String classify1;
    /**
     * 管控措施分类2
     */
    private String classify2;
    /**
     * 管控措施分类3
     */
    private String classify3;

    /**
     * 删除标志：0-有效，1-删除
     */
    private String deleted;
    /**
     * 创建时间
     */
    private String createDate;
    /**
     * 创建人
     */
    private String createBy;
    /**
     * 最后修改时间
     */
    private String updateDate;
    /**
     * 修改人
     */
    private String updateBy;

    public String getId() {
        return id;
    }

    public void setId(String id) {
        this.id = id;
    }

    public String getCompanyCode() {
        return companyCode;
    }

    public void setCompanyCode(String companyCode) {
        this.companyCode = companyCode;
    }

    public String getCreateDate() {
        return createDate;
    }

    public void setCreateDate(String createDate) {
        this.createDate = createDate;
    }

    public String getUpdateDate() {
        return updateDate;
    }

    public void setUpdateDate(String updateDate) {
        this.updateDate = updateDate;
    }

    public String getCreateBy() {
        return createBy;
    }

    public void setCreateBy(String createBy) {
        this.createBy = createBy;
    }

    public String getUpdateBy() {
        return updateBy;
    }

    public void setUpdateBy(String updateBy) {
        this.updateBy = updateBy;
    }

    public String getRiskEventId() {
        return riskEventId;
    }

    public void setRiskEventId(String riskEventId) {
        this.riskEventId = riskEventId;
    }

    public String getDataSrc() {
        return dataSrc;
    }

    public void setDataSrc(String dataSrc) {
        this.dataSrc = dataSrc;
    }

    public String getRiskMeasureDesc() {
        return riskMeasureDesc;
    }

    public void setRiskMeasureDesc(String riskMeasureDesc) {
        this.riskMeasureDesc = riskMeasureDesc;
    }

    public String getTroubleshootContent() {
        return troubleshootContent;
    }

    public void setTroubleshootContent(String troubleshootContent) {
        this.troubleshootContent = troubleshootContent;
    }

    public String getDeleted() {
        return deleted;
    }

    public void setDeleted(String deleted) {
        this.deleted = deleted;
    }

    public String getClassify1() {
        return classify1;
    }

    public void setClassify1(String classify1) {
        this.classify1 = classify1;
    }

    public String getClassify2() {
        return classify2;
    }

    public void setClassify2(String classify2) {
        this.classify2 = classify2;
    }

    public String getClassify3() {
        return classify3;
    }

    public void setClassify3(String classify3) {
        this.classify3 = classify3;
    }
}


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

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





import java.io.Serializable;



public class CJReportRiskEventDTO implements Serializable {

    /**

     * 主键

     */

    private String id;

    /**

     * 公司编码

     */

    private String companyCode;

    /**

     * 关联风险分析单元UUID

     */

    private String riskUnitId;

    /**

     * 风险事件名称

     */

    private String riskEventName;

    /**

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

     */

    private String deleted;

    /**

     * 创建时间

     */

    private String createDate;

    /**

     * 创建人

     */

    private String createBy;

    /**

     * 最后修改时间

     */

    private String updateDate;

    /**

     * 修改人

     */

    private String updateBy;



    public String getDeleted() {

        return deleted;

    }

    public void setDeleted(String deleted) {

        this.deleted = deleted;

    }



    public String getId() {

        return id;

    }



    public void setId(String id) {

        this.id = id;

    }



    public String getCompanyCode() {

        return companyCode;

    }



    public void setCompanyCode(String companyCode) {

        this.companyCode = companyCode;

    }



    public String getRiskEventName() {

        return riskEventName;

    }



    public void setRiskEventName(String riskEventName) {

        this.riskEventName = riskEventName;

    }



    public String getRiskUnitId() {

        return riskUnitId;

    }



    public void setRiskUnitId(String riskUnitId) {

        this.riskUnitId = riskUnitId;

    }



    public String getCreateDate() {

        return createDate;

    }



    public void setCreateDate(String createDate) {

        this.createDate = createDate;

    }



    public String getCreateBy() {

        return createBy;

    }



    public void setCreateBy(String createBy) {

        this.createBy = createBy;

    }



    public String getUpdateDate() {

        return updateDate;

    }



    public void setUpdateDate(String updateDate) {

        this.updateDate = updateDate;

    }



    public String getUpdateBy() {

        return updateBy;

    }



    public void setUpdateBy(String updateBy) {

        this.updateBy = updateBy;

    }

}



package com.ruoyi.doublePrevention.entity.CJReport.CJdto.HandlerDO;


import java.io.Serializable;

public class CJReportRiskEventDTO implements Serializable {
    /**
     * 主键
     */
    private String id;
    /**
     * 公司编码
     */
    private String companyCode;
    /**
     * 关联风险分析单元UUID
     */
    private String riskUnitId;
    /**
     * 风险事件名称
     */
    private String riskEventName;
    /**
     * 删除标志：0-有效，1-删除
     */
    private String deleted;
    /**
     * 创建时间
     */
    private String createDate;
    /**
     * 创建人
     */
    private String createBy;
    /**
     * 最后修改时间
     */
    private String updateDate;
    /**
     * 修改人
     */
    private String updateBy;

    public String getDeleted() {
        return deleted;
    }
    public void setDeleted(String deleted) {
        this.deleted = deleted;
    }

    public String getId() {
        return id;
    }

    public void setId(String id) {
        this.id = id;
    }

    public String getCompanyCode() {
        return companyCode;
    }

    public void setCompanyCode(String companyCode) {
        this.companyCode = companyCode;
    }

    public String getRiskEventName() {
        return riskEventName;
    }

    public void setRiskEventName(String riskEventName) {
        this.riskEventName = riskEventName;
    }

    public String getRiskUnitId() {
        return riskUnitId;
    }

    public void setRiskUnitId(String riskUnitId) {
        this.riskUnitId = riskUnitId;
    }

    public String getCreateDate() {
        return createDate;
    }

    public void setCreateDate(String createDate) {
        this.createDate = createDate;
    }

    public String getCreateBy() {
        return createBy;
    }

    public void setCreateBy(String createBy) {
        this.createBy = createBy;
    }

    public String getUpdateDate() {
        return updateDate;
    }

    public void setUpdateDate(String updateDate) {
        this.updateDate = updateDate;
    }

    public String getUpdateBy() {
        return updateBy;
    }

    public void setUpdateBy(String updateBy) {
        this.updateBy = updateBy;
    }
}


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

@@ -1,89 +1,89 @@
package com.ruoyi.doublePrevention.entity.CJReport;



import com.baomidou.mybatisplus.annotation.IdType;

import com.baomidou.mybatisplus.annotation.TableId;

import com.baomidou.mybatisplus.annotation.TableName;

import lombok.Data;



import java.io.Serializable;

import java.util.Date;



@Data

@TableName("prevent_cj_report_check_record_from_task")

public class PreventCJReportCheckRecordFromTask implements Serializable {

    /**

     * 主键

     */

    @TableId(value = "id" , type = IdType.AUTO)

    private Integer indexId;

    /**

     * 主键

     */

    private String id;

    /**

     * 公司编码

     */

    private String companyCode;

    /**

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

     */

    private String deleted;

    /**

     * 创建时间

     */

    private Date createDate;

    /**

     * 创建人

     */

    private String createBy;

    /**

     * 最后修改时间

     */

    private Date updateDate;

    /**

     * 修改人

     */

    private String updateBy;

    /**

     * 隐患排查作业UUID

     */

    private String checkTaskId;

    /**

     * 排 查 结 果

     */

    private String checkStatus;

    /**

     * 排查时间

     */

    private Date checkTime;

    /**

     * 修改人手机号

     */

    private String updateByMobile;

    /**

     * 创建人人手机号

     */

    private String createByMobile;

    /**

     * 上报时间

     */

    private Date reportTime;

    /**

     * 上报状态 1-待上报；2-已上报；3-不上报

     */

    private Byte reportStatus;

    /**

     * 数据来源  1-本系统排查任务产生；2-同步数据

     */

    private Byte dataSource;

    /**

     * taskId

     */

    private Long taskId;



    private String mobileCode;



    private String defend;



}



package com.ruoyi.doublePrevention.entity.CJReport;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;

@Data
@TableName("prevent_cj_report_check_record_from_task")
public class PreventCJReportCheckRecordFromTask implements Serializable {
    /**
     * 主键
     */
    @TableId(value = "id" , type = IdType.AUTO)
    private Integer indexId;
    /**
     * 主键
     */
    private String id;
    /**
     * 公司编码
     */
    private String companyCode;
    /**
     * 删除标志：0-有效，1-删除
     */
    private String deleted;
    /**
     * 创建时间
     */
    private Date createDate;
    /**
     * 创建人
     */
    private String createBy;
    /**
     * 最后修改时间
     */
    private Date updateDate;
    /**
     * 修改人
     */
    private String updateBy;
    /**
     * 隐患排查作业UUID
     */
    private String checkTaskId;
    /**
     * 排 查 结 果
     */
    private String checkStatus;
    /**
     * 排查时间
     */
    private Date checkTime;
    /**
     * 修改人手机号
     */
    private String updateByMobile;
    /**
     * 创建人人手机号
     */
    private String createByMobile;
    /**
     * 上报时间
     */
    private Date reportTime;
    /**
     * 上报状态 1-待上报；2-已上报；3-不上报
     */
    private Byte reportStatus;
    /**
     * 数据来源  1-本系统排查任务产生；2-同步数据
     */
    private Byte dataSource;
    /**
     * taskId
     */
    private Long taskId;

    private String mobileCode;

    private String defend;

}


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

@@ -1,112 +1,112 @@
package com.ruoyi.doublePrevention.entity.CJReport;



import com.baomidou.mybatisplus.annotation.IdType;

import com.baomidou.mybatisplus.annotation.TableId;

import com.baomidou.mybatisplus.annotation.TableName;

import lombok.Data;



import java.io.Serializable;

import java.util.Date;



@Data

@TableName("prevent_cj_report_check_task_from_work")

public class PreventCJReportCheckTaskFromWork implements Serializable {

    /**

     * 主键

     */

    @TableId(value = "id" , type = IdType.AUTO)

    private Integer indexId;

    /**

     * 主键

     */

    private String id;

    /**

     * 公司编码

     */

    private String companyCode;

    /**

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

     */

    private String deleted;

    /**

     * 创建时间

     */

    private Date createDate;

    /**

     * 创建人

     */

    private String createBy;

    /**

     * 最后修改时间

     */

    private Date updateDate;

    /**

     * 修改人

     */

    private String updateBy;

    /**

     * 管控措施UUID

     */

    private String riskMeasureId;

    /**

     * 巡检周期

     */

    private Integer checkCycle;

    /**

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

     */

    private String checkCycleUnit;

    /**

     * 上报时间

     */

    private Date reportTime;

    /**

     * 上报状态 1-待上报；2-已上报；3-不上报

     */

    private Byte reportStatus;

    /**

     * 数据来源  1-本系统排查任务产生；2-同步数据

     */

    private Byte dataSource;

    /**

     * workId

     */

    private Long workId;





    /**

     * 隐患排查内容

     */

    private String troubleshootContent;

    /**

     *任务开始时间

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

     */

    private Date taskStartTime;

    /**

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

     */

    private String workStartTime;

    /**

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

     */

    private String workEndTime;

    /**

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

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

     */

    private String workDayType;

    /**

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

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

     * 0

     */

    private String workType;

    /**

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

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

     */

    private String taskNum;



}



package com.ruoyi.doublePrevention.entity.CJReport;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;

@Data
@TableName("prevent_cj_report_check_task_from_work")
public class PreventCJReportCheckTaskFromWork implements Serializable {
    /**
     * 主键
     */
    @TableId(value = "id" , type = IdType.AUTO)
    private Integer indexId;
    /**
     * 主键
     */
    private String id;
    /**
     * 公司编码
     */
    private String companyCode;
    /**
     * 删除标志：0-有效，1-删除
     */
    private String deleted;
    /**
     * 创建时间
     */
    private Date createDate;
    /**
     * 创建人
     */
    private String createBy;
    /**
     * 最后修改时间
     */
    private Date updateDate;
    /**
     * 修改人
     */
    private String updateBy;
    /**
     * 管控措施UUID
     */
    private String riskMeasureId;
    /**
     * 巡检周期
     */
    private Integer checkCycle;
    /**
     * 巡检周期单位 小时，日，月，年
     */
    private String checkCycleUnit;
    /**
     * 上报时间
     */
    private Date reportTime;
    /**
     * 上报状态 1-待上报；2-已上报；3-不上报
     */
    private Byte reportStatus;
    /**
     * 数据来源  1-本系统排查任务产生；2-同步数据
     */
    private Byte dataSource;
    /**
     * workId
     */
    private Long workId;


    /**
     * 隐患排查内容
     */
    private String troubleshootContent;
    /**
     *任务开始时间
     * 指该任 务首次开始执行的时间，必填
     */
    private Date taskStartTime;
    /**
     *当巡检周期是小时的时候为必填
     */
    private String workStartTime;
    /**
     *当巡检周期是小时的时候为必填
     */
    private String workEndTime;
    /**
     *工作日类型(每天：0；法定工作日(除法定
     * 放假以外的所有)：1 ；非法定工作日(除了放假的时候)：2)
     */
    private String workDayType;
    /**
     *任务类型 任务类型(日常任务： 0；主要负责人
     * 任务：1 ；技术负责人任务：2；操作负责人任务：3；) 默认为日常任务：
     * 0
     */
    private String workType;
    /**
     *包保任务对应项 当任务类型为主要负责人任务、
     * 技术负责人任务、操作负责人任务时，此项为必填。
     */
    private String taskNum;

}


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

@@ -1,94 +1,94 @@
package com.ruoyi.doublePrevention.entity.CJReport;



import com.baomidou.mybatisplus.annotation.TableName;



import java.util.Date;



@TableName("prevent_cj_report_config")

public class PreventCJReportConfig {



    /**

     * 主键

     */

    private Integer id;

    /**

     * 上报开关：0-开启；1-关闭

     */

    private Byte reportState;

    /**

     * 上报方式：0-手动；1-自动

     */

    private Byte reportType;

    /**

     * 上报数据

     */

    private String reportData;

    /**

     * 上报数据名称

     */

    private String reportDataName;

    /**

     * 最后修改时间

     */

    private Date gmtModitify;

    /**

     * 修改人

     */

    private String lastEditUserName;



    public Integer getId() {

        return id;

    }



    public void setId(Integer id) {

        this.id = id;

    }



    public Byte getReportState() {

        return reportState;

    }



    public void setReportState(Byte reportState) {

        this.reportState = reportState;

    }



    public Byte getReportType() {

        return reportType;

    }



    public void setReportType(Byte reportType) {

        this.reportType = reportType;

    }



    public String getReportData() {

        return reportData;

    }



    public void setReportData(String reportData) {

        this.reportData = reportData;

    }



    public String getReportDataName() {

        return reportDataName;

    }



    public void setReportDataName(String reportDataName) {

        this.reportDataName = reportDataName;

    }



    public Date getGmtModitify() {

        return gmtModitify;

    }



    public void setGmtModitify(Date gmtModitify) {

        this.gmtModitify = gmtModitify;

    }



    public String getLastEditUserName() {

        return lastEditUserName;

    }



    public void setLastEditUserName(String lastEditUserName) {

        this.lastEditUserName = lastEditUserName;

    }

}

package com.ruoyi.doublePrevention.entity.CJReport;

import com.baomidou.mybatisplus.annotation.TableName;

import java.util.Date;

@TableName("prevent_cj_report_config")
public class PreventCJReportConfig {

    /**
     * 主键
     */
    private Integer id;
    /**
     * 上报开关：0-开启；1-关闭
     */
    private Byte reportState;
    /**
     * 上报方式：0-手动；1-自动
     */
    private Byte reportType;
    /**
     * 上报数据
     */
    private String reportData;
    /**
     * 上报数据名称
     */
    private String reportDataName;
    /**
     * 最后修改时间
     */
    private Date gmtModitify;
    /**
     * 修改人
     */
    private String lastEditUserName;

    public Integer getId() {
        return id;
    }

    public void setId(Integer id) {
        this.id = id;
    }

    public Byte getReportState() {
        return reportState;
    }

    public void setReportState(Byte reportState) {
        this.reportState = reportState;
    }

    public Byte getReportType() {
        return reportType;
    }

    public void setReportType(Byte reportType) {
        this.reportType = reportType;
    }

    public String getReportData() {
        return reportData;
    }

    public void setReportData(String reportData) {
        this.reportData = reportData;
    }

    public String getReportDataName() {
        return reportDataName;
    }

    public void setReportDataName(String reportDataName) {
        this.reportDataName = reportDataName;
    }

    public Date getGmtModitify() {
        return gmtModitify;
    }

    public void setGmtModitify(Date gmtModitify) {
        this.gmtModitify = gmtModitify;
    }

    public String getLastEditUserName() {
        return lastEditUserName;
    }

    public void setLastEditUserName(String lastEditUserName) {
        this.lastEditUserName = lastEditUserName;
    }
}

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

@@ -1,97 +1,97 @@
package com.ruoyi.doublePrevention.entity.CJReport;



import com.baomidou.mybatisplus.annotation.IdType;

import com.baomidou.mybatisplus.annotation.TableId;

import com.baomidou.mybatisplus.annotation.TableName;



import java.util.Date;



@TableName("prevent_cj_report_config_log")

public class PreventCJReportConfigLog {



    /**

     * 主键

     */

    @TableId(value = "id" , type = IdType.AUTO)

    private Long id;

    /**

     * 上报开关：0-开启；1-关闭

     */

    private Byte reportState;

    /**

     * 上报方式：0-手动；1-自动

     */

    private Byte reportType;

    /**

     * 上报数据

     */

    private String reportData;

    /**

     * 上报数据名称

     */

    private String reportDataName;

    /**

     * 最后修改时间

     */

    private Date gmtModitify;

    /**

     * 修改人

     */

    private String lastEditUserName;



    public Long getId() {

        return id;

    }



    public void setId(Long id) {

        this.id = id;

    }



    public Byte getReportState() {

        return reportState;

    }



    public void setReportState(Byte reportState) {

        this.reportState = reportState;

    }



    public Byte getReportType() {

        return reportType;

    }



    public void setReportType(Byte reportType) {

        this.reportType = reportType;

    }



    public String getReportData() {

        return reportData;

    }



    public void setReportData(String reportData) {

        this.reportData = reportData;

    }



    public String getReportDataName() {

        return reportDataName;

    }



    public void setReportDataName(String reportDataName) {

        this.reportDataName = reportDataName;

    }



    public Date getGmtModitify() {

        return gmtModitify;

    }



    public void setGmtModitify(Date gmtModitify) {

        this.gmtModitify = gmtModitify;

    }



    public String getLastEditUserName() {

        return lastEditUserName;

    }



    public void setLastEditUserName(String lastEditUserName) {

        this.lastEditUserName = lastEditUserName;

    }

}

package com.ruoyi.doublePrevention.entity.CJReport;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;

import java.util.Date;

@TableName("prevent_cj_report_config_log")
public class PreventCJReportConfigLog {

    /**
     * 主键
     */
    @TableId(value = "id" , type = IdType.AUTO)
    private Long id;
    /**
     * 上报开关：0-开启；1-关闭
     */
    private Byte reportState;
    /**
     * 上报方式：0-手动；1-自动
     */
    private Byte reportType;
    /**
     * 上报数据
     */
    private String reportData;
    /**
     * 上报数据名称
     */
    private String reportDataName;
    /**
     * 最后修改时间
     */
    private Date gmtModitify;
    /**
     * 修改人
     */
    private String lastEditUserName;

    public Long getId() {
        return id;
    }

    public void setId(Long id) {
        this.id = id;
    }

    public Byte getReportState() {
        return reportState;
    }

    public void setReportState(Byte reportState) {
        this.reportState = reportState;
    }

    public Byte getReportType() {
        return reportType;
    }

    public void setReportType(Byte reportType) {
        this.reportType = reportType;
    }

    public String getReportData() {
        return reportData;
    }

    public void setReportData(String reportData) {
        this.reportData = reportData;
    }

    public String getReportDataName() {
        return reportDataName;
    }

    public void setReportDataName(String reportDataName) {
        this.reportDataName = reportDataName;
    }

    public Date getGmtModitify() {
        return gmtModitify;
    }

    public void setGmtModitify(Date gmtModitify) {
        this.gmtModitify = gmtModitify;
    }

    public String getLastEditUserName() {
        return lastEditUserName;
    }

    public void setLastEditUserName(String lastEditUserName) {
        this.lastEditUserName = lastEditUserName;
    }
}

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

@@ -1,151 +1,151 @@
package com.ruoyi.doublePrevention.entity.CJReport;



import com.baomidou.mybatisplus.annotation.IdType;

import com.baomidou.mybatisplus.annotation.TableId;

import com.baomidou.mybatisplus.annotation.TableName;

import lombok.Data;



import java.io.Serializable;

import java.util.Date;



@Data

@TableName("prevent_cj_report_danger_info")

public class PreventCJReportDangerInfo implements Serializable {

    /**

     * 主键

     */

    @TableId(value = "id" , type = IdType.AUTO)

    private Integer indexId;

    /**

     * 主键

     */

    private String id;

    /**

     * 公司编码

     */

    private String companyCode;

    /**

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

     */

    private String deleted;

    /**

     * 创建时间

     */

    private Date createDate;

    /**

     * 创建人

     */

    private String createBy;

    /**

     * 最后修改时间

     */

    private Date updateDate;

    /**

     * 修改人

     */

    private String updateBy;

    /**

     * 安全风险分析对象编码

     */

    private String hazardCode;

    /**

     * 管控措施 ID-->管控措施UUID

     */

    private String riskMeasureId;

    /**

     * 隐患排查记录 ID-->隐患排查任务UUID

     */

    private String checkRecordId;

    /**

     * 隐患名称

     */

    private String dangerName;

    /**

     * 隐患等级

     */

    private String dangerLevel;

    /**

     *  隐患来源

     */

    private String dangerSrc;

    /**

     * 隐患治理类型

     */

    private String dangerManageType;

    /**

     * 隐患描述

     */

    private String dangerDesc;

    /**

     * 隐患产生原因

     */

    private String dangerReason;

    /**

     * 控制措施

     */

    private String controlMeasures;

    /**

     * 资金

     */

    private String cost;

    /**

     * 隐患治理期限

     */

    private Date dangerManageDeadline;

    /**

     * 隐患状态

     */

    private String dangerState;

    /**

     * 隐患类型

     */

    private String hazardDangerType;

    /**

     * 登记人姓名

     */

    private String registrant;

    /**

     * 登记时间

     */

    private Date registTime;

    /**

     * 整改责任人姓名

     */

    private String liablePerson;

    /**

     * 验收人

     */

    private String checkAcceptPerson;

    /**

     * 验收情况

     */

    private String checkAcceptComment;

    /**

     * 验收时间

     */

    private Date checkAcceptTime;

    /**

     * 上报时间

     */

    private Date reportTime;

    /**

     * 上报状态 1-待上报；2-已上报；3-不上报

     */

    private Byte reportStatus;

    /**

     * 数据来源  1-本系统排查任务产生；2-同步数据

     */

    private Byte dataSource;

    /**

     * 数据来源  1-本系统排查任务产生；2-同步数据

     */

    private Long dangerManagerId;

    /**

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

     */

    private String hazardCategory;







}



package com.ruoyi.doublePrevention.entity.CJReport;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;

@Data
@TableName("prevent_cj_report_danger_info")
public class PreventCJReportDangerInfo implements Serializable {
    /**
     * 主键
     */
    @TableId(value = "id" , type = IdType.AUTO)
    private Integer indexId;
    /**
     * 主键
     */
    private String id;
    /**
     * 公司编码
     */
    private String companyCode;
    /**
     * 删除标志：0-有效，1-删除
     */
    private String deleted;
    /**
     * 创建时间
     */
    private Date createDate;
    /**
     * 创建人
     */
    private String createBy;
    /**
     * 最后修改时间
     */
    private Date updateDate;
    /**
     * 修改人
     */
    private String updateBy;
    /**
     * 安全风险分析对象编码
     */
    private String hazardCode;
    /**
     * 管控措施 ID-->管控措施UUID
     */
    private String riskMeasureId;
    /**
     * 隐患排查记录 ID-->隐患排查任务UUID
     */
    private String checkRecordId;
    /**
     * 隐患名称
     */
    private String dangerName;
    /**
     * 隐患等级
     */
    private String dangerLevel;
    /**
     *  隐患来源
     */
    private String dangerSrc;
    /**
     * 隐患治理类型
     */
    private String dangerManageType;
    /**
     * 隐患描述
     */
    private String dangerDesc;
    /**
     * 隐患产生原因
     */
    private String dangerReason;
    /**
     * 控制措施
     */
    private String controlMeasures;
    /**
     * 资金
     */
    private String cost;
    /**
     * 隐患治理期限
     */
    private Date dangerManageDeadline;
    /**
     * 隐患状态
     */
    private String dangerState;
    /**
     * 隐患类型
     */
    private String hazardDangerType;
    /**
     * 登记人姓名
     */
    private String registrant;
    /**
     * 登记时间
     */
    private Date registTime;
    /**
     * 整改责任人姓名
     */
    private String liablePerson;
    /**
     * 验收人
     */
    private String checkAcceptPerson;
    /**
     * 验收情况
     */
    private String checkAcceptComment;
    /**
     * 验收时间
     */
    private Date checkAcceptTime;
    /**
     * 上报时间
     */
    private Date reportTime;
    /**
     * 上报状态 1-待上报；2-已上报；3-不上报
     */
    private Byte reportStatus;
    /**
     * 数据来源  1-本系统排查任务产生；2-同步数据
     */
    private Byte dataSource;
    /**
     * 数据来源  1-本系统排查任务产生；2-同步数据
     */
    private Long dangerManagerId;
    /**
     * 隐患类别(其他隐患0 ;主要负责人隐患1;技术负责人隐患2 ;操作负责人隐患3
     */
    private String hazardCategory;



}


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

@@ -1,84 +1,84 @@
package com.ruoyi.doublePrevention.entity.CJReport;



import com.baomidou.mybatisplus.annotation.IdType;

import com.baomidou.mybatisplus.annotation.TableId;

import com.baomidou.mybatisplus.annotation.TableName;

import lombok.Data;



import java.util.Date;



@Data

@TableName("prevent_cj_report_overhaul_log")

public class PreventCJReportOverhaulLog {



    /**

     * 主键

     */

    @TableId(value = "id" , type = IdType.AUTO)

    private Integer indexId;



    /**

     * 主键

     */

    private String id;

    /**

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

     */

    private String deleted;

    /**

     * 公司编码

     */

    private String companyCode;

    /**

     * 风险分析对象编码

     */

    private String hazardCode;

    /**

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

     */

    private String riskUnitId;

    /**

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

     */

    private Date stopStartTime;

    /**

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

     */

    private Date stopEndTime;

    /**

     * 描述停用原因

     */

    private String stopReason;



    /**

     * 上报时间

     */

    private Date reportTime;

    /**

     * 上报状态 1-待上报；2-已上报；3-不上报

     */

    private Byte reportStatus;

    /**

     * 数据来源  1-本系统排查任务产生；2-同步数据

     */

    private Byte dataSource;



    /**

     * 创建时间

     */

    private Date createDate;

    /**

     * 创建人

     */

    private String createBy;

    /**

     * 最后修改时间

     */

    private Date updateDate;

    /**

     * 修改人

     */

    private String updateBy;





}

package com.ruoyi.doublePrevention.entity.CJReport;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

import java.util.Date;

@Data
@TableName("prevent_cj_report_overhaul_log")
public class PreventCJReportOverhaulLog {

    /**
     * 主键
     */
    @TableId(value = "id" , type = IdType.AUTO)
    private Integer indexId;

    /**
     * 主键
     */
    private String id;
    /**
     * 删除标志：0-有效，1-删除
     */
    private String deleted;
    /**
     * 公司编码
     */
    private String companyCode;
    /**
     * 风险分析对象编码
     */
    private String hazardCode;
    /**
     * 所属安全风险分析单元uuid
     */
    private String riskUnitId;
    /**
     * 装置停用或者检维修开始时间
     */
    private Date stopStartTime;
    /**
     * 装置停用或者检维修结束时间
     */
    private Date stopEndTime;
    /**
     * 描述停用原因
     */
    private String stopReason;

    /**
     * 上报时间
     */
    private Date reportTime;
    /**
     * 上报状态 1-待上报；2-已上报；3-不上报
     */
    private Byte reportStatus;
    /**
     * 数据来源  1-本系统排查任务产生；2-同步数据
     */
    private Byte dataSource;

    /**
     * 创建时间
     */
    private Date createDate;
    /**
     * 创建人
     */
    private String createBy;
    /**
     * 最后修改时间
     */
    private Date updateDate;
    /**
     * 修改人
     */
    private String updateBy;


}

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

@@ -1,230 +1,230 @@
package com.ruoyi.doublePrevention.entity.CJReport;



import com.baomidou.mybatisplus.annotation.IdType;

import com.baomidou.mybatisplus.annotation.TableId;

import com.baomidou.mybatisplus.annotation.TableName;



import java.io.Serializable;

import java.util.Date;



@TableName("prevent_cj_report_point")

public class PreventCJReportPoint implements Serializable {

    /**

     * 主键

     */

    @TableId(value = "id" , type = IdType.AUTO)

    private Integer indexId;

    /**

     * 主键

     */

    private String id;

    /**

     * 公司编码

     */

    private String companyCode;

    /**

     * 删除标志：0-未删除、1-已删除、2-更新

     */

    private String deleted;

    /**

     * 创建时间

     */

    private Date createDate;

    /**

     * 创建人

     */

    private String createBy;

    /**

     * 最后修改时间

     */

    private Date updateDate;

    /**

     * 修改人

     */

    private String updateBy;

    /**

     * 风险单元

     */

    private String riskUnitIds;

    /**

     * 风险事件

     */

    private String riskEventIds;

    /**

     * 管控措施

     */

    private String riskMeasureIds;

    /**

     * 责任部门

     */

    private String hazardDep;

    /**

     * 安全风险分析对象编码

     */

    private String hazardCode;

    /**

     * 责任人姓名

     */

    private String hazardLiablePerson;

    /**

     * 上报时间

     */

    private Date reportTime;

    /**

     * 上报状态 1-待上报；2-已上报；3-不上报

     */

    private Byte reportStatus;

    /**

     * 数据来源  1-本系统排查任务产生；2-同步数据

     */

    private Byte dataSource;

    /**

     * 风险事件id

     */

    private Long riskEventId;



    public String getRiskUnitIds() {

        return riskUnitIds;

    }



    public void setRiskUnitIds(String riskUnitIds) {

        this.riskUnitIds = riskUnitIds;

    }



    public String getRiskEventIds() {

        return riskEventIds;

    }



    public void setRiskEventIds(String riskEventIds) {

        this.riskEventIds = riskEventIds;

    }



    public String getRiskMeasureIds() {

        return riskMeasureIds;

    }



    public void setRiskMeasureIds(String riskMeasureIds) {

        this.riskMeasureIds = riskMeasureIds;

    }



    public String getHazardCode() {

        return hazardCode;

    }



    public void setHazardCode(String hazardCode) {

        this.hazardCode = hazardCode;

    }



    public String getHazardDep() {

        return hazardDep;

    }



    public void setHazardDep(String hazardDep) {

        this.hazardDep = hazardDep;

    }



    public String getHazardLiablePerson() {

        return hazardLiablePerson;

    }



    public void setHazardLiablePerson(String hazardLiablePerson) {

        this.hazardLiablePerson = hazardLiablePerson;

    }



    public Long getRiskEventId() {

        return riskEventId;

    }



    public void setRiskEventId(Long riskEventId) {

        this.riskEventId = riskEventId;

    }



    public String getDeleted() {

        return deleted;

    }

    public void setDeleted(String deleted) {

        this.deleted = deleted;

    }



    public Integer getIndexId() {

        return indexId;

    }



    public void setIndexId(Integer indexId) {

        this.indexId = indexId;

    }



    public String getId() {

        return id;

    }



    public void setId(String id) {

        this.id = id;

    }



    public String getCompanyCode() {

        return companyCode;

    }



    public void setCompanyCode(String companyCode) {

        this.companyCode = companyCode;

    }



    public Date getCreateDate() {

        return createDate;

    }



    public void setCreateDate(Date createDate) {

        this.createDate = createDate;

    }



    public String getCreateBy() {

        return createBy;

    }



    public void setCreateBy(String createBy) {

        this.createBy = createBy;

    }



    public Date getUpdateDate() {

        return updateDate;

    }



    public void setUpdateDate(Date updateDate) {

        this.updateDate = updateDate;

    }



    public String getUpdateBy() {

        return updateBy;

    }



    public void setUpdateBy(String updateBy) {

        this.updateBy = updateBy;

    }



    public Date getReportTime() {

        return reportTime;

    }



    public void setReportTime(Date reportTime) {

        this.reportTime = reportTime;

    }



    public Byte getReportStatus() {

        return reportStatus;

    }



    public void setReportStatus(Byte reportStatus) {

        this.reportStatus = reportStatus;

    }



    public Byte getDataSource() {

        return dataSource;

    }



    public void setDataSource(Byte dataSource) {

        this.dataSource = dataSource;

    }



}



package com.ruoyi.doublePrevention.entity.CJReport;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;

import java.io.Serializable;
import java.util.Date;

@TableName("prevent_cj_report_point")
public class PreventCJReportPoint implements Serializable {
    /**
     * 主键
     */
    @TableId(value = "id" , type = IdType.AUTO)
    private Integer indexId;
    /**
     * 主键
     */
    private String id;
    /**
     * 公司编码
     */
    private String companyCode;
    /**
     * 删除标志：0-未删除、1-已删除、2-更新
     */
    private String deleted;
    /**
     * 创建时间
     */
    private Date createDate;
    /**
     * 创建人
     */
    private String createBy;
    /**
     * 最后修改时间
     */
    private Date updateDate;
    /**
     * 修改人
     */
    private String updateBy;
    /**
     * 风险单元
     */
    private String riskUnitIds;
    /**
     * 风险事件
     */
    private String riskEventIds;
    /**
     * 管控措施
     */
    private String riskMeasureIds;
    /**
     * 责任部门
     */
    private String hazardDep;
    /**
     * 安全风险分析对象编码
     */
    private String hazardCode;
    /**
     * 责任人姓名
     */
    private String hazardLiablePerson;
    /**
     * 上报时间
     */
    private Date reportTime;
    /**
     * 上报状态 1-待上报；2-已上报；3-不上报
     */
    private Byte reportStatus;
    /**
     * 数据来源  1-本系统排查任务产生；2-同步数据
     */
    private Byte dataSource;
    /**
     * 风险事件id
     */
    private Long riskEventId;

    public String getRiskUnitIds() {
        return riskUnitIds;
    }

    public void setRiskUnitIds(String riskUnitIds) {
        this.riskUnitIds = riskUnitIds;
    }

    public String getRiskEventIds() {
        return riskEventIds;
    }

    public void setRiskEventIds(String riskEventIds) {
        this.riskEventIds = riskEventIds;
    }

    public String getRiskMeasureIds() {
        return riskMeasureIds;
    }

    public void setRiskMeasureIds(String riskMeasureIds) {
        this.riskMeasureIds = riskMeasureIds;
    }

    public String getHazardCode() {
        return hazardCode;
    }

    public void setHazardCode(String hazardCode) {
        this.hazardCode = hazardCode;
    }

    public String getHazardDep() {
        return hazardDep;
    }

    public void setHazardDep(String hazardDep) {
        this.hazardDep = hazardDep;
    }

    public String getHazardLiablePerson() {
        return hazardLiablePerson;
    }

    public void setHazardLiablePerson(String hazardLiablePerson) {
        this.hazardLiablePerson = hazardLiablePerson;
    }

    public Long getRiskEventId() {
        return riskEventId;
    }

    public void setRiskEventId(Long riskEventId) {
        this.riskEventId = riskEventId;
    }

    public String getDeleted() {
        return deleted;
    }
    public void setDeleted(String deleted) {
        this.deleted = deleted;
    }

    public Integer getIndexId() {
        return indexId;
    }

    public void setIndexId(Integer indexId) {
        this.indexId = indexId;
    }

    public String getId() {
        return id;
    }

    public void setId(String id) {
        this.id = id;
    }

    public String getCompanyCode() {
        return companyCode;
    }

    public void setCompanyCode(String companyCode) {
        this.companyCode = companyCode;
    }

    public Date getCreateDate() {
        return createDate;
    }

    public void setCreateDate(Date createDate) {
        this.createDate = createDate;
    }

    public String getCreateBy() {
        return createBy;
    }

    public void setCreateBy(String createBy) {
        this.createBy = createBy;
    }

    public Date getUpdateDate() {
        return updateDate;
    }

    public void setUpdateDate(Date updateDate) {
        this.updateDate = updateDate;
    }

    public String getUpdateBy() {
        return updateBy;
    }

    public void setUpdateBy(String updateBy) {
        this.updateBy = updateBy;
    }

    public Date getReportTime() {
        return reportTime;
    }

    public void setReportTime(Date reportTime) {
        this.reportTime = reportTime;
    }

    public Byte getReportStatus() {
        return reportStatus;
    }

    public void setReportStatus(Byte reportStatus) {
        this.reportStatus = reportStatus;
    }

    public Byte getDataSource() {
        return dataSource;
    }

    public void setDataSource(Byte dataSource) {
        this.dataSource = dataSource;
    }

}


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

@@ -1,67 +1,67 @@
package com.ruoyi.doublePrevention.entity.CJReport;



import com.baomidou.mybatisplus.annotation.IdType;

import com.baomidou.mybatisplus.annotation.TableId;

import com.baomidou.mybatisplus.annotation.TableName;

//import com.gkhy.safePlatform.doublePrevention.entity.CJReport.CJdto.ErrorMsgDetails;



import java.util.Date;

import java.util.List;



/**

 * 未确定使用哪种方式，可以使用众泰的存储结果的方法

 * */

@TableName("prevent_cj_report_result_data")

public class PreventCJReportResultData {



    /**

     * 主键id

     * */

    @TableId(value = "id" , type = IdType.AUTO)

    private Long id;

    /**

     * 返回code

     * */

    private String code;

//    /**

//     * 返回的一个list集合

//     * */

//    private List<ErrorMsgDetails> data;

    /**

     * 上报数据来源标识

     * */

    private String errorMsg;





    public Long getId() {

        return id;

    }



    public void setId(Long id) {

        this.id = id;

    }



    public String getCode() {

        return code;

    }



    public void setCode(String code) {

        this.code = code;

    }



//    public List<ErrorMsgDetails> getData() {

//        return data;

//    }

//

//    public void setData(List<ErrorMsgDetails> data) {

//        this.data = data;

//    }



    public String getErrorMsg() {

        return errorMsg;

    }



    public void setErrorMsg(String errorMsg) {

        this.errorMsg = errorMsg;

    }

}

package com.ruoyi.doublePrevention.entity.CJReport;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
//import com.gkhy.safePlatform.doublePrevention.entity.CJReport.CJdto.ErrorMsgDetails;

import java.util.Date;
import java.util.List;

/**
 * 未确定使用哪种方式，可以使用众泰的存储结果的方法
 * */
@TableName("prevent_cj_report_result_data")
public class PreventCJReportResultData {

    /**
     * 主键id
     * */
    @TableId(value = "id" , type = IdType.AUTO)
    private Long id;
    /**
     * 返回code
     * */
    private String code;
//    /**
//     * 返回的一个list集合
//     * */
//    private List<ErrorMsgDetails> data;
    /**
     * 上报数据来源标识
     * */
    private String errorMsg;


    public Long getId() {
        return id;
    }

    public void setId(Long id) {
        this.id = id;
    }

    public String getCode() {
        return code;
    }

    public void setCode(String code) {
        this.code = code;
    }

//    public List<ErrorMsgDetails> getData() {
//        return data;
//    }
//
//    public void setData(List<ErrorMsgDetails> data) {
//        this.data = data;
//    }

    public String getErrorMsg() {
        return errorMsg;
    }

    public void setErrorMsg(String errorMsg) {
        this.errorMsg = errorMsg;
    }
}

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

@@ -1,209 +1,209 @@
package com.ruoyi.doublePrevention.entity.CJReport;



import com.baomidou.mybatisplus.annotation.IdType;

import com.baomidou.mybatisplus.annotation.TableId;

import com.baomidou.mybatisplus.annotation.TableName;

import com.fasterxml.jackson.annotation.JsonFormat;



import java.io.Serializable;

import java.util.Date;



@TableName("prevent_cj_report_risk_ana_unit")

public class PreventCJReportRiskAnaUnit implements Serializable {

    /**

     * 主键

     */

    @TableId(value = "id" , type = IdType.AUTO)

    private Integer indexId;

    /**

     * 主键

     */

    private String id;

    /**

     * 公司编码

     */

    private String companyCode;

    /**

     * 安全风险分析单元名称

     */

    private String riskUnitName;

    /**

     * 安全风险分析对象编码

     */

    private String hazardCode;

    /**

     * 责任部门

     */

    private String hazardDep;

    /**

     * 责任人姓名

     */

    private String hazardLiablePerson;

    /**

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

     */

    private String deleted;

    /**

     * 创建时间

     */

    private Date createDate;

    /**

     * 创建人

     */

    private String createBy;

    /**

     * 最后修改时间

     */

    private Date updateDate;

    /**

     * 修改人

     */

    private String updateBy;

    /**

     * 上报时间

     */

    private Date reportTime;

    /**

     * 上报状态 1-待上报；2-已上报；3-不上报

     */

    private Byte reportStatus;

    /**

     * 数据来源  1-本系统排查任务产生；2-同步数据

     */

    private Byte dataSource;

    /**

     * 风险分析单元id

     */

    private Long riskUnitId;



    public Long getRiskUnitId() {

        return riskUnitId;

    }



    public void setRiskUnitId(Long riskUnitId) {

        this.riskUnitId = riskUnitId;

    }



    public String getDeleted() {

        return deleted;

    }



    public void setDeleted(String deleted) {

        this.deleted = deleted;

    }



    public Byte getReportStatus() {

        return reportStatus;

    }



    public void setReportStatus(Byte reportStatus) {

        this.reportStatus = reportStatus;

    }



    public Byte getDataSource() {

        return dataSource;

    }



    public void setDataSource(Byte dataSource) {

        this.dataSource = dataSource;

    }



    public String getId() {

        return id;

    }



    public void setId(String id) {

        this.id = id;

    }



    public String getCompanyCode() {

        return companyCode;

    }



    public void setCompanyCode(String companyCode) {

        this.companyCode = companyCode;

    }



    public String getRiskUnitName() {

        return riskUnitName;

    }



    public void setRiskUnitName(String riskUnitName) {

        this.riskUnitName = riskUnitName;

    }



    public Integer getIndexId() {

        return indexId;

    }



    public void setIndexId(Integer indexId) {

        this.indexId = indexId;

    }



    public String getHazardCode() {

        return hazardCode;

    }



    public void setHazardCode(String hazardCode) {

        this.hazardCode = hazardCode;

    }



    public String getHazardDep() {

        return hazardDep;

    }



    public void setHazardDep(String hazardDep) {

        this.hazardDep = hazardDep;

    }



    public String getHazardLiablePerson() {

        return hazardLiablePerson;

    }



    public void setHazardLiablePerson(String hazardLiablePerson) {

        this.hazardLiablePerson = hazardLiablePerson;

    }



    public Date getCreateDate() {

        return createDate;

    }



    public void setCreateDate(Date createDate) {

        this.createDate = createDate;

    }



    public String getCreateBy() {

        return createBy;

    }



    public void setCreateBy(String createBy) {

        this.createBy = createBy;

    }



    public Date getUpdateDate() {

        return updateDate;

    }



    public void setUpdateDate(Date updateDate) {

        this.updateDate = updateDate;

    }



    public String getUpdateBy() {

        return updateBy;

    }



    public void setUpdateBy(String updateBy) {

        this.updateBy = updateBy;

    }



    public Date getReportTime() {

        return reportTime;

    }



    public void setReportTime(Date reportTime) {

        this.reportTime = reportTime;

    }





}



package com.ruoyi.doublePrevention.entity.CJReport;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;

import java.io.Serializable;
import java.util.Date;

@TableName("prevent_cj_report_risk_ana_unit")
public class PreventCJReportRiskAnaUnit implements Serializable {
    /**
     * 主键
     */
    @TableId(value = "id" , type = IdType.AUTO)
    private Integer indexId;
    /**
     * 主键
     */
    private String id;
    /**
     * 公司编码
     */
    private String companyCode;
    /**
     * 安全风险分析单元名称
     */
    private String riskUnitName;
    /**
     * 安全风险分析对象编码
     */
    private String hazardCode;
    /**
     * 责任部门
     */
    private String hazardDep;
    /**
     * 责任人姓名
     */
    private String hazardLiablePerson;
    /**
     * 删除标志：0-有效，1-删除
     */
    private String deleted;
    /**
     * 创建时间
     */
    private Date createDate;
    /**
     * 创建人
     */
    private String createBy;
    /**
     * 最后修改时间
     */
    private Date updateDate;
    /**
     * 修改人
     */
    private String updateBy;
    /**
     * 上报时间
     */
    private Date reportTime;
    /**
     * 上报状态 1-待上报；2-已上报；3-不上报
     */
    private Byte reportStatus;
    /**
     * 数据来源  1-本系统排查任务产生；2-同步数据
     */
    private Byte dataSource;
    /**
     * 风险分析单元id
     */
    private Long riskUnitId;

    public Long getRiskUnitId() {
        return riskUnitId;
    }

    public void setRiskUnitId(Long riskUnitId) {
        this.riskUnitId = riskUnitId;
    }

    public String getDeleted() {
        return deleted;
    }

    public void setDeleted(String deleted) {
        this.deleted = deleted;
    }

    public Byte getReportStatus() {
        return reportStatus;
    }

    public void setReportStatus(Byte reportStatus) {
        this.reportStatus = reportStatus;
    }

    public Byte getDataSource() {
        return dataSource;
    }

    public void setDataSource(Byte dataSource) {
        this.dataSource = dataSource;
    }

    public String getId() {
        return id;
    }

    public void setId(String id) {
        this.id = id;
    }

    public String getCompanyCode() {
        return companyCode;
    }

    public void setCompanyCode(String companyCode) {
        this.companyCode = companyCode;
    }

    public String getRiskUnitName() {
        return riskUnitName;
    }

    public void setRiskUnitName(String riskUnitName) {
        this.riskUnitName = riskUnitName;
    }

    public Integer getIndexId() {
        return indexId;
    }

    public void setIndexId(Integer indexId) {
        this.indexId = indexId;
    }

    public String getHazardCode() {
        return hazardCode;
    }

    public void setHazardCode(String hazardCode) {
        this.hazardCode = hazardCode;
    }

    public String getHazardDep() {
        return hazardDep;
    }

    public void setHazardDep(String hazardDep) {
        this.hazardDep = hazardDep;
    }

    public String getHazardLiablePerson() {
        return hazardLiablePerson;
    }

    public void setHazardLiablePerson(String hazardLiablePerson) {
        this.hazardLiablePerson = hazardLiablePerson;
    }

    public Date getCreateDate() {
        return createDate;
    }

    public void setCreateDate(Date createDate) {
        this.createDate = createDate;
    }

    public String getCreateBy() {
        return createBy;
    }

    public void setCreateBy(String createBy) {
        this.createBy = createBy;
    }

    public Date getUpdateDate() {
        return updateDate;
    }

    public void setUpdateDate(Date updateDate) {
        this.updateDate = updateDate;
    }

    public String getUpdateBy() {
        return updateBy;
    }

    public void setUpdateBy(String updateBy) {
        this.updateBy = updateBy;
    }

    public Date getReportTime() {
        return reportTime;
    }

    public void setReportTime(Date reportTime) {
        this.reportTime = reportTime;
    }


}


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

@@ -1,244 +1,244 @@
package com.ruoyi.doublePrevention.entity.CJReport;



import com.baomidou.mybatisplus.annotation.IdType;

import com.baomidou.mybatisplus.annotation.TableId;

import com.baomidou.mybatisplus.annotation.TableName;



import java.io.Serializable;

import java.util.Date;



@TableName("prevent_cj_report_risk_control_measure")

public class PreventCJReportRiskControlMeasure implements Serializable {

    /**

     * 主键

     */

    @TableId(value = "id" , type = IdType.AUTO)

    private Integer indexId;

    /**

     * 主键

     */

    private String id;

    /**

     * 公司编码

     */

    private String companyCode;

    /**

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

     */

    private String deleted;

    /**

     * 创建时间

     */

    private Date createDate;

    /**

     * 创建人

     */

    private String createBy;

    /**

     * 最后修改时间

     */

    private Date updateDate;

    /**

     * 修改人

     */

    private String updateBy;

    /**

     * 风险事件单元 UUID

     */

    private String riskEventId;

    /**

     * 管控方式

     */

    private String dataSrc;

    /**

     * 管控措施描述

     */

    private String riskMeasureDesc;

    /**

     * 隐患排查内容

     */

    private String troubleshootContent;

    /**

     * 管控措施分类1

     */

    private String classify1;

    /**

     * 管控措施分类2

     */

    private String classify2;

    /**

     * 管控措施分类3

     */

    private String classify3;

    /**

     * 上报时间

     */

    private Date reportTime;

    /**

     * 上报状态 1-待上报；2-已上报；3-不上报

     */

    private Byte reportStatus;

    /**

     * 数据来源  1-本系统排查任务产生；2-同步数据

     */

    private Byte dataSource;

    /**

     * 管控措施id

     */

    private Long riskMeasureId;



    public Long getRiskMeasureId() {

        return riskMeasureId;

    }



    public void setRiskMeasureId(Long riskMeasureId) {

        this.riskMeasureId = riskMeasureId;

    }



    public Integer getIndexId() {

        return indexId;

    }



    public void setIndexId(Integer indexId) {

        this.indexId = indexId;

    }



    public String getId() {

        return id;

    }



    public void setId(String id) {

        this.id = id;

    }



    public String getCompanyCode() {

        return companyCode;

    }



    public void setCompanyCode(String companyCode) {

        this.companyCode = companyCode;

    }





    public Date getCreateDate() {

        return createDate;

    }



    public void setCreateDate(Date createDate) {

        this.createDate = createDate;

    }



    public String getCreateBy() {

        return createBy;

    }



    public void setCreateBy(String createBy) {

        this.createBy = createBy;

    }



    public Date getUpdateDate() {

        return updateDate;

    }



    public void setUpdateDate(Date updateDate) {

        this.updateDate = updateDate;

    }



    public String getUpdateBy() {

        return updateBy;

    }



    public void setUpdateBy(String updateBy) {

        this.updateBy = updateBy;

    }



    public String getRiskEventId() {

        return riskEventId;

    }



    public void setRiskEventId(String riskEventId) {

        this.riskEventId = riskEventId;

    }



    public String getDataSrc() {

        return dataSrc;

    }



    public void setDataSrc(String dataSrc) {

        this.dataSrc = dataSrc;

    }



    public String getRiskMeasureDesc() {

        return riskMeasureDesc;

    }



    public void setRiskMeasureDesc(String riskMeasureDesc) {

        this.riskMeasureDesc = riskMeasureDesc;

    }



    public String getTroubleshootContent() {

        return troubleshootContent;

    }



    public void setTroubleshootContent(String troubleshootContent) {

        this.troubleshootContent = troubleshootContent;

    }



    public String getDeleted() {

        return deleted;

    }



    public void setDeleted(String deleted) {

        this.deleted = deleted;

    }



    public String getClassify1() {

        return classify1;

    }



    public void setClassify1(String classify1) {

        this.classify1 = classify1;

    }



    public String getClassify2() {

        return classify2;

    }



    public void setClassify2(String classify2) {

        this.classify2 = classify2;

    }



    public String getClassify3() {

        return classify3;

    }



    public void setClassify3(String classify3) {

        this.classify3 = classify3;

    }



    public Date getReportTime() {

        return reportTime;

    }



    public void setReportTime(Date reportTime) {

        this.reportTime = reportTime;

    }



    public Byte getReportStatus() {

        return reportStatus;

    }



    public void setReportStatus(Byte reportStatus) {

        this.reportStatus = reportStatus;

    }



    public Byte getDataSource() {

        return dataSource;

    }



    public void setDataSource(Byte dataSource) {

        this.dataSource = dataSource;

    }



}



package com.ruoyi.doublePrevention.entity.CJReport;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;

import java.io.Serializable;
import java.util.Date;

@TableName("prevent_cj_report_risk_control_measure")
public class PreventCJReportRiskControlMeasure implements Serializable {
    /**
     * 主键
     */
    @TableId(value = "id" , type = IdType.AUTO)
    private Integer indexId;
    /**
     * 主键
     */
    private String id;
    /**
     * 公司编码
     */
    private String companyCode;
    /**
     * 删除标志：0-有效，1-删除
     */
    private String deleted;
    /**
     * 创建时间
     */
    private Date createDate;
    /**
     * 创建人
     */
    private String createBy;
    /**
     * 最后修改时间
     */
    private Date updateDate;
    /**
     * 修改人
     */
    private String updateBy;
    /**
     * 风险事件单元 UUID
     */
    private String riskEventId;
    /**
     * 管控方式
     */
    private String dataSrc;
    /**
     * 管控措施描述
     */
    private String riskMeasureDesc;
    /**
     * 隐患排查内容
     */
    private String troubleshootContent;
    /**
     * 管控措施分类1
     */
    private String classify1;
    /**
     * 管控措施分类2
     */
    private String classify2;
    /**
     * 管控措施分类3
     */
    private String classify3;
    /**
     * 上报时间
     */
    private Date reportTime;
    /**
     * 上报状态 1-待上报；2-已上报；3-不上报
     */
    private Byte reportStatus;
    /**
     * 数据来源  1-本系统排查任务产生；2-同步数据
     */
    private Byte dataSource;
    /**
     * 管控措施id
     */
    private Long riskMeasureId;

    public Long getRiskMeasureId() {
        return riskMeasureId;
    }

    public void setRiskMeasureId(Long riskMeasureId) {
        this.riskMeasureId = riskMeasureId;
    }

    public Integer getIndexId() {
        return indexId;
    }

    public void setIndexId(Integer indexId) {
        this.indexId = indexId;
    }

    public String getId() {
        return id;
    }

    public void setId(String id) {
        this.id = id;
    }

    public String getCompanyCode() {
        return companyCode;
    }

    public void setCompanyCode(String companyCode) {
        this.companyCode = companyCode;
    }


    public Date getCreateDate() {
        return createDate;
    }

    public void setCreateDate(Date createDate) {
        this.createDate = createDate;
    }

    public String getCreateBy() {
        return createBy;
    }

    public void setCreateBy(String createBy) {
        this.createBy = createBy;
    }

    public Date getUpdateDate() {
        return updateDate;
    }

    public void setUpdateDate(Date updateDate) {
        this.updateDate = updateDate;
    }

    public String getUpdateBy() {
        return updateBy;
    }

    public void setUpdateBy(String updateBy) {
        this.updateBy = updateBy;
    }

    public String getRiskEventId() {
        return riskEventId;
    }

    public void setRiskEventId(String riskEventId) {
        this.riskEventId = riskEventId;
    }

    public String getDataSrc() {
        return dataSrc;
    }

    public void setDataSrc(String dataSrc) {
        this.dataSrc = dataSrc;
    }

    public String getRiskMeasureDesc() {
        return riskMeasureDesc;
    }

    public void setRiskMeasureDesc(String riskMeasureDesc) {
        this.riskMeasureDesc = riskMeasureDesc;
    }

    public String getTroubleshootContent() {
        return troubleshootContent;
    }

    public void setTroubleshootContent(String troubleshootContent) {
        this.troubleshootContent = troubleshootContent;
    }

    public String getDeleted() {
        return deleted;
    }

    public void setDeleted(String deleted) {
        this.deleted = deleted;
    }

    public String getClassify1() {
        return classify1;
    }

    public void setClassify1(String classify1) {
        this.classify1 = classify1;
    }

    public String getClassify2() {
        return classify2;
    }

    public void setClassify2(String classify2) {
        this.classify2 = classify2;
    }

    public String getClassify3() {
        return classify3;
    }

    public void setClassify3(String classify3) {
        this.classify3 = classify3;
    }

    public Date getReportTime() {
        return reportTime;
    }

    public void setReportTime(Date reportTime) {
        this.reportTime = reportTime;
    }

    public Byte getReportStatus() {
        return reportStatus;
    }

    public void setReportStatus(Byte reportStatus) {
        this.reportStatus = reportStatus;
    }

    public Byte getDataSource() {
        return dataSource;
    }

    public void setDataSource(Byte dataSource) {
        this.dataSource = dataSource;
    }

}


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

@@ -1,183 +1,183 @@
package com.ruoyi.doublePrevention.entity.CJReport;



import com.baomidou.mybatisplus.annotation.IdType;

import com.baomidou.mybatisplus.annotation.TableId;

import com.baomidou.mybatisplus.annotation.TableName;



import java.io.Serializable;

import java.util.Date;



@TableName("prevent_cj_report_risk_event")

public class PreventCJReportRiskEvent implements Serializable {

    /**

     * 主键

     */

    @TableId(value = "id" , type = IdType.AUTO)

    private Integer indexId;

    /**

     * 主键

     */

    private String id;

    /**

     * 公司编码

     */

    private String companyCode;

    /**

     * 风险事件名称

     */

    private String riskEventName;

    /**

     * 关联风险分析单元UUID

     */

    private String riskUnitId;

    /**

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

     */

    private String deleted;

    /**

     * 创建时间

     */

    private Date createDate;

    /**

     * 创建人

     */

    private String createBy;

    /**

     * 最后修改时间

     */

    private Date updateDate;

    /**

     * 修改人

     */

    private String updateBy;

    /**

     * 上报时间

     */

    private Date reportTime;

    /**

     * 上报状态 1-待上报；2-已上报；3-不上报

     */

    private Byte reportStatus;

    /**

     * 数据来源  1-本系统排查任务产生；2-同步数据

     */

    private Byte dataSource;

    /**

     * 风险事件id

     */

    private Long riskEventId;





    public Long getRiskEventId() {

        return riskEventId;

    }



    public void setRiskEventId(Long riskEventId) {

        this.riskEventId = riskEventId;

    }



    public String getDeleted() {

        return deleted;

    }

    public void setDeleted(String deleted) {

        this.deleted = deleted;

    }



    public Integer getIndexId() {

        return indexId;

    }



    public void setIndexId(Integer indexId) {

        this.indexId = indexId;

    }



    public String getId() {

        return id;

    }



    public void setId(String id) {

        this.id = id;

    }



    public String getCompanyCode() {

        return companyCode;

    }



    public void setCompanyCode(String companyCode) {

        this.companyCode = companyCode;

    }



    public String getRiskEventName() {

        return riskEventName;

    }



    public void setRiskEventName(String riskEventName) {

        this.riskEventName = riskEventName;

    }



    public String getRiskUnitId() {

        return riskUnitId;

    }



    public void setRiskUnitId(String riskUnitId) {

        this.riskUnitId = riskUnitId;

    }



    public Date getCreateDate() {

        return createDate;

    }



    public void setCreateDate(Date createDate) {

        this.createDate = createDate;

    }



    public String getCreateBy() {

        return createBy;

    }



    public void setCreateBy(String createBy) {

        this.createBy = createBy;

    }



    public Date getUpdateDate() {

        return updateDate;

    }



    public void setUpdateDate(Date updateDate) {

        this.updateDate = updateDate;

    }



    public String getUpdateBy() {

        return updateBy;

    }



    public void setUpdateBy(String updateBy) {

        this.updateBy = updateBy;

    }



    public Date getReportTime() {

        return reportTime;

    }



    public void setReportTime(Date reportTime) {

        this.reportTime = reportTime;

    }



    public Byte getReportStatus() {

        return reportStatus;

    }



    public void setReportStatus(Byte reportStatus) {

        this.reportStatus = reportStatus;

    }



    public Byte getDataSource() {

        return dataSource;

    }



    public void setDataSource(Byte dataSource) {

        this.dataSource = dataSource;

    }



}



package com.ruoyi.doublePrevention.entity.CJReport;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;

import java.io.Serializable;
import java.util.Date;

@TableName("prevent_cj_report_risk_event")
public class PreventCJReportRiskEvent implements Serializable {
    /**
     * 主键
     */
    @TableId(value = "id" , type = IdType.AUTO)
    private Integer indexId;
    /**
     * 主键
     */
    private String id;
    /**
     * 公司编码
     */
    private String companyCode;
    /**
     * 风险事件名称
     */
    private String riskEventName;
    /**
     * 关联风险分析单元UUID
     */
    private String riskUnitId;
    /**
     * 删除标志：0-有效，1-删除
     */
    private String deleted;
    /**
     * 创建时间
     */
    private Date createDate;
    /**
     * 创建人
     */
    private String createBy;
    /**
     * 最后修改时间
     */
    private Date updateDate;
    /**
     * 修改人
     */
    private String updateBy;
    /**
     * 上报时间
     */
    private Date reportTime;
    /**
     * 上报状态 1-待上报；2-已上报；3-不上报
     */
    private Byte reportStatus;
    /**
     * 数据来源  1-本系统排查任务产生；2-同步数据
     */
    private Byte dataSource;
    /**
     * 风险事件id
     */
    private Long riskEventId;


    public Long getRiskEventId() {
        return riskEventId;
    }

    public void setRiskEventId(Long riskEventId) {
        this.riskEventId = riskEventId;
    }

    public String getDeleted() {
        return deleted;
    }
    public void setDeleted(String deleted) {
        this.deleted = deleted;
    }

    public Integer getIndexId() {
        return indexId;
    }

    public void setIndexId(Integer indexId) {
        this.indexId = indexId;
    }

    public String getId() {
        return id;
    }

    public void setId(String id) {
        this.id = id;
    }

    public String getCompanyCode() {
        return companyCode;
    }

    public void setCompanyCode(String companyCode) {
        this.companyCode = companyCode;
    }

    public String getRiskEventName() {
        return riskEventName;
    }

    public void setRiskEventName(String riskEventName) {
        this.riskEventName = riskEventName;
    }

    public String getRiskUnitId() {
        return riskUnitId;
    }

    public void setRiskUnitId(String riskUnitId) {
        this.riskUnitId = riskUnitId;
    }

    public Date getCreateDate() {
        return createDate;
    }

    public void setCreateDate(Date createDate) {
        this.createDate = createDate;
    }

    public String getCreateBy() {
        return createBy;
    }

    public void setCreateBy(String createBy) {
        this.createBy = createBy;
    }

    public Date getUpdateDate() {
        return updateDate;
    }

    public void setUpdateDate(Date updateDate) {
        this.updateDate = updateDate;
    }

    public String getUpdateBy() {
        return updateBy;
    }

    public void setUpdateBy(String updateBy) {
        this.updateBy = updateBy;
    }

    public Date getReportTime() {
        return reportTime;
    }

    public void setReportTime(Date reportTime) {
        this.reportTime = reportTime;
    }

    public Byte getReportStatus() {
        return reportStatus;
    }

    public void setReportStatus(Byte reportStatus) {
        this.reportStatus = reportStatus;
    }

    public Byte getDataSource() {
        return dataSource;
    }

    public void setDataSource(Byte dataSource) {
        this.dataSource = dataSource;
    }

}


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

@@ -1,95 +1,95 @@
package com.ruoyi.doublePrevention.entity;



import com.baomidou.mybatisplus.annotation.IdType;

import com.baomidou.mybatisplus.annotation.TableId;

import com.baomidou.mybatisplus.annotation.TableName;

import lombok.Data;



import java.io.Serializable;

import java.util.Date;



@Data

@TableName("prevent_overhaul_log")

public class PreventOverhaulLog  implements Serializable {

    private static final long serialVersionUID = -61793617513430361L;



    /**

     * 主键id

     * */

    @TableId(value = "id" , type = IdType.AUTO)

    private Long id;





    private String uuid;

    /**

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

     */

    private Byte deleteStatus;

    /**

     * 创建时间

     */

    private Date gmtCreate;

    /**

     * 最后修改时间

     */

    private Date gmtModitify;

    /**

     * 创建人

     */

    private String createByUserName;

    /**

     * 修改人

     */

    private String lastEditUserName;

    /**

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

     */

    private Long riskUnitId;

    /**

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

     */

    private String riskUnitUuid;

    /**

     * 企业id

     */

    private Long enterpriseId;

    /**

     * 企业uuid

     */

    private String enterpriseUuid;



    /**

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

     */

    private Date stopStartTime;

    /**

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

     */

    private Date stopEndTime;

    /**

     * 描述停用原因

     */

    private String stopReason;

    /**

     * 风险分析对象编码

     */

    private String hazardCode;



    /**

     * 同步时间

     */

    private Date reportTime;

    /**

     * 同步数据修改时间

     */

    private Date updateReportDataTime;

    /**

     * 上报状态 1-待上报；2-已上报；3-不上报

     */

    private Byte reportStatus;

    /**

     * 上报开关 1-上报；2-不上报

     */

    private Byte reportSwitch;



}

package com.ruoyi.doublePrevention.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;

@Data
@TableName("prevent_overhaul_log")
public class PreventOverhaulLog  implements Serializable {
    private static final long serialVersionUID = -61793617513430361L;

    /**
     * 主键id
     * */
    @TableId(value = "id" , type = IdType.AUTO)
    private Long id;


    private String uuid;
    /**
     * 删除标志：0-有效，1-删除
     */
    private Byte deleteStatus;
    /**
     * 创建时间
     */
    private Date gmtCreate;
    /**
     * 最后修改时间
     */
    private Date gmtModitify;
    /**
     * 创建人
     */
    private String createByUserName;
    /**
     * 修改人
     */
    private String lastEditUserName;
    /**
     * 所属安全风险分析单元id
     */
    private Long riskUnitId;
    /**
     * 所属安全风险分析单元uuid
     */
    private String riskUnitUuid;
    /**
     * 企业id
     */
    private Long enterpriseId;
    /**
     * 企业uuid
     */
    private String enterpriseUuid;

    /**
     * 装置停用或者检维修开始时间
     */
    private Date stopStartTime;
    /**
     * 装置停用或者检维修结束时间
     */
    private Date stopEndTime;
    /**
     * 描述停用原因
     */
    private String stopReason;
    /**
     * 风险分析对象编码
     */
    private String hazardCode;

    /**
     * 同步时间
     */
    private Date reportTime;
    /**
     * 同步数据修改时间
     */
    private Date updateReportDataTime;
    /**
     * 上报状态 1-待上报；2-已上报；3-不上报
     */
    private Byte reportStatus;
    /**
     * 上报开关 1-上报；2-不上报
     */
    private Byte reportSwitch;

}

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

@@ -1,72 +1,72 @@
package com.ruoyi.doublePrevention.entity;



import com.baomidou.mybatisplus.annotation.IdType;

import com.baomidou.mybatisplus.annotation.TableId;

import com.baomidou.mybatisplus.annotation.TableName;



@TableName("prevent_risk_check_unit")

public class PreventRiskCheckUnit {



    /**

     * 主键

     * */

    @TableId(value = "id" , type = IdType.AUTO)

    private Long id;

    /**

     * uuid

     * */

    private String uuid;

    /**

     * 原-检查点id

     * */

    private Long baseCheckPointId;

    /**

     * 管控措施id

     * */

    private Long controlMeasureId;

    /**

     * 风险点-单元-基础清单 id

     * */

    private Long riskId;





    public Long getId() {

        return id;

    }



    public void setId(Long id) {

        this.id = id;

    }



    public String getUuid() {

        return uuid;

    }



    public void setUuid(String uuid) {

        this.uuid = uuid;

    }



    public Long getBaseCheckPointId() {

        return baseCheckPointId;

    }



    public void setBaseCheckPointId(Long baseCheckPointId) {

        this.baseCheckPointId = baseCheckPointId;

    }



    public Long getControlMeasureId() {

        return controlMeasureId;

    }



    public void setControlMeasureId(Long controlMeasureId) {

        this.controlMeasureId = controlMeasureId;

    }



    public Long getRiskId() {

        return riskId;

    }



    public void setRiskId(Long riskId) {

        this.riskId = riskId;

    }

}

package com.ruoyi.doublePrevention.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;

@TableName("prevent_risk_check_unit")
public class PreventRiskCheckUnit {

    /**
     * 主键
     * */
    @TableId(value = "id" , type = IdType.AUTO)
    private Long id;
    /**
     * uuid
     * */
    private String uuid;
    /**
     * 原-检查点id
     * */
    private Long baseCheckPointId;
    /**
     * 管控措施id
     * */
    private Long controlMeasureId;
    /**
     * 风险点-单元-基础清单 id
     * */
    private Long riskId;


    public Long getId() {
        return id;
    }

    public void setId(Long id) {
        this.id = id;
    }

    public String getUuid() {
        return uuid;
    }

    public void setUuid(String uuid) {
        this.uuid = uuid;
    }

    public Long getBaseCheckPointId() {
        return baseCheckPointId;
    }

    public void setBaseCheckPointId(Long baseCheckPointId) {
        this.baseCheckPointId = baseCheckPointId;
    }

    public Long getControlMeasureId() {
        return controlMeasureId;
    }

    public void setControlMeasureId(Long controlMeasureId) {
        this.controlMeasureId = controlMeasureId;
    }

    public Long getRiskId() {
        return riskId;
    }

    public void setRiskId(Long riskId) {
        this.riskId = riskId;
    }
}

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

@@ -1,47 +1,47 @@
package com.ruoyi.doublePrevention.entity;



import com.baomidou.mybatisplus.annotation.IdType;

import com.baomidou.mybatisplus.annotation.TableId;

import com.baomidou.mybatisplus.annotation.TableName;

import lombok.Data;





@Data

@TableName("prevent_risk_danger_check_and_measure")

public class PreventRiskDangerCheckAndMeasure {



    /**

     * 主键

     * */

    @TableId(value = "id" , type = IdType.AUTO)

    private Long id;

    /**

     * 核查任务id

     * */

    private Long checkId;

    /**

     * 核查任务附属表id

     * */

    private Long dangerCheckPointId;

    /**

     * 核查点id

     * */

    private Long baseCheckPointId;

    /**

     * 管控措施id

     * */

    private Long controlMeasureId;

    /**

     * job id

     * */

    private String  checkContent;

    /**

     * 排查结果：0-正常，1-存在隐患，2-未处理，3其他

     * */

    private Byte checkResult;

    /**

     * 排查上报信息

     * */

    private String checkDesc;



}

package com.ruoyi.doublePrevention.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;


@Data
@TableName("prevent_risk_danger_check_and_measure")
public class PreventRiskDangerCheckAndMeasure {

    /**
     * 主键
     * */
    @TableId(value = "id" , type = IdType.AUTO)
    private Long id;
    /**
     * 核查任务id
     * */
    private Long checkId;
    /**
     * 核查任务附属表id
     * */
    private Long dangerCheckPointId;
    /**
     * 核查点id
     * */
    private Long baseCheckPointId;
    /**
     * 管控措施id
     * */
    private Long controlMeasureId;
    /**
     * job id
     * */
    private String  checkContent;
    /**
     * 排查结果：0-正常，1-存在隐患，2-未处理，3其他
     * */
    private Byte checkResult;
    /**
     * 排查上报信息
     * */
    private String checkDesc;

}

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

@@ -1,54 +1,54 @@
package com.ruoyi.doublePrevention.entity;



import com.baomidou.mybatisplus.annotation.IdType;

import com.baomidou.mybatisplus.annotation.TableId;

import com.baomidou.mybatisplus.annotation.TableName;

import lombok.Data;



import java.util.Date;

@Data

@TableName("prevent_risk_danger_check_log")

public class PreventRiskDangerCheckLog {



    /**

     * 主键

     * */

    @TableId(value = "id" , type = IdType.AUTO)

    private Long id;

    /**

     * uuid

     * */

    private String uuid;

    /**

     * 排查任务id

     * */

    private Long checkId;

    /**

     * 排查结果：0-正常，1-存在隐患，2-未处理，3其他

     * */

    private Byte checkStatus;

    /**

     * job id

     * */

    private Long jobId;

    /**

     * 同步时间

     */

    private Date reportTime;

    /**

     * 同步数据修改时间

     */

    private Date updateReportDataTime;

    /**

     * 上报状态 1-待上报；2-已上报；3-不上报；4-变更需上传

     */

    private Byte reportStatus;

    /**

     * 上报开关 1-上报；2-不上报

     */

    private Byte reportSwitch;



    private Long mobileCode;



    private Long  dangerCheckPointId;

}

package com.ruoyi.doublePrevention.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

import java.util.Date;
@Data
@TableName("prevent_risk_danger_check_log")
public class PreventRiskDangerCheckLog {

    /**
     * 主键
     * */
    @TableId(value = "id" , type = IdType.AUTO)
    private Long id;
    /**
     * uuid
     * */
    private String uuid;
    /**
     * 排查任务id
     * */
    private Long checkId;
    /**
     * 排查结果：0-正常，1-存在隐患，2-未处理，3其他
     * */
    private Byte checkStatus;
    /**
     * job id
     * */
    private Long jobId;
    /**
     * 同步时间
     */
    private Date reportTime;
    /**
     * 同步数据修改时间
     */
    private Date updateReportDataTime;
    /**
     * 上报状态 1-待上报；2-已上报；3-不上报；4-变更需上传
     */
    private Byte reportStatus;
    /**
     * 上报开关 1-上报；2-不上报
     */
    private Byte reportSwitch;

    private Long mobileCode;

    private Long  dangerCheckPointId;
}

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

@@ -1,31 +1,31 @@
package com.ruoyi.doublePrevention.entity;



import com.baomidou.mybatisplus.annotation.IdType;

import com.baomidou.mybatisplus.annotation.TableId;

import com.baomidou.mybatisplus.annotation.TableName;

import lombok.Data;



import java.time.LocalDateTime;



@Data

@TableName("prevent_risk_danger_confirm_log")

public class PreventRiskDangerConfirmLog {



    /**

     * 主键

     * */

    @TableId(value = "id" , type = IdType.AUTO)

    private Long id;



    private Long dangerCheckPointId;



    private Long confirmUserId;



    private String confirmUser;



    private LocalDateTime confirmTime;



    private Integer confirmResult;



    private String confirmOpinion;

}

package com.ruoyi.doublePrevention.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

import java.time.LocalDateTime;

@Data
@TableName("prevent_risk_danger_confirm_log")
public class PreventRiskDangerConfirmLog {

    /**
     * 主键
     * */
    @TableId(value = "id" , type = IdType.AUTO)
    private Long id;

    private Long dangerCheckPointId;

    private Long confirmUserId;

    private String confirmUser;

    private LocalDateTime confirmTime;

    private Integer confirmResult;

    private String confirmOpinion;
}

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

@@ -1,83 +1,83 @@
package com.ruoyi.doublePrevention.entity;



import com.baomidou.mybatisplus.annotation.IdType;

import com.baomidou.mybatisplus.annotation.TableId;

import lombok.Data;



import java.util.Date;

@Data

public class PreventRiskDangerInfo {



    /**

     * 主键

     * */

    @TableId(value = "id" , type = IdType.AUTO)

    private Long id;

    /**

     * Uuid

     * */

    private String Uuid;

    /**

     * 核查任务附属表id

     * */

    private Long dangerCheckPointId;

    /**

     * hazard_code 风先分析对象编码（风险分析单元编码）

     * */

    private String hazardCode;

    /**

     *  隐患来源

     * 1-日常排查；2-综合性排查；3-专业性排查;4-季节性排查；5-重点时段及节假日前排查

     * 6-事故类比排查；7-复产复工前排查;8-外聘专家诊断式排查；9-管控措施实效;10-其他

     * */

    private Byte dangerSrc;

    /**

     * 隐患描述

     * */

    private String dangerDesc;

    /**

     * 隐患产生的原因

     * */

    private String dangerReason;

    /**

     * 隐患类型

     *  1-安全；2-工艺；3-电气；4-仪表

     *  5-消防；6-总图；7-设备；8其他

     * */

    private Byte hazardDangerType;

    /**

     * 隐患状态

     *  0-整改中

     *  1-待验收

     *  2-延期整改

     *  3-超期未整改

     *  9-已验收

     */

    private Byte dangerState;

    /**

     * 延期标识 1-正常；2-延期；

     * */

    private Byte timeoutFlag;

    /**

     * 隐患造成的结果：1-无；2-轻伤；3-重伤；4-死亡

     */

    private Byte dangerResult;

    /**

     * 同步时间

     */

    private Date reportTime;

    /**

     * 同步数据修改时间

     */

    private Date updateReportDataTime;

    /**

     * 上报状态 1-待上报；2-已上报；3-不上报；4-变更需上传

     */

    private Byte reportStatus;

    /**

     * 上报开关 1-上报；2-不上报

     */

    private Byte reportSwitch;





}

package com.ruoyi.doublePrevention.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;

import java.util.Date;
@Data
public class PreventRiskDangerInfo {

    /**
     * 主键
     * */
    @TableId(value = "id" , type = IdType.AUTO)
    private Long id;
    /**
     * Uuid
     * */
    private String Uuid;
    /**
     * 核查任务附属表id
     * */
    private Long dangerCheckPointId;
    /**
     * hazard_code 风先分析对象编码（风险分析单元编码）
     * */
    private String hazardCode;
    /**
     *  隐患来源
     * 1-日常排查；2-综合性排查；3-专业性排查;4-季节性排查；5-重点时段及节假日前排查
     * 6-事故类比排查；7-复产复工前排查;8-外聘专家诊断式排查；9-管控措施实效;10-其他
     * */
    private Byte dangerSrc;
    /**
     * 隐患描述
     * */
    private String dangerDesc;
    /**
     * 隐患产生的原因
     * */
    private String dangerReason;
    /**
     * 隐患类型
     *  1-安全；2-工艺；3-电气；4-仪表
     *  5-消防；6-总图；7-设备；8其他
     * */
    private Byte hazardDangerType;
    /**
     * 隐患状态
     *  0-整改中
     *  1-待验收
     *  2-延期整改
     *  3-超期未整改
     *  9-已验收
     */
    private Byte dangerState;
    /**
     * 延期标识 1-正常；2-延期；
     * */
    private Byte timeoutFlag;
    /**
     * 隐患造成的结果：1-无；2-轻伤；3-重伤；4-死亡
     */
    private Byte dangerResult;
    /**
     * 同步时间
     */
    private Date reportTime;
    /**
     * 同步数据修改时间
     */
    private Date updateReportDataTime;
    /**
     * 上报状态 1-待上报；2-已上报；3-不上报；4-变更需上传
     */
    private Byte reportStatus;
    /**
     * 上报开关 1-上报；2-不上报
     */
    private Byte reportSwitch;


}

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

@@ -1,121 +1,121 @@
package com.ruoyi.doublePrevention.entity;



import com.baomidou.mybatisplus.annotation.IdType;

import com.baomidou.mybatisplus.annotation.TableId;

import com.baomidou.mybatisplus.annotation.TableName;



import java.util.Date;



@TableName("prevent_risk_job_and_measure")

public class PreventRiskJobAndMeasure {



    /**

     * 主键

     * */

    @TableId(value = "id" , type = IdType.AUTO)

    private Long id;

    /**

     * job ID

     * */

    private Long jobId;

    /**

     * job uuid

     * */

    private String jobUuid;

    /**

     * 管控措施 ID

     * */

    private Long measureId;

    /**

     * 管控措施 uuid

     * */

    private String measureUuid;

    /**

     * 同步时间

     */

    private Date reportTime;

    /**

     * 同步数据修改时间

     */

    private Date updateReportDataTime;

    /**

     * 上报状态 1-待上报；2-已上报；3-不上报；4-变更需上传

     */

    private Byte reportStatus;

    /**

     * 上报开关 1-上报；2-不上报

     */

    private Byte reportSwitch;



    public Long getId() {

        return id;

    }



    public void setId(Long id) {

        this.id = id;

    }



    public Long getJobId() {

        return jobId;

    }



    public void setJobId(Long jobId) {

        this.jobId = jobId;

    }



    public String getJobUuid() {

        return jobUuid;

    }



    public void setJobUuid(String jobUuid) {

        this.jobUuid = jobUuid;

    }



    public Long getMeasureId() {

        return measureId;

    }



    public void setMeasureId(Long measureId) {

        this.measureId = measureId;

    }



    public String getMeasureUuid() {

        return measureUuid;

    }



    public void setMeasureUuid(String measureUuid) {

        this.measureUuid = measureUuid;

    }



    public Date getReportTime() {

        return reportTime;

    }



    public void setReportTime(Date reportTime) {

        this.reportTime = reportTime;

    }



    public Date getUpdateReportDataTime() {

        return updateReportDataTime;

    }



    public void setUpdateReportDataTime(Date updateReportDataTime) {

        this.updateReportDataTime = updateReportDataTime;

    }



    public Byte getReportStatus() {

        return reportStatus;

    }



    public void setReportStatus(Byte reportStatus) {

        this.reportStatus = reportStatus;

    }



    public Byte getReportSwitch() {

        return reportSwitch;

    }



    public void setReportSwitch(Byte reportSwitch) {

        this.reportSwitch = reportSwitch;

    }

}

package com.ruoyi.doublePrevention.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;

import java.util.Date;

@TableName("prevent_risk_job_and_measure")
public class PreventRiskJobAndMeasure {

    /**
     * 主键
     * */
    @TableId(value = "id" , type = IdType.AUTO)
    private Long id;
    /**
     * job ID
     * */
    private Long jobId;
    /**
     * job uuid
     * */
    private String jobUuid;
    /**
     * 管控措施 ID
     * */
    private Long measureId;
    /**
     * 管控措施 uuid
     * */
    private String measureUuid;
    /**
     * 同步时间
     */
    private Date reportTime;
    /**
     * 同步数据修改时间
     */
    private Date updateReportDataTime;
    /**
     * 上报状态 1-待上报；2-已上报；3-不上报；4-变更需上传
     */
    private Byte reportStatus;
    /**
     * 上报开关 1-上报；2-不上报
     */
    private Byte reportSwitch;

    public Long getId() {
        return id;
    }

    public void setId(Long id) {
        this.id = id;
    }

    public Long getJobId() {
        return jobId;
    }

    public void setJobId(Long jobId) {
        this.jobId = jobId;
    }

    public String getJobUuid() {
        return jobUuid;
    }

    public void setJobUuid(String jobUuid) {
        this.jobUuid = jobUuid;
    }

    public Long getMeasureId() {
        return measureId;
    }

    public void setMeasureId(Long measureId) {
        this.measureId = measureId;
    }

    public String getMeasureUuid() {
        return measureUuid;
    }

    public void setMeasureUuid(String measureUuid) {
        this.measureUuid = measureUuid;
    }

    public Date getReportTime() {
        return reportTime;
    }

    public void setReportTime(Date reportTime) {
        this.reportTime = reportTime;
    }

    public Date getUpdateReportDataTime() {
        return updateReportDataTime;
    }

    public void setUpdateReportDataTime(Date updateReportDataTime) {
        this.updateReportDataTime = updateReportDataTime;
    }

    public Byte getReportStatus() {
        return reportStatus;
    }

    public void setReportStatus(Byte reportStatus) {
        this.reportStatus = reportStatus;
    }

    public Byte getReportSwitch() {
        return reportSwitch;
    }

    public void setReportSwitch(Byte reportSwitch) {
        this.reportSwitch = reportSwitch;
    }
}

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

@@ -1,97 +1,97 @@
package com.ruoyi.doublePrevention.entity;



import com.baomidou.mybatisplus.annotation.IdType;

import com.baomidou.mybatisplus.annotation.TableId;

import com.baomidou.mybatisplus.annotation.TableName;



import java.util.Date;



@TableName("prevent_risk_unit_uuid")

public class PreventRiskUnitUuid {



    /**

     * 主键

     * */

    @TableId(value = "id" , type = IdType.AUTO)

    private Long id;

    /**

     * 风险分析单元（设施区域）id

     * */

    private Long riskUnitId;

    /**

     * 风险分析单元（设施区域）Uuid

     * */

    private String riskUnitUuid;

    /**

     * 同步时间

     */

    private Date reportTime;

    /**

     * 同步数据修改时间

     */

    private Date updateReportDataTime;

    /**

     * 上报状态 1-待上报；2-已上报；3-不上报；4-变更需上传

     */

    private Byte reportStatus;

    /**

     * 上报开关 1-上报；2-不上报

     */

    private Byte reportSwitch;



    public Date getReportTime() {

        return reportTime;

    }



    public void setReportTime(Date reportTime) {

        this.reportTime = reportTime;

    }



    public Date getUpdateReportDataTime() {

        return updateReportDataTime;

    }



    public void setUpdateReportDataTime(Date updateReportDataTime) {

        this.updateReportDataTime = updateReportDataTime;

    }



    public Byte getReportStatus() {

        return reportStatus;

    }



    public void setReportStatus(Byte reportStatus) {

        this.reportStatus = reportStatus;

    }



    public Byte getReportSwitch() {

        return reportSwitch;

    }



    public void setReportSwitch(Byte reportSwitch) {

        this.reportSwitch = reportSwitch;

    }



    public Long getId() {

        return id;

    }



    public void setId(Long id) {

        this.id = id;

    }



    public Long getRiskUnitId() {

        return riskUnitId;

    }



    public void setRiskUnitId(Long riskUnitId) {

        this.riskUnitId = riskUnitId;

    }



    public String getRiskUnitUuid() {

        return riskUnitUuid;

    }



    public void setRiskUnitUuid(String riskUnitUuid) {

        this.riskUnitUuid = riskUnitUuid;

    }

}

package com.ruoyi.doublePrevention.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;

import java.util.Date;

@TableName("prevent_risk_unit_uuid")
public class PreventRiskUnitUuid {

    /**
     * 主键
     * */
    @TableId(value = "id" , type = IdType.AUTO)
    private Long id;
    /**
     * 风险分析单元（设施区域）id
     * */
    private Long riskUnitId;
    /**
     * 风险分析单元（设施区域）Uuid
     * */
    private String riskUnitUuid;
    /**
     * 同步时间
     */
    private Date reportTime;
    /**
     * 同步数据修改时间
     */
    private Date updateReportDataTime;
    /**
     * 上报状态 1-待上报；2-已上报；3-不上报；4-变更需上传
     */
    private Byte reportStatus;
    /**
     * 上报开关 1-上报；2-不上报
     */
    private Byte reportSwitch;

    public Date getReportTime() {
        return reportTime;
    }

    public void setReportTime(Date reportTime) {
        this.reportTime = reportTime;
    }

    public Date getUpdateReportDataTime() {
        return updateReportDataTime;
    }

    public void setUpdateReportDataTime(Date updateReportDataTime) {
        this.updateReportDataTime = updateReportDataTime;
    }

    public Byte getReportStatus() {
        return reportStatus;
    }

    public void setReportStatus(Byte reportStatus) {
        this.reportStatus = reportStatus;
    }

    public Byte getReportSwitch() {
        return reportSwitch;
    }

    public void setReportSwitch(Byte reportSwitch) {
        this.reportSwitch = reportSwitch;
    }

    public Long getId() {
        return id;
    }

    public void setId(Long id) {
        this.id = id;
    }

    public Long getRiskUnitId() {
        return riskUnitId;
    }

    public void setRiskUnitId(Long riskUnitId) {
        this.riskUnitId = riskUnitId;
    }

    public String getRiskUnitUuid() {
        return riskUnitUuid;
    }

    public void setRiskUnitUuid(String riskUnitUuid) {
        this.riskUnitUuid = riskUnitUuid;
    }
}

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

@@ -1,83 +1,83 @@
package com.ruoyi.doublePrevention.entity;



import com.baomidou.mybatisplus.annotation.IdType;

import com.baomidou.mybatisplus.annotation.TableId;

import com.baomidou.mybatisplus.annotation.TableName;

import lombok.Data;



@TableName("prevent_task_type")

public class PreventTaskType {

    /**

     * 主键id

     * */

    @TableId(value = "id" , type = IdType.AUTO)

    private Long id;



    private Long jobId;



    private String jobName;



    private Long taskId;



    private String jobUuid;



    private Byte type;



    private Byte deleteStatus;



    public Long getId() {

        return id;

    }



    public void setId(Long id) {

        this.id = id;

    }



    public Long getJobId() {

        return jobId;

    }



    public void setJobId(Long jobId) {

        this.jobId = jobId;

    }



    public String getJobName() {

        return jobName;

    }



    public void setJobName(String jobName) {

        this.jobName = jobName;

    }



    public Long getTaskId() {

        return taskId;

    }



    public void setTaskId(Long taskId) {

        this.taskId = taskId;

    }



    public String getJobUuid() {

        return jobUuid;

    }



    public void setJobUuid(String jobUuid) {

        this.jobUuid = jobUuid;

    }



    public Byte getType() {

        return type;

    }



    public void setType(Byte type) {

        this.type = type;

    }



    public Byte getDeleteStatus() {

        return deleteStatus;

    }



    public void setDeleteStatus(Byte deleteStatus) {

        this.deleteStatus = deleteStatus;

    }

package com.ruoyi.doublePrevention.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

@TableName("prevent_task_type")
public class PreventTaskType {
    /**
     * 主键id
     * */
    @TableId(value = "id" , type = IdType.AUTO)
    private Long id;

    private Long jobId;

    private String jobName;

    private Long taskId;

    private String jobUuid;

    private Byte type;

    private Byte deleteStatus;

    public Long getId() {
        return id;
    }

    public void setId(Long id) {
        this.id = id;
    }

    public Long getJobId() {
        return jobId;
    }

    public void setJobId(Long jobId) {
        this.jobId = jobId;
    }

    public String getJobName() {
        return jobName;
    }

    public void setJobName(String jobName) {
        this.jobName = jobName;
    }

    public Long getTaskId() {
        return taskId;
    }

    public void setTaskId(Long taskId) {
        this.taskId = taskId;
    }

    public String getJobUuid() {
        return jobUuid;
    }

    public void setJobUuid(String jobUuid) {
        this.jobUuid = jobUuid;
    }

    public Byte getType() {
        return type;
    }

    public void setType(Byte type) {
        this.type = type;
    }

    public Byte getDeleteStatus() {
        return deleteStatus;
    }

    public void setDeleteStatus(Byte deleteStatus) {
        this.deleteStatus = deleteStatus;
    }
}

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

@@ -1,133 +1,133 @@
package com.ruoyi.doublePrevention.entity;



import com.baomidou.mybatisplus.annotation.IdType;

import com.baomidou.mybatisplus.annotation.TableId;

import com.baomidou.mybatisplus.annotation.TableName;



import java.util.Date;



@TableName("prevent_task_unit_and_measure")

public class PreventTaskUnitAndMeasure {

    /**

     * 主键id

     * */

    @TableId(value = "id" , type = IdType.AUTO)

    private Long id;

    /**

     * 排查任务Id

     * */

    private Long taskUnitId;

    /**

     * 管控措施Id

     * */

    private Long measureId;

    /**

     * 排查任务UUID

     * */

    private String taskUnitUuid;

    /**

     * 管控措施UUID

     * */

    private String measureUuid;

    /**

     * 创建时间

     */

    private Date gmtCreate;

    /**

     * 最后修改时间

     */

    private Date gmtModitify;

    /**

     * 创建人

     */

    private String createByUserName;

    /**

     * 修改人

     */

    private String lastEditUserName;

    /**

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

     */

    private Byte deleteStatus;



    public Long getId() {

        return id;

    }



    public void setId(Long id) {

        this.id = id;

    }



    public Long getTaskUnitId() {

        return taskUnitId;

    }



    public void setTaskUnitId(Long taskUnitId) {

        this.taskUnitId = taskUnitId;

    }



    public Long getMeasureId() {

        return measureId;

    }



    public void setMeasureId(Long measureId) {

        this.measureId = measureId;

    }



    public String getTaskUnitUuid() {

        return taskUnitUuid;

    }



    public void setTaskUnitUuid(String taskUnitUuid) {

        this.taskUnitUuid = taskUnitUuid;

    }



    public String getMeasureUuid() {

        return measureUuid;

    }



    public void setMeasureUuid(String measureUuid) {

        this.measureUuid = measureUuid;

    }



    public Date getGmtCreate() {

        return gmtCreate;

    }



    public void setGmtCreate(Date gmtCreate) {

        this.gmtCreate = gmtCreate;

    }



    public Date getGmtModitify() {

        return gmtModitify;

    }



    public void setGmtModitify(Date gmtModitify) {

        this.gmtModitify = gmtModitify;

    }



    public String getCreateByUserName() {

        return createByUserName;

    }



    public void setCreateByUserName(String createByUserName) {

        this.createByUserName = createByUserName;

    }



    public String getLastEditUserName() {

        return lastEditUserName;

    }



    public void setLastEditUserName(String lastEditUserName) {

        this.lastEditUserName = lastEditUserName;

    }



    public Byte getDeleteStatus() {

        return deleteStatus;

    }



    public void setDeleteStatus(Byte deleteStatus) {

        this.deleteStatus = deleteStatus;

    }



package com.ruoyi.doublePrevention.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;

import java.util.Date;

@TableName("prevent_task_unit_and_measure")
public class PreventTaskUnitAndMeasure {
    /**
     * 主键id
     * */
    @TableId(value = "id" , type = IdType.AUTO)
    private Long id;
    /**
     * 排查任务Id
     * */
    private Long taskUnitId;
    /**
     * 管控措施Id
     * */
    private Long measureId;
    /**
     * 排查任务UUID
     * */
    private String taskUnitUuid;
    /**
     * 管控措施UUID
     * */
    private String measureUuid;
    /**
     * 创建时间
     */
    private Date gmtCreate;
    /**
     * 最后修改时间
     */
    private Date gmtModitify;
    /**
     * 创建人
     */
    private String createByUserName;
    /**
     * 修改人
     */
    private String lastEditUserName;
    /**
     * 删除标志：0-有效，1-删除
     */
    private Byte deleteStatus;

    public Long getId() {
        return id;
    }

    public void setId(Long id) {
        this.id = id;
    }

    public Long getTaskUnitId() {
        return taskUnitId;
    }

    public void setTaskUnitId(Long taskUnitId) {
        this.taskUnitId = taskUnitId;
    }

    public Long getMeasureId() {
        return measureId;
    }

    public void setMeasureId(Long measureId) {
        this.measureId = measureId;
    }

    public String getTaskUnitUuid() {
        return taskUnitUuid;
    }

    public void setTaskUnitUuid(String taskUnitUuid) {
        this.taskUnitUuid = taskUnitUuid;
    }

    public String getMeasureUuid() {
        return measureUuid;
    }

    public void setMeasureUuid(String measureUuid) {
        this.measureUuid = measureUuid;
    }

    public Date getGmtCreate() {
        return gmtCreate;
    }

    public void setGmtCreate(Date gmtCreate) {
        this.gmtCreate = gmtCreate;
    }

    public Date getGmtModitify() {
        return gmtModitify;
    }

    public void setGmtModitify(Date gmtModitify) {
        this.gmtModitify = gmtModitify;
    }

    public String getCreateByUserName() {
        return createByUserName;
    }

    public void setCreateByUserName(String createByUserName) {
        this.createByUserName = createByUserName;
    }

    public String getLastEditUserName() {
        return lastEditUserName;
    }

    public void setLastEditUserName(String lastEditUserName) {
        this.lastEditUserName = lastEditUserName;
    }

    public Byte getDeleteStatus() {
        return deleteStatus;
    }

    public void setDeleteStatus(Byte deleteStatus) {
        this.deleteStatus = deleteStatus;
    }

}

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

@@ -1,160 +1,160 @@
package com.ruoyi.doublePrevention.entity;



import com.baomidou.mybatisplus.annotation.IdType;

import com.baomidou.mybatisplus.annotation.TableId;

import com.baomidou.mybatisplus.annotation.TableName;

import lombok.Data;



import java.io.Serializable;

import java.util.Date;



/**

 * 包保责任制

 */

@Data

@TableName("risk_and_people_info")

public class RiskAndPeopleInfo implements Serializable {

    private static final long serialVersionUID = -61793617513430361L;



    @TableId(value = "id" , type = IdType.AUTO)

    private Long id;

    /**

     * 行政区划

     */

    private String areaCode;

    /**

     * 公司名称

     */

    private String companyName;

    /**

     * 企业类型

     */

    private String companyNature;

    /**

     * 企业类型名称

     */

    private String companyNatureName;

    /**

     *

     */

    private String hazardId;

    /**

     * 危险源编码

     */

    private String hazardCode;

    /**

     * 危险源名称

     */

    private String hazardName;

    /**

     * 风险等级（数字）

     */

    private String hazardRank;

    /**

     * 风险等级（汉字）

     */

    private String hazardRankName;

    /**

     * 园区名称

     */

    private String parkName;



    /**

     *主要责任人id

     */

    private Long mainLiabilityPersonId;

    /**

     * 主要责任人姓名

     */

    private String mainLiabilityPersonName;

    /**

     * 主要责任人类型

     */

    private String mainLiabilityPersonType;

    /**

     * 主要责任人电话

     */

    private Long mainLiabilityPersonPhone;

    /**

     * 主要责任人职务

     */

    private String mainLiabilityPersonJob;

    /**

     * 主要责任人任务

     */

    private String mainLiabilityPersonWork;



    /**

     *技术责任人id

     */

    private Long technologyLiabilityPersonId;

    /**

     * 技术责任人姓名

     */

    private String technologyLiabilityPersonName;

    /**

     * 技术责任人类型

     */

    private String technologyLiabilityPersonType;

    /**

     * 技术责任人电话

     */

    private Long technologyLiabilityPersonPhone;

    /**

     * 技术责任人职务

     */

    private String technologyLiabilityPersonJob;

    /**

     * 技术责任人任务

     */

    private String technologyLiabilityPersonWork;



    /**

     *操作责任人id

     */

    private Long handleLiabilityPersonId;

    /**

     * 操作责任人姓名

     */

    private String handleLiabilityPersonName;

    /**

     * 操作责任人类型

     */

    private String handleLiabilityPersonType;

    /**

     * 操作责任人电话

     */

    private Long handleLiabilityPersonPhone;

    /**

     * 操作责任人职务

     */

    private String handleLiabilityPersonJob;

    /**

     * 操作责任人任务

     */

    private String handleLiabilityPersonWork;







    /**

     * 创建时间

     */

    private Date gmtCreate;

    /**

     * 最后修改时间

     */

    private Date gmtModitify;

    /**

     * 创建人

     */

    private String createByUserName;

    /**

     * 修改人

     */

    private String lastEditUserName;

    /**

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

     */

    private Byte deleteStatus;

}



package com.ruoyi.doublePrevention.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;

/**
 * 包保责任制
 */
@Data
@TableName("risk_and_people_info")
public class RiskAndPeopleInfo implements Serializable {
    private static final long serialVersionUID = -61793617513430361L;

    @TableId(value = "id" , type = IdType.AUTO)
    private Long id;
    /**
     * 行政区划
     */
    private String areaCode;
    /**
     * 公司名称
     */
    private String companyName;
    /**
     * 企业类型
     */
    private String companyNature;
    /**
     * 企业类型名称
     */
    private String companyNatureName;
    /**
     *
     */
    private String hazardId;
    /**
     * 危险源编码
     */
    private String hazardCode;
    /**
     * 危险源名称
     */
    private String hazardName;
    /**
     * 风险等级（数字）
     */
    private String hazardRank;
    /**
     * 风险等级（汉字）
     */
    private String hazardRankName;
    /**
     * 园区名称
     */
    private String parkName;

    /**
     *主要责任人id
     */
    private Long mainLiabilityPersonId;
    /**
     * 主要责任人姓名
     */
    private String mainLiabilityPersonName;
    /**
     * 主要责任人类型
     */
    private String mainLiabilityPersonType;
    /**
     * 主要责任人电话
     */
    private Long mainLiabilityPersonPhone;
    /**
     * 主要责任人职务
     */
    private String mainLiabilityPersonJob;
    /**
     * 主要责任人任务
     */
    private String mainLiabilityPersonWork;

    /**
     *技术责任人id
     */
    private Long technologyLiabilityPersonId;
    /**
     * 技术责任人姓名
     */
    private String technologyLiabilityPersonName;
    /**
     * 技术责任人类型
     */
    private String technologyLiabilityPersonType;
    /**
     * 技术责任人电话
     */
    private Long technologyLiabilityPersonPhone;
    /**
     * 技术责任人职务
     */
    private String technologyLiabilityPersonJob;
    /**
     * 技术责任人任务
     */
    private String technologyLiabilityPersonWork;

    /**
     *操作责任人id
     */
    private Long handleLiabilityPersonId;
    /**
     * 操作责任人姓名
     */
    private String handleLiabilityPersonName;
    /**
     * 操作责任人类型
     */
    private String handleLiabilityPersonType;
    /**
     * 操作责任人电话
     */
    private Long handleLiabilityPersonPhone;
    /**
     * 操作责任人职务
     */
    private String handleLiabilityPersonJob;
    /**
     * 操作责任人任务
     */
    private String handleLiabilityPersonWork;



    /**
     * 创建时间
     */
    private Date gmtCreate;
    /**
     * 最后修改时间
     */
    private Date gmtModitify;
    /**
     * 创建人
     */
    private String createByUserName;
    /**
     * 修改人
     */
    private String lastEditUserName;
    /**
     * 删除标志：0-有效，1-删除
     */
    private Byte deleteStatus;
}


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

@@ -1,608 +1,608 @@
package com.ruoyi.doublePrevention.entity;



import com.baomidou.mybatisplus.annotation.IdType;

import com.baomidou.mybatisplus.annotation.TableId;

import com.baomidou.mybatisplus.annotation.TableName;



import java.util.Date;

import java.io.Serializable;



/**

 * (RiskOldInfo)实体类

 *

 * @author makejava

 * @since 2023-03-20 15:33:46

 */

@TableName("risk_old_info")

public class RiskOldInfo implements Serializable {

    private static final long serialVersionUID = -61793617513430361L;



    @TableId(value = "id" , type = IdType.AUTO)

    private Long id;

    /**

     * 2上报人部门

     */

    private String reportDep;

    /**

     * 3上报人职务

     */

    private String reportPeopleJob;

    /**

     * 4上报人

     */

    private String reportPeople;

    /**

     * 5发现人

     */

    private String findPeople;

    /**

     * 6发现时间

     */

    private Date findTime;

    /**

     * 7隐患内容

     */

    private String riskDesc;

    /**

     * 8隐患位置

     */

    private String riskSite;

    /**

     * 9隐患类型

     */

    private String riskType;

    /**

     * 10隐患级别

     */

    private String riskLevel;

    /**

     * 11隐患所在部门

     */

    private String riskDep;

    /**

     * 12检查类型

     */

    private String checkType;

    /**

     * 13专业

     */

    private String major;

    /**

     * 14责任人部门

     */

    private String liabilityDep;

    /**

     * 15责任人

     */

    private String liabilityPeople;

    /**

     * 16责任人职务

     */

    private String liabilityPeopleJob;

    /**

     * 17整改时间

     */

    private Date rectifyTime;

    /**

     * 18允许延期时间

     */

    private Date rectifyTimeout;

    /**

     * 19负责人部门

     */

    private String leadDep;

    /**

     * 20负责人职务

     */

    private String leadJob;

    /**

     * 21整改人部门

     */

    private String rectifyDep;

    /**

     * 22整改人职务

     */

    private String rectifyPeopleJob;

    /**

     * 23整改人

     */

    private String rectifyPeople;

    /**

     * 24整改措施

     */

    private String rectifyMeasure;

    /**

     * 25整改开始时间

     */

    private Date rectifyStartTime;

    /**

     * 26整改完成时间

     */

    private Date rectifyFinishTime;

    /**

     * 27整改情况

     */

    private String rectifyDesc;

    /**

     * 28资金

     */

    private Double cost;

    /**

     * 29预案

     */

    private String plan;

    /**

     * 30防范措施

     */

    private String precautionMeasure;

    /**

     * 31验收时间

     */

    private Date acceptTime;

    /**

     * 32验收说明

     */

    private String acceptDesc;

    /**

     * 33验收部门

     */

    private String acceptDep;

    /**

     * 34验收人

     */

    private String acceptPeople;

    /**

     * 35验收人职务

     */

    private String acceptPeopleJob;

    /**

     * 36销号人部门

     */

    private String cancelDep;

    /**

     * 37销号人

     */

    private String cancelPeople;

    /**

     * 38销号人职务

     */

    private String cancelPeopleJob;

    /**

     * 39延期申请人

     */

    private String applyPeople;

    /**

     * 40申请时间

     */

    private Date applyTime;

    /**

     * 41申请理由

     */

    private String applyDesc;

    /**

     * 42申请-备注

     */

    private String applyNote;

    /**

     * 43申请延期时间

     */

    private Date applyTimeoutTime;

    /**

     * 44申请处理人

     */

    private String applyDealPeople;

    /**

     * 45申请处理时间

     */

    private Date appleDealTime;

    /**

     * 46流转责任部门

     */

    private String exchangeLeadDep;

    /**

     * 47流转责任人

     */

    private String exchangeLeadPeople;

    /**

     * 48流转责任人职务

     */

    private String exchangeLeadPeopleJob;

    /**

     * 49流转备注

     */

    private String exchangeDesc;





    public Long getId() {

        return id;

    }



    public void setId(Long id) {

        this.id = id;

    }



    public String getReportDep() {

        return reportDep;

    }



    public void setReportDep(String reportDep) {

        this.reportDep = reportDep;

    }



    public String getReportPeopleJob() {

        return reportPeopleJob;

    }



    public void setReportPeopleJob(String reportPeopleJob) {

        this.reportPeopleJob = reportPeopleJob;

    }



    public String getReportPeople() {

        return reportPeople;

    }



    public void setReportPeople(String reportPeople) {

        this.reportPeople = reportPeople;

    }



    public String getFindPeople() {

        return findPeople;

    }



    public void setFindPeople(String findPeople) {

        this.findPeople = findPeople;

    }



    public Date getFindTime() {

        return findTime;

    }



    public void setFindTime(Date findTime) {

        this.findTime = findTime;

    }



    public String getRiskDesc() {

        return riskDesc;

    }



    public void setRiskDesc(String riskDesc) {

        this.riskDesc = riskDesc;

    }



    public String getRiskSite() {

        return riskSite;

    }



    public void setRiskSite(String riskSite) {

        this.riskSite = riskSite;

    }



    public String getRiskType() {

        return riskType;

    }



    public void setRiskType(String riskType) {

        this.riskType = riskType;

    }



    public String getRiskLevel() {

        return riskLevel;

    }



    public void setRiskLevel(String riskLevel) {

        this.riskLevel = riskLevel;

    }



    public String getRiskDep() {

        return riskDep;

    }



    public void setRiskDep(String riskDep) {

        this.riskDep = riskDep;

    }



    public String getCheckType() {

        return checkType;

    }



    public void setCheckType(String checkType) {

        this.checkType = checkType;

    }



    public String getMajor() {

        return major;

    }



    public void setMajor(String major) {

        this.major = major;

    }



    public String getLiabilityDep() {

        return liabilityDep;

    }



    public void setLiabilityDep(String liabilityDep) {

        this.liabilityDep = liabilityDep;

    }



    public String getLiabilityPeople() {

        return liabilityPeople;

    }



    public void setLiabilityPeople(String liabilityPeople) {

        this.liabilityPeople = liabilityPeople;

    }



    public String getLiabilityPeopleJob() {

        return liabilityPeopleJob;

    }



    public void setLiabilityPeopleJob(String liabilityPeopleJob) {

        this.liabilityPeopleJob = liabilityPeopleJob;

    }



    public Date getRectifyTime() {

        return rectifyTime;

    }



    public void setRectifyTime(Date rectifyTime) {

        this.rectifyTime = rectifyTime;

    }



    public Date getRectifyTimeout() {

        return rectifyTimeout;

    }



    public void setRectifyTimeout(Date rectifyTimeout) {

        this.rectifyTimeout = rectifyTimeout;

    }



    public String getLeadDep() {

        return leadDep;

    }



    public void setLeadDep(String leadDep) {

        this.leadDep = leadDep;

    }



    public String getLeadJob() {

        return leadJob;

    }



    public void setLeadJob(String leadJob) {

        this.leadJob = leadJob;

    }



    public String getRectifyDep() {

        return rectifyDep;

    }



    public void setRectifyDep(String rectifyDep) {

        this.rectifyDep = rectifyDep;

    }



    public String getRectifyPeopleJob() {

        return rectifyPeopleJob;

    }



    public void setRectifyPeopleJob(String rectifyPeopleJob) {

        this.rectifyPeopleJob = rectifyPeopleJob;

    }



    public String getRectifyPeople() {

        return rectifyPeople;

    }



    public void setRectifyPeople(String rectifyPeople) {

        this.rectifyPeople = rectifyPeople;

    }



    public String getRectifyMeasure() {

        return rectifyMeasure;

    }



    public void setRectifyMeasure(String rectifyMeasure) {

        this.rectifyMeasure = rectifyMeasure;

    }



    public Date getRectifyStartTime() {

        return rectifyStartTime;

    }



    public void setRectifyStartTime(Date rectifyStartTime) {

        this.rectifyStartTime = rectifyStartTime;

    }



    public Date getRectifyFinishTime() {

        return rectifyFinishTime;

    }



    public void setRectifyFinishTime(Date rectifyFinishTime) {

        this.rectifyFinishTime = rectifyFinishTime;

    }



    public String getRectifyDesc() {

        return rectifyDesc;

    }



    public void setRectifyDesc(String rectifyDesc) {

        this.rectifyDesc = rectifyDesc;

    }



    public Double getCost() {

        return cost;

    }



    public void setCost(Double cost) {

        this.cost = cost;

    }



    public String getPlan() {

        return plan;

    }



    public void setPlan(String plan) {

        this.plan = plan;

    }



    public String getPrecautionMeasure() {

        return precautionMeasure;

    }



    public void setPrecautionMeasure(String precautionMeasure) {

        this.precautionMeasure = precautionMeasure;

    }



    public Date getAcceptTime() {

        return acceptTime;

    }



    public void setAcceptTime(Date acceptTime) {

        this.acceptTime = acceptTime;

    }



    public String getAcceptDesc() {

        return acceptDesc;

    }



    public void setAcceptDesc(String acceptDesc) {

        this.acceptDesc = acceptDesc;

    }



    public String getAcceptDep() {

        return acceptDep;

    }



    public void setAcceptDep(String acceptDep) {

        this.acceptDep = acceptDep;

    }



    public String getAcceptPeople() {

        return acceptPeople;

    }



    public void setAcceptPeople(String acceptPeople) {

        this.acceptPeople = acceptPeople;

    }



    public String getAcceptPeopleJob() {

        return acceptPeopleJob;

    }



    public void setAcceptPeopleJob(String acceptPeopleJob) {

        this.acceptPeopleJob = acceptPeopleJob;

    }



    public String getCancelDep() {

        return cancelDep;

    }



    public void setCancelDep(String cancelDep) {

        this.cancelDep = cancelDep;

    }



    public String getCancelPeople() {

        return cancelPeople;

    }



    public void setCancelPeople(String cancelPeople) {

        this.cancelPeople = cancelPeople;

    }



    public String getCancelPeopleJob() {

        return cancelPeopleJob;

    }



    public void setCancelPeopleJob(String cancelPeopleJob) {

        this.cancelPeopleJob = cancelPeopleJob;

    }



    public String getApplyPeople() {

        return applyPeople;

    }



    public void setApplyPeople(String applyPeople) {

        this.applyPeople = applyPeople;

    }



    public Date getApplyTime() {

        return applyTime;

    }



    public void setApplyTime(Date applyTime) {

        this.applyTime = applyTime;

    }



    public String getApplyDesc() {

        return applyDesc;

    }



    public void setApplyDesc(String applyDesc) {

        this.applyDesc = applyDesc;

    }



    public String getApplyNote() {

        return applyNote;

    }



    public void setApplyNote(String applyNote) {

        this.applyNote = applyNote;

    }



    public Date getApplyTimeoutTime() {

        return applyTimeoutTime;

    }



    public void setApplyTimeoutTime(Date applyTimeoutTime) {

        this.applyTimeoutTime = applyTimeoutTime;

    }



    public String getApplyDealPeople() {

        return applyDealPeople;

    }



    public void setApplyDealPeople(String applyDealPeople) {

        this.applyDealPeople = applyDealPeople;

    }



    public Date getAppleDealTime() {

        return appleDealTime;

    }



    public void setAppleDealTime(Date appleDealTime) {

        this.appleDealTime = appleDealTime;

    }



    public String getExchangeLeadDep() {

        return exchangeLeadDep;

    }



    public void setExchangeLeadDep(String exchangeLeadDep) {

        this.exchangeLeadDep = exchangeLeadDep;

    }



    public String getExchangeLeadPeople() {

        return exchangeLeadPeople;

    }



    public void setExchangeLeadPeople(String exchangeLeadPeople) {

        this.exchangeLeadPeople = exchangeLeadPeople;

    }



    public String getExchangeLeadPeopleJob() {

        return exchangeLeadPeopleJob;

    }



    public void setExchangeLeadPeopleJob(String exchangeLeadPeopleJob) {

        this.exchangeLeadPeopleJob = exchangeLeadPeopleJob;

    }



    public String getExchangeDesc() {

        return exchangeDesc;

    }



    public void setExchangeDesc(String exchangeDesc) {

        this.exchangeDesc = exchangeDesc;

    }

}



package com.ruoyi.doublePrevention.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;

import java.util.Date;
import java.io.Serializable;

/**
 * (RiskOldInfo)实体类
 *
 * @author makejava
 * @since 2023-03-20 15:33:46
 */
@TableName("risk_old_info")
public class RiskOldInfo implements Serializable {
    private static final long serialVersionUID = -61793617513430361L;

    @TableId(value = "id" , type = IdType.AUTO)
    private Long id;
    /**
     * 2上报人部门
     */
    private String reportDep;
    /**
     * 3上报人职务
     */
    private String reportPeopleJob;
    /**
     * 4上报人
     */
    private String reportPeople;
    /**
     * 5发现人
     */
    private String findPeople;
    /**
     * 6发现时间
     */
    private Date findTime;
    /**
     * 7隐患内容
     */
    private String riskDesc;
    /**
     * 8隐患位置
     */
    private String riskSite;
    /**
     * 9隐患类型
     */
    private String riskType;
    /**
     * 10隐患级别
     */
    private String riskLevel;
    /**
     * 11隐患所在部门
     */
    private String riskDep;
    /**
     * 12检查类型
     */
    private String checkType;
    /**
     * 13专业
     */
    private String major;
    /**
     * 14责任人部门
     */
    private String liabilityDep;
    /**
     * 15责任人
     */
    private String liabilityPeople;
    /**
     * 16责任人职务
     */
    private String liabilityPeopleJob;
    /**
     * 17整改时间
     */
    private Date rectifyTime;
    /**
     * 18允许延期时间
     */
    private Date rectifyTimeout;
    /**
     * 19负责人部门
     */
    private String leadDep;
    /**
     * 20负责人职务
     */
    private String leadJob;
    /**
     * 21整改人部门
     */
    private String rectifyDep;
    /**
     * 22整改人职务
     */
    private String rectifyPeopleJob;
    /**
     * 23整改人
     */
    private String rectifyPeople;
    /**
     * 24整改措施
     */
    private String rectifyMeasure;
    /**
     * 25整改开始时间
     */
    private Date rectifyStartTime;
    /**
     * 26整改完成时间
     */
    private Date rectifyFinishTime;
    /**
     * 27整改情况
     */
    private String rectifyDesc;
    /**
     * 28资金
     */
    private Double cost;
    /**
     * 29预案
     */
    private String plan;
    /**
     * 30防范措施
     */
    private String precautionMeasure;
    /**
     * 31验收时间
     */
    private Date acceptTime;
    /**
     * 32验收说明
     */
    private String acceptDesc;
    /**
     * 33验收部门
     */
    private String acceptDep;
    /**
     * 34验收人
     */
    private String acceptPeople;
    /**
     * 35验收人职务
     */
    private String acceptPeopleJob;
    /**
     * 36销号人部门
     */
    private String cancelDep;
    /**
     * 37销号人
     */
    private String cancelPeople;
    /**
     * 38销号人职务
     */
    private String cancelPeopleJob;
    /**
     * 39延期申请人
     */
    private String applyPeople;
    /**
     * 40申请时间
     */
    private Date applyTime;
    /**
     * 41申请理由
     */
    private String applyDesc;
    /**
     * 42申请-备注
     */
    private String applyNote;
    /**
     * 43申请延期时间
     */
    private Date applyTimeoutTime;
    /**
     * 44申请处理人
     */
    private String applyDealPeople;
    /**
     * 45申请处理时间
     */
    private Date appleDealTime;
    /**
     * 46流转责任部门
     */
    private String exchangeLeadDep;
    /**
     * 47流转责任人
     */
    private String exchangeLeadPeople;
    /**
     * 48流转责任人职务
     */
    private String exchangeLeadPeopleJob;
    /**
     * 49流转备注
     */
    private String exchangeDesc;


    public Long getId() {
        return id;
    }

    public void setId(Long id) {
        this.id = id;
    }

    public String getReportDep() {
        return reportDep;
    }

    public void setReportDep(String reportDep) {
        this.reportDep = reportDep;
    }

    public String getReportPeopleJob() {
        return reportPeopleJob;
    }

    public void setReportPeopleJob(String reportPeopleJob) {
        this.reportPeopleJob = reportPeopleJob;
    }

    public String getReportPeople() {
        return reportPeople;
    }

    public void setReportPeople(String reportPeople) {
        this.reportPeople = reportPeople;
    }

    public String getFindPeople() {
        return findPeople;
    }

    public void setFindPeople(String findPeople) {
        this.findPeople = findPeople;
    }

    public Date getFindTime() {
        return findTime;
    }

    public void setFindTime(Date findTime) {
        this.findTime = findTime;
    }

    public String getRiskDesc() {
        return riskDesc;
    }

    public void setRiskDesc(String riskDesc) {
        this.riskDesc = riskDesc;
    }

    public String getRiskSite() {
        return riskSite;
    }

    public void setRiskSite(String riskSite) {
        this.riskSite = riskSite;
    }

    public String getRiskType() {
        return riskType;
    }

    public void setRiskType(String riskType) {
        this.riskType = riskType;
    }

    public String getRiskLevel() {
        return riskLevel;
    }

    public void setRiskLevel(String riskLevel) {
        this.riskLevel = riskLevel;
    }

    public String getRiskDep() {
        return riskDep;
    }

    public void setRiskDep(String riskDep) {
        this.riskDep = riskDep;
    }

    public String getCheckType() {
        return checkType;
    }

    public void setCheckType(String checkType) {
        this.checkType = checkType;
    }

    public String getMajor() {
        return major;
    }

    public void setMajor(String major) {
        this.major = major;
    }

    public String getLiabilityDep() {
        return liabilityDep;
    }

    public void setLiabilityDep(String liabilityDep) {
        this.liabilityDep = liabilityDep;
    }

    public String getLiabilityPeople() {
        return liabilityPeople;
    }

    public void setLiabilityPeople(String liabilityPeople) {
        this.liabilityPeople = liabilityPeople;
    }

    public String getLiabilityPeopleJob() {
        return liabilityPeopleJob;
    }

    public void setLiabilityPeopleJob(String liabilityPeopleJob) {
        this.liabilityPeopleJob = liabilityPeopleJob;
    }

    public Date getRectifyTime() {
        return rectifyTime;
    }

    public void setRectifyTime(Date rectifyTime) {
        this.rectifyTime = rectifyTime;
    }

    public Date getRectifyTimeout() {
        return rectifyTimeout;
    }

    public void setRectifyTimeout(Date rectifyTimeout) {
        this.rectifyTimeout = rectifyTimeout;
    }

    public String getLeadDep() {
        return leadDep;
    }

    public void setLeadDep(String leadDep) {
        this.leadDep = leadDep;
    }

    public String getLeadJob() {
        return leadJob;
    }

    public void setLeadJob(String leadJob) {
        this.leadJob = leadJob;
    }

    public String getRectifyDep() {
        return rectifyDep;
    }

    public void setRectifyDep(String rectifyDep) {
        this.rectifyDep = rectifyDep;
    }

    public String getRectifyPeopleJob() {
        return rectifyPeopleJob;
    }

    public void setRectifyPeopleJob(String rectifyPeopleJob) {
        this.rectifyPeopleJob = rectifyPeopleJob;
    }

    public String getRectifyPeople() {
        return rectifyPeople;
    }

    public void setRectifyPeople(String rectifyPeople) {
        this.rectifyPeople = rectifyPeople;
    }

    public String getRectifyMeasure() {
        return rectifyMeasure;
    }

    public void setRectifyMeasure(String rectifyMeasure) {
        this.rectifyMeasure = rectifyMeasure;
    }

    public Date getRectifyStartTime() {
        return rectifyStartTime;
    }

    public void setRectifyStartTime(Date rectifyStartTime) {
        this.rectifyStartTime = rectifyStartTime;
    }

    public Date getRectifyFinishTime() {
        return rectifyFinishTime;
    }

    public void setRectifyFinishTime(Date rectifyFinishTime) {
        this.rectifyFinishTime = rectifyFinishTime;
    }

    public String getRectifyDesc() {
        return rectifyDesc;
    }

    public void setRectifyDesc(String rectifyDesc) {
        this.rectifyDesc = rectifyDesc;
    }

    public Double getCost() {
        return cost;
    }

    public void setCost(Double cost) {
        this.cost = cost;
    }

    public String getPlan() {
        return plan;
    }

    public void setPlan(String plan) {
        this.plan = plan;
    }

    public String getPrecautionMeasure() {
        return precautionMeasure;
    }

    public void setPrecautionMeasure(String precautionMeasure) {
        this.precautionMeasure = precautionMeasure;
    }

    public Date getAcceptTime() {
        return acceptTime;
    }

    public void setAcceptTime(Date acceptTime) {
        this.acceptTime = acceptTime;
    }

    public String getAcceptDesc() {
        return acceptDesc;
    }

    public void setAcceptDesc(String acceptDesc) {
        this.acceptDesc = acceptDesc;
    }

    public String getAcceptDep() {
        return acceptDep;
    }

    public void setAcceptDep(String acceptDep) {
        this.acceptDep = acceptDep;
    }

    public String getAcceptPeople() {
        return acceptPeople;
    }

    public void setAcceptPeople(String acceptPeople) {
        this.acceptPeople = acceptPeople;
    }

    public String getAcceptPeopleJob() {
        return acceptPeopleJob;
    }

    public void setAcceptPeopleJob(String acceptPeopleJob) {
        this.acceptPeopleJob = acceptPeopleJob;
    }

    public String getCancelDep() {
        return cancelDep;
    }

    public void setCancelDep(String cancelDep) {
        this.cancelDep = cancelDep;
    }

    public String getCancelPeople() {
        return cancelPeople;
    }

    public void setCancelPeople(String cancelPeople) {
        this.cancelPeople = cancelPeople;
    }

    public String getCancelPeopleJob() {
        return cancelPeopleJob;
    }

    public void setCancelPeopleJob(String cancelPeopleJob) {
        this.cancelPeopleJob = cancelPeopleJob;
    }

    public String getApplyPeople() {
        return applyPeople;
    }

    public void setApplyPeople(String applyPeople) {
        this.applyPeople = applyPeople;
    }

    public Date getApplyTime() {
        return applyTime;
    }

    public void setApplyTime(Date applyTime) {
        this.applyTime = applyTime;
    }

    public String getApplyDesc() {
        return applyDesc;
    }

    public void setApplyDesc(String applyDesc) {
        this.applyDesc = applyDesc;
    }

    public String getApplyNote() {
        return applyNote;
    }

    public void setApplyNote(String applyNote) {
        this.applyNote = applyNote;
    }

    public Date getApplyTimeoutTime() {
        return applyTimeoutTime;
    }

    public void setApplyTimeoutTime(Date applyTimeoutTime) {
        this.applyTimeoutTime = applyTimeoutTime;
    }

    public String getApplyDealPeople() {
        return applyDealPeople;
    }

    public void setApplyDealPeople(String applyDealPeople) {
        this.applyDealPeople = applyDealPeople;
    }

    public Date getAppleDealTime() {
        return appleDealTime;
    }

    public void setAppleDealTime(Date appleDealTime) {
        this.appleDealTime = appleDealTime;
    }

    public String getExchangeLeadDep() {
        return exchangeLeadDep;
    }

    public void setExchangeLeadDep(String exchangeLeadDep) {
        this.exchangeLeadDep = exchangeLeadDep;
    }

    public String getExchangeLeadPeople() {
        return exchangeLeadPeople;
    }

    public void setExchangeLeadPeople(String exchangeLeadPeople) {
        this.exchangeLeadPeople = exchangeLeadPeople;
    }

    public String getExchangeLeadPeopleJob() {
        return exchangeLeadPeopleJob;
    }

    public void setExchangeLeadPeopleJob(String exchangeLeadPeopleJob) {
        this.exchangeLeadPeopleJob = exchangeLeadPeopleJob;
    }

    public String getExchangeDesc() {
        return exchangeDesc;
    }

    public void setExchangeDesc(String exchangeDesc) {
        this.exchangeDesc = exchangeDesc;
    }
}


 src/main/java/com/ruoyi/doublePrevention/entity/SPI/SPIDataForPieChartRespDTO.java

@@ -1,20 +1,20 @@
package com.ruoyi.doublePrevention.entity.SPI;



import lombok.Data;



import java.util.List;



@Data

public class SPIDataForPieChartRespDTO {





    private TroubleLevel troubleLevel;



    public TroubleLevel getTroubleLevel() {

        return troubleLevel;

    }



    public void setTroubleLevel(TroubleLevel troubleLevel) {

        this.troubleLevel = troubleLevel;

    }

}

package com.ruoyi.doublePrevention.entity.SPI;

import lombok.Data;

import java.util.List;

@Data
public class SPIDataForPieChartRespDTO {


    private TroubleLevel troubleLevel;

    public TroubleLevel getTroubleLevel() {
        return troubleLevel;
    }

    public void setTroubleLevel(TroubleLevel troubleLevel) {
        this.troubleLevel = troubleLevel;
    }
}

 src/main/java/com/ruoyi/doublePrevention/entity/SPI/SPIDataReqBO.java

@@ -1,62 +1,62 @@
package com.ruoyi.doublePrevention.entity.SPI;



import com.fasterxml.jackson.annotation.JsonFormat;

import lombok.Data;



import java.time.LocalDateTime;



@Data

public class SPIDataReqBO {



    private String key;



    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss")

    private LocalDateTime startTime;



    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss")

    private LocalDateTime endTime;



    private String year;



    private String month;



    public String getKey() {

        return key;

    }



    public void setKey(String key) {

        this.key = key;

    }



    public LocalDateTime getStartTime() {

        return startTime;

    }



    public void setStartTime(LocalDateTime startTime) {

        this.startTime = startTime;

    }



    public LocalDateTime getEndTime() {

        return endTime;

    }



    public void setEndTime(LocalDateTime endTime) {

        this.endTime = endTime;

    }



    public String getYear() {

        return year;

    }



    public void setYear(String year) {

        this.year = year;

    }



    public String getMonth() {

        return month;

    }



    public void setMonth(String month) {

        this.month = month;

    }

}

package com.ruoyi.doublePrevention.entity.SPI;

import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;

import java.time.LocalDateTime;

@Data
public class SPIDataReqBO {

    private String key;

    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss")
    private LocalDateTime startTime;

    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss")
    private LocalDateTime endTime;

    private String year;

    private String month;

    public String getKey() {
        return key;
    }

    public void setKey(String key) {
        this.key = key;
    }

    public LocalDateTime getStartTime() {
        return startTime;
    }

    public void setStartTime(LocalDateTime startTime) {
        this.startTime = startTime;
    }

    public LocalDateTime getEndTime() {
        return endTime;
    }

    public void setEndTime(LocalDateTime endTime) {
        this.endTime = endTime;
    }

    public String getYear() {
        return year;
    }

    public void setYear(String year) {
        this.year = year;
    }

    public String getMonth() {
        return month;
    }

    public void setMonth(String month) {
        this.month = month;
    }
}

 src/main/java/com/ruoyi/doublePrevention/entity/SPI/SPIDataRespDTO.java

@@ -1,17 +1,17 @@
package com.ruoyi.doublePrevention.entity.SPI;



import lombok.Data;



import java.util.List;



@Data

public class SPIDataRespDTO {



    private List<TroubleData> troubleDataList;





    public List<TroubleData> getTroubleDataList() {

        return troubleDataList;

    }



}

package com.ruoyi.doublePrevention.entity.SPI;

import lombok.Data;

import java.util.List;

@Data
public class SPIDataRespDTO {

    private List<TroubleData> troubleDataList;


    public List<TroubleData> getTroubleDataList() {
        return troubleDataList;
    }

}

 src/main/java/com/ruoyi/doublePrevention/entity/SPI/TroubleData.java

@@ -1,71 +1,71 @@
package com.ruoyi.doublePrevention.entity.SPI;









public class TroubleData {



    private String time;

    private Integer count;

    private Integer rectifyFinish;

    private Integer rectifyNotFinish;

    private Integer generalDanger;

    private Integer majorDanger;

    private Integer accept;



    public String getTime() {

        return time;

    }



    public void setTime(String time) {

        this.time = time;

    }



    public Integer getCount() {

        return count;

    }



    public void setCount(Integer count) {

        this.count = count;

    }



    public Integer getGeneralDanger() {

        return generalDanger;

    }



    public void setGeneralDanger(Integer generalDanger) {

        this.generalDanger = generalDanger;

    }



    public Integer getMajorDanger() {

        return majorDanger;

    }



    public void setMajorDanger(Integer majorDanger) {

        this.majorDanger = majorDanger;

    }



    public Integer getRectifyFinish() {

        return rectifyFinish;

    }



    public void setRectifyFinish(Integer rectifyFinish) {

        this.rectifyFinish = rectifyFinish;

    }



    public Integer getRectifyNotFinish() {

        return rectifyNotFinish;

    }



    public void setRectifyNotFinish(Integer rectifyNotFinish) {

        this.rectifyNotFinish = rectifyNotFinish;

    }



    public Integer getAccept() {

        return accept;

    }



    public void setAccept(Integer accept) {

        this.accept = accept;

    }

}

package com.ruoyi.doublePrevention.entity.SPI;




public class TroubleData {

    private String time;
    private Integer count;
    private Integer rectifyFinish;
    private Integer rectifyNotFinish;
    private Integer generalDanger;
    private Integer majorDanger;
    private Integer accept;

    public String getTime() {
        return time;
    }

    public void setTime(String time) {
        this.time = time;
    }

    public Integer getCount() {
        return count;
    }

    public void setCount(Integer count) {
        this.count = count;
    }

    public Integer getGeneralDanger() {
        return generalDanger;
    }

    public void setGeneralDanger(Integer generalDanger) {
        this.generalDanger = generalDanger;
    }

    public Integer getMajorDanger() {
        return majorDanger;
    }

    public void setMajorDanger(Integer majorDanger) {
        this.majorDanger = majorDanger;
    }

    public Integer getRectifyFinish() {
        return rectifyFinish;
    }

    public void setRectifyFinish(Integer rectifyFinish) {
        this.rectifyFinish = rectifyFinish;
    }

    public Integer getRectifyNotFinish() {
        return rectifyNotFinish;
    }

    public void setRectifyNotFinish(Integer rectifyNotFinish) {
        this.rectifyNotFinish = rectifyNotFinish;
    }

    public Integer getAccept() {
        return accept;
    }

    public void setAccept(Integer accept) {
        this.accept = accept;
    }
}

 src/main/java/com/ruoyi/doublePrevention/entity/SPI/TroubleLevel.java

@@ -1,56 +1,56 @@
package com.ruoyi.doublePrevention.entity.SPI;









public class TroubleLevel {



    private String A;



    private String B;



    private String C;



    private Integer rectifyFinish;

    private Integer rectifyNotFinish;



    public String getA() {

        return A;

    }



    public void setA(String a) {

        A = a;

    }



    public String getB() {

        return B;

    }



    public void setB(String b) {

        B = b;

    }



    public String getC() {

        return C;

    }



    public void setC(String c) {

        C = c;

    }



    public Integer getRectifyFinish() {

        return rectifyFinish;

    }



    public void setRectifyFinish(Integer rectifyFinish) {

        this.rectifyFinish = rectifyFinish;

    }



    public Integer getRectifyNotFinish() {

        return rectifyNotFinish;

    }



    public void setRectifyNotFinish(Integer rectifyNotFinish) {

        this.rectifyNotFinish = rectifyNotFinish;

    }

}

package com.ruoyi.doublePrevention.entity.SPI;




public class TroubleLevel {

    private String A;

    private String B;

    private String C;

    private Integer rectifyFinish;
    private Integer rectifyNotFinish;

    public String getA() {
        return A;
    }

    public void setA(String a) {
        A = a;
    }

    public String getB() {
        return B;
    }

    public void setB(String b) {
        B = b;
    }

    public String getC() {
        return C;
    }

    public void setC(String c) {
        C = c;
    }

    public Integer getRectifyFinish() {
        return rectifyFinish;
    }

    public void setRectifyFinish(Integer rectifyFinish) {
        this.rectifyFinish = rectifyFinish;
    }

    public Integer getRectifyNotFinish() {
        return rectifyNotFinish;
    }

    public void setRectifyNotFinish(Integer rectifyNotFinish) {
        this.rectifyNotFinish = rectifyNotFinish;
    }
}

 src/main/java/com/ruoyi/doublePrevention/entity/dto/req/PreventOverhaulLogInsertReqBO.java

@@ -1,36 +1,36 @@
package com.ruoyi.doublePrevention.entity.dto.req;



import lombok.Data;



import java.util.Date;



@Data

public class PreventOverhaulLogInsertReqBO {



    /**

     * 风险分析对象编码

     */

    private String hazardCode;

    /**

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

     */

    private Long riskUnitId;

    /**

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

     */

    private String riskUnitUuid;

    /**

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

     */

    private Date stopStartTime;

    /**

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

     */

    private Date stopEndTime;

    /**

     * 描述停用原因

     */

    private String stopReason;





}

package com.ruoyi.doublePrevention.entity.dto.req;

import lombok.Data;

import java.util.Date;

@Data
public class PreventOverhaulLogInsertReqBO {

    /**
     * 风险分析对象编码
     */
    private String hazardCode;
    /**
     * 所属安全风险分析单元id
     */
    private Long riskUnitId;
    /**
     * 所属安全风险分析单元uuid
     */
    private String riskUnitUuid;
    /**
     * 装置停用或者检维修开始时间
     */
    private Date stopStartTime;
    /**
     * 装置停用或者检维修结束时间
     */
    private Date stopEndTime;
    /**
     * 描述停用原因
     */
    private String stopReason;


}

 src/main/java/com/ruoyi/doublePrevention/entity/dto/req/PreventOverhaulLogReqBO.java

@@ -1,54 +1,54 @@
package com.ruoyi.doublePrevention.entity.dto.req;



import lombok.Data;



import java.util.Date;



@Data

public class PreventOverhaulLogReqBO {



    private Integer  pageNum;



    private Integer  pageSize;

    /**

     *

     */

    private Long id;



    /**

     * 创建时间

     */

    private Date gmtCreate;

    /**

     * 最后修改时间

     */

    private Date gmtModitify;

    /**

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

     */

    private Long riskUnitId;

    /**

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

     */

    private String riskUnitUuid;

    /**

     * 企业id

     */

    private Long enterpriseId;

    /**

     * 企业uuid

     */

    private String enterpriseUuid;

    /**

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

     */

    private Date stopStartTime;

    /**

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

     */

    private Date stopEndTime;

    /**

     * 风险分析对象编码

     */

    private String hazardCode;

}

package com.ruoyi.doublePrevention.entity.dto.req;

import lombok.Data;

import java.util.Date;

@Data
public class PreventOverhaulLogReqBO {

    private Integer  pageNum;

    private Integer  pageSize;
    /**
     *
     */
    private Long id;

    /**
     * 创建时间
     */
    private Date gmtCreate;
    /**
     * 最后修改时间
     */
    private Date gmtModitify;
    /**
     * 所属安全风险分析单元id
     */
    private Long riskUnitId;
    /**
     * 所属安全风险分析单元uuid
     */
    private String riskUnitUuid;
    /**
     * 企业id
     */
    private Long enterpriseId;
    /**
     * 企业uuid
     */
    private String enterpriseUuid;
    /**
     * 装置停用或者检维修开始时间
     */
    private Date stopStartTime;
    /**
     * 装置停用或者检维修结束时间
     */
    private Date stopEndTime;
    /**
     * 风险分析对象编码
     */
    private String hazardCode;
}

 src/main/java/com/ruoyi/doublePrevention/entity/dto/req/PreventOverhaulLogUpdateReqBO.java

@@ -1,41 +1,41 @@
package com.ruoyi.doublePrevention.entity.dto.req;



import lombok.Data;



import java.util.Date;



@Data

public class PreventOverhaulLogUpdateReqBO {



    /**

     *

     */

    private Long id;



    /**

     * 风险分析对象编码

     */

    private String hazardCode;

    /**

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

     */

    private Long riskUnitId;

    /**

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

     */

    private String riskUnitUuid;

    /**

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

     */

    private Date stopStartTime;

    /**

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

     */

    private Date stopEndTime;

    /**

     * 描述停用原因

     */

    private String stopReason;





}

package com.ruoyi.doublePrevention.entity.dto.req;

import lombok.Data;

import java.util.Date;

@Data
public class PreventOverhaulLogUpdateReqBO {

    /**
     *
     */
    private Long id;

    /**
     * 风险分析对象编码
     */
    private String hazardCode;
    /**
     * 所属安全风险分析单元id
     */
    private Long riskUnitId;
    /**
     * 所属安全风险分析单元uuid
     */
    private String riskUnitUuid;
    /**
     * 装置停用或者检维修开始时间
     */
    private Date stopStartTime;
    /**
     * 装置停用或者检维修结束时间
     */
    private Date stopEndTime;
    /**
     * 描述停用原因
     */
    private String stopReason;


}

 src/main/java/com/ruoyi/doublePrevention/entity/dto/req/RiskAndPeopleInfoReqBO.java

@@ -1,17 +1,17 @@
package com.ruoyi.doublePrevention.entity.dto.req;



import lombok.Data;



@Data

public class RiskAndPeopleInfoReqBO {



    private Integer  pageNum;



    private Integer  pageSize;



    private String  hazardName;



    private String  hazardRank;



    private Long  id;

}

package com.ruoyi.doublePrevention.entity.dto.req;

import lombok.Data;

@Data
public class RiskAndPeopleInfoReqBO {

    private Integer  pageNum;

    private Integer  pageSize;

    private String  hazardName;

    private String  hazardRank;

    private Long  id;
}

 src/main/java/com/ruoyi/doublePrevention/entity/dto/req/RiskOldInfoQueryReqDTO.java

@@ -1,56 +1,56 @@
package com.ruoyi.doublePrevention.entity.dto.req;



import lombok.Data;



import java.util.Date;



/**

 * (RiskOldInfo)实体类

 *

 * @author makejava

 * @since 2023-03-20 15:33:46

 */



@Data

public class RiskOldInfoQueryReqDTO {



    private Integer  pageNum;



    private Integer  pageSize;



    /**

     * 4上报人  --

     */

    private String reportPeople;

    /**

     * 5发现人  --

     */

    private String findPeople;

    /**

     * 6发现时间 --

     */

    private Date startTime;

    /**

     * 6发现时间 --

     */

    private Date endTime;

    /**

     * 10隐患级别  --

     */

    private String riskLevel;

    /**

     * 11隐患所在部门  --

     */

    private String riskDep;

    /**

     * 13专业  --

     */

    private String major;

    /**

     * 34验收人  --

     */

    private String acceptPeople;





}



package com.ruoyi.doublePrevention.entity.dto.req;

import lombok.Data;

import java.util.Date;

/**
 * (RiskOldInfo)实体类
 *
 * @author makejava
 * @since 2023-03-20 15:33:46
 */

@Data
public class RiskOldInfoQueryReqDTO {

    private Integer  pageNum;

    private Integer  pageSize;

    /**
     * 4上报人  --
     */
    private String reportPeople;
    /**
     * 5发现人  --
     */
    private String findPeople;
    /**
     * 6发现时间 --
     */
    private Date startTime;
    /**
     * 6发现时间 --
     */
    private Date endTime;
    /**
     * 10隐患级别  --
     */
    private String riskLevel;
    /**
     * 11隐患所在部门  --
     */
    private String riskDep;
    /**
     * 13专业  --
     */
    private String major;
    /**
     * 34验收人  --
     */
    private String acceptPeople;


}


 src/main/java/com/ruoyi/doublePrevention/entity/dto/resp/PreventOverhaulLogRespDTO.java

@@ -1,69 +1,69 @@
package com.ruoyi.doublePrevention.entity.dto.resp;



import lombok.Data;



import java.util.Date;



@Data

public class PreventOverhaulLogRespDTO {



    private Long id;





    private String uuid;

    /**

     * 创建时间

     */

    private Date gmtCreate;

    /**

     * 最后修改时间

     */

    private Date gmtModitify;

    /**

     * 创建人

     */

    private String createByUserName;

    /**

     * 修改人

     */

    private String lastEditUserName;



    /**

     * 所属安全风险分析单元

     */

    private String riskUnitName;

    /**

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

     */

    private Long riskUnitId;

    /**

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

     */

    private String riskUnitUuid;

    /**

     * 企业id

     */

    private Long enterpriseId;

    /**

     * 企业uuid

     */

    private String enterpriseUuid;



    /**

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

     */

    private Date stopStartTime;

    /**

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

     */

    private Date stopEndTime;

    /**

     * 描述停用原因

     */

    private String stopReason;

    /**

     * 风险分析对象编码

     */

    private String hazardCode;



}

package com.ruoyi.doublePrevention.entity.dto.resp;

import lombok.Data;

import java.util.Date;

@Data
public class PreventOverhaulLogRespDTO {

    private Long id;


    private String uuid;
    /**
     * 创建时间
     */
    private Date gmtCreate;
    /**
     * 最后修改时间
     */
    private Date gmtModitify;
    /**
     * 创建人
     */
    private String createByUserName;
    /**
     * 修改人
     */
    private String lastEditUserName;

    /**
     * 所属安全风险分析单元
     */
    private String riskUnitName;
    /**
     * 所属安全风险分析单元id
     */
    private Long riskUnitId;
    /**
     * 所属安全风险分析单元uuid
     */
    private String riskUnitUuid;
    /**
     * 企业id
     */
    private Long enterpriseId;
    /**
     * 企业uuid
     */
    private String enterpriseUuid;

    /**
     * 装置停用或者检维修开始时间
     */
    private Date stopStartTime;
    /**
     * 装置停用或者检维修结束时间
     */
    private Date stopEndTime;
    /**
     * 描述停用原因
     */
    private String stopReason;
    /**
     * 风险分析对象编码
     */
    private String hazardCode;

}

 src/main/java/com/ruoyi/doublePrevention/entity/dto/resp/PreventRiskCheckUnitRespDTO.java

@@ -1,265 +1,265 @@
package com.ruoyi.doublePrevention.entity.dto.resp;



import com.ruoyi.doublePrevention.entity.PreventRiskControlMeasure;

import com.ruoyi.framework.aspectj.lang.annotation.Excel;



import java.util.List;



public class PreventRiskCheckUnitRespDTO {





    /** id */

    private Long riskListId;



    /** 风险单元编号 */

    private String riskListNum;



    /** 风险单元名称 */

    private String riskListName;



    /** 是否特种(1否,2是) */

    @Excel(name = "是否特种",readConverterExp = "1=否,2=是")

    private Long riskListIsSpecial;



    /** 图片 */

    private String riskListImgUrl;



    /** 设备设施类型 */

    private Long riskListDeviceType;



    /** 规格/型号 */

    private String riskListDeviceModel;



    /** 作业活动类型 */

    private Long riskListWorkType;



    /** 作业频率 */

    private Long riskListWorkFrequency;



    private String riskListWorkFrequencyName;



    /** 工艺作业类型 */

    private Long riskListCraftsType;



    /**

     * 风险单元类型名称,(包含设备设施类型名称,作业活动类型名称,工艺节点类型名称)

     */

    private String riskTypeName;



    /** 节点描述 */

    private String riskListCraftsDescription;



    /** 区域/位置 */

    private Long regionId;



    /** 区域/位置名称 */

    private String regionName;



    /** 管辖单位/部门 */

    private Long deptId;



    /** 管辖部门名称 */

    private String deptName;



    /** 负责人 */

    private Long userId;



    /** 负责人名称 */

    private String userName;



    /** 风险单元类型(1设备设置,2作业活动,3工艺节点) */

    @Excel(name = "风险单元类型", readConverterExp = "1=设备设施,2=作业活动,3=工艺节点,4=基础清单,5=区域/作业场所")

    private Integer riskType;



    /** 所属公司 */

    private Long companyId;



    /**已评价计划数  如作为查询条件 0 代表未评价, 1 代表已评价 */

    private Integer isEvaluation;



    private List<PreventRiskControlMeasure> riskControlMeasures;



    public Long getRiskListId() {

        return riskListId;

    }



    public void setRiskListId(Long riskListId) {

        this.riskListId = riskListId;

    }



    public String getRiskListNum() {

        return riskListNum;

    }



    public void setRiskListNum(String riskListNum) {

        this.riskListNum = riskListNum;

    }



    public String getRiskListName() {

        return riskListName;

    }



    public void setRiskListName(String riskListName) {

        this.riskListName = riskListName;

    }



    public Long getRiskListIsSpecial() {

        return riskListIsSpecial;

    }



    public void setRiskListIsSpecial(Long riskListIsSpecial) {

        this.riskListIsSpecial = riskListIsSpecial;

    }



    public String getRiskListImgUrl() {

        return riskListImgUrl;

    }



    public void setRiskListImgUrl(String riskListImgUrl) {

        this.riskListImgUrl = riskListImgUrl;

    }



    public Long getRiskListDeviceType() {

        return riskListDeviceType;

    }



    public void setRiskListDeviceType(Long riskListDeviceType) {

        this.riskListDeviceType = riskListDeviceType;

    }



    public String getRiskListDeviceModel() {

        return riskListDeviceModel;

    }



    public void setRiskListDeviceModel(String riskListDeviceModel) {

        this.riskListDeviceModel = riskListDeviceModel;

    }



    public Long getRiskListWorkType() {

        return riskListWorkType;

    }



    public void setRiskListWorkType(Long riskListWorkType) {

        this.riskListWorkType = riskListWorkType;

    }



    public Long getRiskListWorkFrequency() {

        return riskListWorkFrequency;

    }



    public void setRiskListWorkFrequency(Long riskListWorkFrequency) {

        this.riskListWorkFrequency = riskListWorkFrequency;

    }



    public String getRiskListWorkFrequencyName() {

        return riskListWorkFrequencyName;

    }



    public void setRiskListWorkFrequencyName(String riskListWorkFrequencyName) {

        this.riskListWorkFrequencyName = riskListWorkFrequencyName;

    }



    public Long getRiskListCraftsType() {

        return riskListCraftsType;

    }



    public void setRiskListCraftsType(Long riskListCraftsType) {

        this.riskListCraftsType = riskListCraftsType;

    }



    public String getRiskTypeName() {

        return riskTypeName;

    }



    public void setRiskTypeName(String riskTypeName) {

        this.riskTypeName = riskTypeName;

    }



    public String getRiskListCraftsDescription() {

        return riskListCraftsDescription;

    }



    public void setRiskListCraftsDescription(String riskListCraftsDescription) {

        this.riskListCraftsDescription = riskListCraftsDescription;

    }



    public Long getRegionId() {

        return regionId;

    }



    public void setRegionId(Long regionId) {

        this.regionId = regionId;

    }



    public String getRegionName() {

        return regionName;

    }



    public void setRegionName(String regionName) {

        this.regionName = regionName;

    }



    public Long getDeptId() {

        return deptId;

    }



    public void setDeptId(Long deptId) {

        this.deptId = deptId;

    }



    public String getDeptName() {

        return deptName;

    }



    public void setDeptName(String deptName) {

        this.deptName = deptName;

    }



    public Long getUserId() {

        return userId;

    }



    public void setUserId(Long userId) {

        this.userId = userId;

    }



    public String getUserName() {

        return userName;

    }



    public void setUserName(String userName) {

        this.userName = userName;

    }



    public Integer getRiskType() {

        return riskType;

    }



    public void setRiskType(Integer riskType) {

        this.riskType = riskType;

    }



    public Long getCompanyId() {

        return companyId;

    }



    public void setCompanyId(Long companyId) {

        this.companyId = companyId;

    }



    public Integer getIsEvaluation() {

        return isEvaluation;

    }



    public void setIsEvaluation(Integer isEvaluation) {

        this.isEvaluation = isEvaluation;

    }



    public List<PreventRiskControlMeasure> getRiskControlMeasures() {

        return riskControlMeasures;

    }



    public void setRiskControlMeasures(List<PreventRiskControlMeasure> riskControlMeasures) {

        this.riskControlMeasures = riskControlMeasures;

    }

}

package com.ruoyi.doublePrevention.entity.dto.resp;

import com.ruoyi.doublePrevention.entity.PreventRiskControlMeasure;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;

import java.util.List;

public class PreventRiskCheckUnitRespDTO {


    /** id */
    private Long riskListId;

    /** 风险单元编号 */
    private String riskListNum;

    /** 风险单元名称 */
    private String riskListName;

    /** 是否特种(1否,2是) */
    @Excel(name = "是否特种",readConverterExp = "1=否,2=是")
    private Long riskListIsSpecial;

    /** 图片 */
    private String riskListImgUrl;

    /** 设备设施类型 */
    private Long riskListDeviceType;

    /** 规格/型号 */
    private String riskListDeviceModel;

    /** 作业活动类型 */
    private Long riskListWorkType;

    /** 作业频率 */
    private Long riskListWorkFrequency;

    private String riskListWorkFrequencyName;

    /** 工艺作业类型 */
    private Long riskListCraftsType;

    /**
     * 风险单元类型名称,(包含设备设施类型名称,作业活动类型名称,工艺节点类型名称)
     */
    private String riskTypeName;

    /** 节点描述 */
    private String riskListCraftsDescription;

    /** 区域/位置 */
    private Long regionId;

    /** 区域/位置名称 */
    private String regionName;

    /** 管辖单位/部门 */
    private Long deptId;

    /** 管辖部门名称 */
    private String deptName;

    /** 负责人 */
    private Long userId;

    /** 负责人名称 */
    private String userName;

    /** 风险单元类型(1设备设置,2作业活动,3工艺节点) */
    @Excel(name = "风险单元类型", readConverterExp = "1=设备设施,2=作业活动,3=工艺节点,4=基础清单,5=区域/作业场所")
    private Integer riskType;

    /** 所属公司 */
    private Long companyId;

    /**已评价计划数  如作为查询条件 0 代表未评价, 1 代表已评价 */
    private Integer isEvaluation;

    private List<PreventRiskControlMeasure> riskControlMeasures;

    public Long getRiskListId() {
        return riskListId;
    }

    public void setRiskListId(Long riskListId) {
        this.riskListId = riskListId;
    }

    public String getRiskListNum() {
        return riskListNum;
    }

    public void setRiskListNum(String riskListNum) {
        this.riskListNum = riskListNum;
    }

    public String getRiskListName() {
        return riskListName;
    }

    public void setRiskListName(String riskListName) {
        this.riskListName = riskListName;
    }

    public Long getRiskListIsSpecial() {
        return riskListIsSpecial;
    }

    public void setRiskListIsSpecial(Long riskListIsSpecial) {
        this.riskListIsSpecial = riskListIsSpecial;
    }

    public String getRiskListImgUrl() {
        return riskListImgUrl;
    }

    public void setRiskListImgUrl(String riskListImgUrl) {
        this.riskListImgUrl = riskListImgUrl;
    }

    public Long getRiskListDeviceType() {
        return riskListDeviceType;
    }

    public void setRiskListDeviceType(Long riskListDeviceType) {
        this.riskListDeviceType = riskListDeviceType;
    }

    public String getRiskListDeviceModel() {
        return riskListDeviceModel;
    }

    public void setRiskListDeviceModel(String riskListDeviceModel) {
        this.riskListDeviceModel = riskListDeviceModel;
    }

    public Long getRiskListWorkType() {
        return riskListWorkType;
    }

    public void setRiskListWorkType(Long riskListWorkType) {
        this.riskListWorkType = riskListWorkType;
    }

    public Long getRiskListWorkFrequency() {
        return riskListWorkFrequency;
    }

    public void setRiskListWorkFrequency(Long riskListWorkFrequency) {
        this.riskListWorkFrequency = riskListWorkFrequency;
    }

    public String getRiskListWorkFrequencyName() {
        return riskListWorkFrequencyName;
    }

    public void setRiskListWorkFrequencyName(String riskListWorkFrequencyName) {
        this.riskListWorkFrequencyName = riskListWorkFrequencyName;
    }

    public Long getRiskListCraftsType() {
        return riskListCraftsType;
    }

    public void setRiskListCraftsType(Long riskListCraftsType) {
        this.riskListCraftsType = riskListCraftsType;
    }

    public String getRiskTypeName() {
        return riskTypeName;
    }

    public void setRiskTypeName(String riskTypeName) {
        this.riskTypeName = riskTypeName;
    }

    public String getRiskListCraftsDescription() {
        return riskListCraftsDescription;
    }

    public void setRiskListCraftsDescription(String riskListCraftsDescription) {
        this.riskListCraftsDescription = riskListCraftsDescription;
    }

    public Long getRegionId() {
        return regionId;
    }

    public void setRegionId(Long regionId) {
        this.regionId = regionId;
    }

    public String getRegionName() {
        return regionName;
    }

    public void setRegionName(String regionName) {
        this.regionName = regionName;
    }

    public Long getDeptId() {
        return deptId;
    }

    public void setDeptId(Long deptId) {
        this.deptId = deptId;
    }

    public String getDeptName() {
        return deptName;
    }

    public void setDeptName(String deptName) {
        this.deptName = deptName;
    }

    public Long getUserId() {
        return userId;
    }

    public void setUserId(Long userId) {
        this.userId = userId;
    }

    public String getUserName() {
        return userName;
    }

    public void setUserName(String userName) {
        this.userName = userName;
    }

    public Integer getRiskType() {
        return riskType;
    }

    public void setRiskType(Integer riskType) {
        this.riskType = riskType;
    }

    public Long getCompanyId() {
        return companyId;
    }

    public void setCompanyId(Long companyId) {
        this.companyId = companyId;
    }

    public Integer getIsEvaluation() {
        return isEvaluation;
    }

    public void setIsEvaluation(Integer isEvaluation) {
        this.isEvaluation = isEvaluation;
    }

    public List<PreventRiskControlMeasure> getRiskControlMeasures() {
        return riskControlMeasures;
    }

    public void setRiskControlMeasures(List<PreventRiskControlMeasure> riskControlMeasures) {
        this.riskControlMeasures = riskControlMeasures;
    }
}

 src/main/java/com/ruoyi/doublePrevention/entity/dto/resp/RiskAndPeopleInfoDTO.java

@@ -1,123 +1,123 @@
package com.ruoyi.doublePrevention.entity.dto.resp;



import lombok.Data;



import java.util.Date;



@Data

public class RiskAndPeopleInfoDTO {



    private Long id;



    private String areaCode;



    private String companyName;



    private String companyNature;



    private String companyNatureName;



    private String hazardId;



    private String hazardCode;



    private String hazardName;



    private String hazardRank;



    private String hazardRankName;



    private String parkName;



    /**

     *主要责任人id

     */

    private Long mainLiabilityPersonId;

    /**

     * 主要责任人姓名

     */

    private String mainLiabilityPersonName;

    /**

     * 主要责任人类型

     */

    private String mainLiabilityPersonType;

    /**

     * 主要责任人电话

     */

    private Long mainLiabilityPersonPhone;

    /**

     * 主要责任人职务

     */

    private String mainLiabilityPersonJob;

    /**

     * 主要责任人任务

     */

    private String mainLiabilityPersonWork;



    /**

     *技术责任人id

     */

    private Long technologyLiabilityPersonId;

    /**

     * 技术责任人姓名

     */

    private String technologyLiabilityPersonName;

    /**

     * 技术责任人类型

     */

    private String technologyLiabilityPersonType;

    /**

     * 技术责任人电话

     */

    private Long technologyLiabilityPersonPhone;

    /**

     * 技术责任人职务

     */

    private String technologyLiabilityPersonJob;

    /**

     * 技术责任人任务

     */

    private String technologyLiabilityPersonWork;



    /**

     *操作责任人id

     */

    private Long handleLiabilityPersonId;

    /**

     * 操作责任人姓名

     */

    private String handleLiabilityPersonName;

    /**

     * 操作责任人类型

     */

    private String handleLiabilityPersonType;

    /**

     * 操作责任人电话

     */

    private Long handleLiabilityPersonPhone;

    /**

     * 操作责任人职务

     */

    private String handleLiabilityPersonJob;

    /**

     * 操作责任人任务

     */

    private String handleLiabilityPersonWork;



    /**

     * 创建时间

     */

    private Date gmtCreate;

    /**

     * 最后修改时间

     */

    private Date gmtModitify;

    /**

     * 创建人

     */

    private String createByUserName;

    /**

     * 修改人

     */

    private String lastEditUserName;

}

package com.ruoyi.doublePrevention.entity.dto.resp;

import lombok.Data;

import java.util.Date;

@Data
public class RiskAndPeopleInfoDTO {

    private Long id;

    private String areaCode;

    private String companyName;

    private String companyNature;

    private String companyNatureName;

    private String hazardId;

    private String hazardCode;

    private String hazardName;

    private String hazardRank;

    private String hazardRankName;

    private String parkName;

    /**
     *主要责任人id
     */
    private Long mainLiabilityPersonId;
    /**
     * 主要责任人姓名
     */
    private String mainLiabilityPersonName;
    /**
     * 主要责任人类型
     */
    private String mainLiabilityPersonType;
    /**
     * 主要责任人电话
     */
    private Long mainLiabilityPersonPhone;
    /**
     * 主要责任人职务
     */
    private String mainLiabilityPersonJob;
    /**
     * 主要责任人任务
     */
    private String mainLiabilityPersonWork;

    /**
     *技术责任人id
     */
    private Long technologyLiabilityPersonId;
    /**
     * 技术责任人姓名
     */
    private String technologyLiabilityPersonName;
    /**
     * 技术责任人类型
     */
    private String technologyLiabilityPersonType;
    /**
     * 技术责任人电话
     */
    private Long technologyLiabilityPersonPhone;
    /**
     * 技术责任人职务
     */
    private String technologyLiabilityPersonJob;
    /**
     * 技术责任人任务
     */
    private String technologyLiabilityPersonWork;

    /**
     *操作责任人id
     */
    private Long handleLiabilityPersonId;
    /**
     * 操作责任人姓名
     */
    private String handleLiabilityPersonName;
    /**
     * 操作责任人类型
     */
    private String handleLiabilityPersonType;
    /**
     * 操作责任人电话
     */
    private Long handleLiabilityPersonPhone;
    /**
     * 操作责任人职务
     */
    private String handleLiabilityPersonJob;
    /**
     * 操作责任人任务
     */
    private String handleLiabilityPersonWork;

    /**
     * 创建时间
     */
    private Date gmtCreate;
    /**
     * 最后修改时间
     */
    private Date gmtModitify;
    /**
     * 创建人
     */
    private String createByUserName;
    /**
     * 修改人
     */
    private String lastEditUserName;
}

 src/main/java/com/ruoyi/doublePrevention/entity/dto/resp/RiskAndPeopleInfoRespDTO.java

@@ -1,64 +1,64 @@
package com.ruoyi.doublePrevention.entity.dto.resp;



import lombok.Data;



import java.math.BigDecimal;

import java.util.List;





@Data

public class RiskAndPeopleInfoRespDTO {

    /**

     * 所有责任人所有的任务

     * */

    private Integer count;

    /**

     * 所有责任人所有完成的任务

     * */

    private Integer complete;

    /**

     * 所有任务完成率

     * */

    private BigDecimal completeRatio;



    /**

     * 操作责任人所有的任务

     * */

    private Integer countOfHandle;

    /**

     * 操作责任人所有完成的任务

     * */

    private Integer completeOfHandle;

    /**

     * 操作任务完成率

     * */

    private BigDecimal completeRatioOfHandle;



    /**

     * 技术责任人所有的任务

     * */

    private Integer countOfTechnology;

    /**

     * 技术责任人所有完成的任务

     * */

    private Integer completeOfTechnology;

    /**

     * 技术任务完成率

     * */

    private BigDecimal completeRatioOfTechnology;



    /**

     * 主要责任人所有的任务

     * */

    private Integer countOfMain;

    /**

     * 主要责任人所有完成的任务

     * */

    private Integer completeOfMain;

    /**

     * 主要任务完成率

     * */

    private BigDecimal completeRatioOfMain;



    private List<RiskAndPeopleInfoDTO> riskAndPeopleInfoDTO;

}

package com.ruoyi.doublePrevention.entity.dto.resp;

import lombok.Data;

import java.math.BigDecimal;
import java.util.List;


@Data
public class RiskAndPeopleInfoRespDTO {
    /**
     * 所有责任人所有的任务
     * */
    private Integer count;
    /**
     * 所有责任人所有完成的任务
     * */
    private Integer complete;
    /**
     * 所有任务完成率
     * */
    private BigDecimal completeRatio;

    /**
     * 操作责任人所有的任务
     * */
    private Integer countOfHandle;
    /**
     * 操作责任人所有完成的任务
     * */
    private Integer completeOfHandle;
    /**
     * 操作任务完成率
     * */
    private BigDecimal completeRatioOfHandle;

    /**
     * 技术责任人所有的任务
     * */
    private Integer countOfTechnology;
    /**
     * 技术责任人所有完成的任务
     * */
    private Integer completeOfTechnology;
    /**
     * 技术任务完成率
     * */
    private BigDecimal completeRatioOfTechnology;

    /**
     * 主要责任人所有的任务
     * */
    private Integer countOfMain;
    /**
     * 主要责任人所有完成的任务
     * */
    private Integer completeOfMain;
    /**
     * 主要任务完成率
     * */
    private BigDecimal completeRatioOfMain;

    private List<RiskAndPeopleInfoDTO> riskAndPeopleInfoDTO;
}

 src/main/java/com/ruoyi/doublePrevention/entity/dto/resp/RiskOldInfoQueryRespDTO.java

@@ -1,216 +1,216 @@
package com.ruoyi.doublePrevention.entity.dto.resp;



import lombok.Data;



import java.util.Date;



/**

 * (RiskOldInfo)实体类

 *

 * @author makejava

 * @since 2023-03-20 15:33:46

 */

@Data

public class RiskOldInfoQueryRespDTO {





    private Long id;

    /**

     * 2上报人部门

     */

    private String reportDep;

    /**

     * 3上报人职务

     */

    private String reportPeopleJob;

    /**

     * 4上报人

     */

    private String reportPeople;

    /**

     * 5发现人

     */

    private String findPeople;

    /**

     * 6发现时间

     */

    private Date findTime;

    /**

     * 7隐患内容

     */

    private String riskDesc;

    /**

     * 8隐患位置

     */

    private String riskSite;

    /**

     * 9隐患类型

     */

    private String riskType;

    /**

     * 10隐患级别

     */

    private String riskLevel;

    /**

     * 11隐患所在部门

     */

    private String riskDep;

    /**

     * 12检查类型

     */

    private String checkType;

    /**

     * 13专业

     */

    private String major;

    /**

     * 14责任人部门

     */

    private String liabilityDep;

    /**

     * 15责任人

     */

    private String liabilityPeople;

    /**

     * 16责任人职务

     */

    private String liabilityPeopleJob;

    /**

     * 17整改时间

     */

    private Date rectifyTime;

    /**

     * 18允许延期时间

     */

    private Date rectifyTimeout;

    /**

     * 19负责人部门

     */

    private String leadDep;

    /**

     * 20负责人职务

     */

    private String leadJob;

    /**

     * 21整改人部门

     */

    private String rectifyDep;

    /**

     * 22整改人职务

     */

    private String rectifyPeopleJob;

    /**

     * 23整改人

     */

    private String rectifyPeople;

    /**

     * 24整改措施

     */

    private String rectifyMeasure;

    /**

     * 25整改开始时间

     */

    private Date rectifyStartTime;

    /**

     * 26整改完成时间

     */

    private Date rectifyFinishTime;

    /**

     * 27整改情况

     */

    private String rectifyDesc;

    /**

     * 28资金

     */

    private Double cost;

    /**

     * 29预案

     */

    private String plan;

    /**

     * 30防范措施

     */

    private String precautionMeasure;

    /**

     * 31验收时间

     */

    private Date acceptTime;

    /**

     * 32验收说明

     */

    private String acceptDesc;

    /**

     * 33验收部门

     */

    private String acceptDep;

    /**

     * 34验收人

     */

    private String acceptPeople;

    /**

     * 35验收人职务

     */

    private String acceptPeopleJob;

    /**

     * 36销号人部门

     */

    private String cancelDep;

    /**

     * 37销号人

     */

    private String cancelPeople;

    /**

     * 38销号人职务

     */

    private String cancelPeopleJob;

    /**

     * 39延期申请人

     */

    private String applyPeople;

    /**

     * 40申请时间

     */

    private Date applyTime;

    /**

     * 41申请理由

     */

    private String applyDesc;

    /**

     * 42申请-备注

     */

    private String applyNote;

    /**

     * 43申请延期时间

     */

    private Date applyTimeoutTime;

    /**

     * 44申请处理人

     */

    private String applyDealPeople;

    /**

     * 45申请处理时间

     */

    private Date appleDealTime;

    /**

     * 46流转责任部门

     */

    private String exchangeLeadDep;

    /**

     * 47流转责任人

     */

    private String exchangeLeadPeople;

    /**

     * 48流转责任人职务

     */

    private String exchangeLeadPeopleJob;

    /**

     * 49流转备注

     */

    private String exchangeDesc;





    private long tag;





}



package com.ruoyi.doublePrevention.entity.dto.resp;

import lombok.Data;

import java.util.Date;

/**
 * (RiskOldInfo)实体类
 *
 * @author makejava
 * @since 2023-03-20 15:33:46
 */
@Data
public class RiskOldInfoQueryRespDTO {


    private Long id;
    /**
     * 2上报人部门
     */
    private String reportDep;
    /**
     * 3上报人职务
     */
    private String reportPeopleJob;
    /**
     * 4上报人
     */
    private String reportPeople;
    /**
     * 5发现人
     */
    private String findPeople;
    /**
     * 6发现时间
     */
    private Date findTime;
    /**
     * 7隐患内容
     */
    private String riskDesc;
    /**
     * 8隐患位置
     */
    private String riskSite;
    /**
     * 9隐患类型
     */
    private String riskType;
    /**
     * 10隐患级别
     */
    private String riskLevel;
    /**
     * 11隐患所在部门
     */
    private String riskDep;
    /**
     * 12检查类型
     */
    private String checkType;
    /**
     * 13专业
     */
    private String major;
    /**
     * 14责任人部门
     */
    private String liabilityDep;
    /**
     * 15责任人
     */
    private String liabilityPeople;
    /**
     * 16责任人职务
     */
    private String liabilityPeopleJob;
    /**
     * 17整改时间
     */
    private Date rectifyTime;
    /**
     * 18允许延期时间
     */
    private Date rectifyTimeout;
    /**
     * 19负责人部门
     */
    private String leadDep;
    /**
     * 20负责人职务
     */
    private String leadJob;
    /**
     * 21整改人部门
     */
    private String rectifyDep;
    /**
     * 22整改人职务
     */
    private String rectifyPeopleJob;
    /**
     * 23整改人
     */
    private String rectifyPeople;
    /**
     * 24整改措施
     */
    private String rectifyMeasure;
    /**
     * 25整改开始时间
     */
    private Date rectifyStartTime;
    /**
     * 26整改完成时间
     */
    private Date rectifyFinishTime;
    /**
     * 27整改情况
     */
    private String rectifyDesc;
    /**
     * 28资金
     */
    private Double cost;
    /**
     * 29预案
     */
    private String plan;
    /**
     * 30防范措施
     */
    private String precautionMeasure;
    /**
     * 31验收时间
     */
    private Date acceptTime;
    /**
     * 32验收说明
     */
    private String acceptDesc;
    /**
     * 33验收部门
     */
    private String acceptDep;
    /**
     * 34验收人
     */
    private String acceptPeople;
    /**
     * 35验收人职务
     */
    private String acceptPeopleJob;
    /**
     * 36销号人部门
     */
    private String cancelDep;
    /**
     * 37销号人
     */
    private String cancelPeople;
    /**
     * 38销号人职务
     */
    private String cancelPeopleJob;
    /**
     * 39延期申请人
     */
    private String applyPeople;
    /**
     * 40申请时间
     */
    private Date applyTime;
    /**
     * 41申请理由
     */
    private String applyDesc;
    /**
     * 42申请-备注
     */
    private String applyNote;
    /**
     * 43申请延期时间
     */
    private Date applyTimeoutTime;
    /**
     * 44申请处理人
     */
    private String applyDealPeople;
    /**
     * 45申请处理时间
     */
    private Date appleDealTime;
    /**
     * 46流转责任部门
     */
    private String exchangeLeadDep;
    /**
     * 47流转责任人
     */
    private String exchangeLeadPeople;
    /**
     * 48流转责任人职务
     */
    private String exchangeLeadPeopleJob;
    /**
     * 49流转备注
     */
    private String exchangeDesc;


    private long tag;


}


 src/main/java/com/ruoyi/doublePrevention/enums/CJReportEnum.java

@@ -1,29 +1,29 @@
package com.ruoyi.doublePrevention.enums;



import com.fasterxml.jackson.annotation.JsonValue;



public enum CJReportEnum {



    SUCCESS("100", "上报全部成功"),

    SUCESS_AND_FAIL("102", "上报部分成功"),

    FAIL("103", "上报全部失败"),



    ;



    String code;

    @JsonValue

    String value;



    CJReportEnum(String code, String value) {

        this.code = code;

        this.value = value;

    }



    public String getCode() {

        return code;

    }



    public String getValue() {

        return value;

    }

}

package com.ruoyi.doublePrevention.enums;

import com.fasterxml.jackson.annotation.JsonValue;

public enum CJReportEnum {

    SUCCESS("100", "上报全部成功"),
    SUCESS_AND_FAIL("102", "上报部分成功"),
    FAIL("103", "上报全部失败"),

    ;

    String code;
    @JsonValue
    String value;

    CJReportEnum(String code, String value) {
        this.code = code;
        this.value = value;
    }

    public String getCode() {
        return code;
    }

    public String getValue() {
        return value;
    }
}

 src/main/java/com/ruoyi/doublePrevention/enums/E.java

@@ -1,36 +1,36 @@
package com.ruoyi.doublePrevention.enums;



public enum E {



    DATA_PARAM_NULL("B0100","数据传参为空"),

    DATA_PARAM_CHECK_INVALID("B0101","数据校验非法"),

    DATA_DATABASE_EXIST("B0111","数据记录已存在"),

    DATA_DATABASE_DUPLICATED("B0113","数据记录重复"),

    DATA_DATABASE_NO_EXISTENT("B0114","查询不到对应记录"),

    DATA_DATABASE_EXIST_BUT_NOT_VALID("B0115","记录无效"),

    DATA_BING_RELATION("B0116","数据已被绑定关系"),

    DATA_STATUS_NOT_EXIST("B0120","数据状态不存在"),

    DATA_STATUS_CHECK_INVALID("B0121","数据状态不合法"),

    DATA_OPERATION_NO_PERMISSION("B0122","数据没有操作权限"),

    NOT_DELETE("B0131","无法删除"),

    ADD_FAIL("B0132","新增失败"),

    UPDATE_FAIL("B0133","修改失败"),

    EXPORT_FAIL("B0134","导出失败！"),



    ;

    private String code;

    private String desc;



    E(String code, String desc) {

        this.code = code;

        this.desc = desc;

    }



    public String getCode() {

        return code;

    }



    public String getDesc() {

        return desc;

    }

}

package com.ruoyi.doublePrevention.enums;

public enum E {

    DATA_PARAM_NULL("B0100","数据传参为空"),
    DATA_PARAM_CHECK_INVALID("B0101","数据校验非法"),
    DATA_DATABASE_EXIST("B0111","数据记录已存在"),
    DATA_DATABASE_DUPLICATED("B0113","数据记录重复"),
    DATA_DATABASE_NO_EXISTENT("B0114","查询不到对应记录"),
    DATA_DATABASE_EXIST_BUT_NOT_VALID("B0115","记录无效"),
    DATA_BING_RELATION("B0116","数据已被绑定关系"),
    DATA_STATUS_NOT_EXIST("B0120","数据状态不存在"),
    DATA_STATUS_CHECK_INVALID("B0121","数据状态不合法"),
    DATA_OPERATION_NO_PERMISSION("B0122","数据没有操作权限"),
    NOT_DELETE("B0131","无法删除"),
    ADD_FAIL("B0132","新增失败"),
    UPDATE_FAIL("B0133","修改失败"),
    EXPORT_FAIL("B0134","导出失败！"),

    ;
    private String code;
    private String desc;

    E(String code, String desc) {
        this.code = code;
        this.desc = desc;
    }

    public String getCode() {
        return code;
    }

    public String getDesc() {
        return desc;
    }
}

 src/main/java/com/ruoyi/doublePrevention/enums/StatusEnum.java

@@ -1,35 +1,35 @@
package com.ruoyi.doublePrevention.enums;



import com.fasterxml.jackson.annotation.JsonValue;



public enum StatusEnum {



    DELETE_STATUS_USE((byte) 0, "正常"),

    DELETE_STATUS_DISCARD((byte) 1, "删除"),



    EXEC_FAIL((byte) 0, "操作失败"),

    EXEC_SUCCESS((byte) 1, "操作成功"),



    RECTIFY_ING((byte) 0, "整改中"),

    RECTIFY_WAIT_ACCEPT((byte) 1, "待验收"),

    RECTIFY_TIMEOUT((byte) 2, "延期整改"),

    RECTIFY_TIMEOUT_AND_FAIL((byte) 3, "超期未整改"),

    ACCEPT_SUCCESS((byte) 9, "已验收"),

    ;

    byte code;

    @JsonValue

    String value;



    StatusEnum(byte code, String value) {

        this.code = code;

        this.value = value;

    }



    public byte getCode() {

        return code;

    }



    public String getValue() {

        return value;

    }

}

package com.ruoyi.doublePrevention.enums;

import com.fasterxml.jackson.annotation.JsonValue;

public enum StatusEnum {

    DELETE_STATUS_USE((byte) 0, "正常"),
    DELETE_STATUS_DISCARD((byte) 1, "删除"),

    EXEC_FAIL((byte) 0, "操作失败"),
    EXEC_SUCCESS((byte) 1, "操作成功"),

    RECTIFY_ING((byte) 0, "整改中"),
    RECTIFY_WAIT_ACCEPT((byte) 1, "待验收"),
    RECTIFY_TIMEOUT((byte) 2, "延期整改"),
    RECTIFY_TIMEOUT_AND_FAIL((byte) 3, "超期未整改"),
    ACCEPT_SUCCESS((byte) 9, "已验收"),
    ;
    byte code;
    @JsonValue
    String value;

    StatusEnum(byte code, String value) {
        this.code = code;
        this.value = value;
    }

    public byte getCode() {
        return code;
    }

    public String getValue() {
        return value;
    }
}

 src/main/java/com/ruoyi/doublePrevention/exception/AusinessException.java

@@ -1,40 +1,40 @@
package com.ruoyi.doublePrevention.exception;





import com.ruoyi.doublePrevention.enums.E;



public class AusinessException extends RuntimeException {



    private String code;



    private String message;



    public AusinessException(String code, String message) {

        super(message);

        this.message = message;

        this.code = code;

    }



    public AusinessException(E e, String message) {

        super(message);

        this.message = message;

        this.code = e.getCode();

    }



    public String getCode() {

        return code;

    }



    public void setCode(String code) {

        this.code = code;

    }



    @Override

    public String getMessage() {

        return message;

    }



    public void setMessage(String message) {

        this.message = message;

    }

}

package com.ruoyi.doublePrevention.exception;


import com.ruoyi.doublePrevention.enums.E;

public class AusinessException extends RuntimeException {

    private String code;

    private String message;

    public AusinessException(String code, String message) {
        super(message);
        this.message = message;
        this.code = code;
    }

    public AusinessException(E e, String message) {
        super(message);
        this.message = message;
        this.code = e.getCode();
    }

    public String getCode() {
        return code;
    }

    public void setCode(String code) {
        this.code = code;
    }

    @Override
    public String getMessage() {
        return message;
    }

    public void setMessage(String message) {
        this.message = message;
    }
}

 src/main/java/com/ruoyi/doublePrevention/exception/BusinessException.java

@@ -1,40 +1,40 @@
package com.ruoyi.doublePrevention.exception;





import com.ruoyi.doublePrevention.enums.ResultCodes;



public class BusinessException extends RuntimeException {



    private String code;



    private String message;



    public BusinessException(ResultCodes error) {

        super(error.getDesc());

        this.code = error.getCode();

        this.message = error.getDesc();

    }



    public BusinessException(String code,String message) {

        super(message);

        this.code = code;

        this.message = message;

    }



    public String getCode() {

        return code;

    }



    public void setCode(String code) {

        this.code = code;

    }



    @Override

    public String getMessage() {

        return message;

    }



    public void setMessage(String message) {

        this.message = message;

    }

}

package com.ruoyi.doublePrevention.exception;


import com.ruoyi.doublePrevention.enums.ResultCodes;

public class BusinessException extends RuntimeException {

    private String code;

    private String message;

    public BusinessException(ResultCodes error) {
        super(error.getDesc());
        this.code = error.getCode();
        this.message = error.getDesc();
    }

    public BusinessException(String code,String message) {
        super(message);
        this.code = code;
        this.message = message;
    }

    public String getCode() {
        return code;
    }

    public void setCode(String code) {
        this.code = code;
    }

    @Override
    public String getMessage() {
        return message;
    }

    public void setMessage(String message) {
        this.message = message;
    }
}

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

@@ -1,44 +1,44 @@
package com.ruoyi.doublePrevention.repository;





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

import com.baomidou.mybatisplus.core.metadata.IPage;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

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

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

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

import io.lettuce.core.dynamic.annotation.Param;

import org.springframework.stereotype.Repository;



import java.util.List;



@Repository

public interface PreventCJReportCheckRecordFromTaskRepository extends BaseMapper<PreventCJReportCheckRecordFromTask> {



//    /**

//     * 任务记录-分页查询

//     * */

//    IPage<PreventCJReportCheckRecordFromTask> getReportTaskFromWorkPage(Page<Object> objectPage, PreventReportCheckRecordFromTaskReqDTO queryReqDTO);

    /**

     * 任务-查询待上报

     * */

    List<PreventCJReportCheckRecordFromTask> listReportTaskRecordDate();

    /**

     * 任务-待上报状态变更

     * */

    int updateTaskReportStatus(HandlerReportParam handlerReportParam);

    /**

     * 任务-待上报状态变更 - 通过id

     * */

    int updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);

    /**

     * 插入任务记录

     * */

    int insertRecord(PreventCJReportCheckRecordFromTask recordFromTasks);

    /**

     * 批量插入任务记录

     * */

    int insertRecordList(@Param(value="list") List<PreventCJReportCheckRecordFromTask> recordFromTaskList);



    int updateCJReportStatusBatchById(List<PreventCJReportCheckRecordFromTask> cjRecordFromTasks);

}

package com.ruoyi.doublePrevention.repository;


import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportCheckRecordFromTask;
import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam;
import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
import io.lettuce.core.dynamic.annotation.Param;
import org.springframework.stereotype.Repository;

import java.util.List;

@Repository
public interface PreventCJReportCheckRecordFromTaskRepository extends BaseMapper<PreventCJReportCheckRecordFromTask> {

//    /**
//     * 任务记录-分页查询
//     * */
//    IPage<PreventCJReportCheckRecordFromTask> getReportTaskFromWorkPage(Page<Object> objectPage, PreventReportCheckRecordFromTaskReqDTO queryReqDTO);
    /**
     * 任务-查询待上报
     * */
    List<PreventCJReportCheckRecordFromTask> listReportTaskRecordDate();
    /**
     * 任务-待上报状态变更
     * */
    int updateTaskReportStatus(HandlerReportParam handlerReportParam);
    /**
     * 任务-待上报状态变更 - 通过id
     * */
    int updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);
    /**
     * 插入任务记录
     * */
    int insertRecord(PreventCJReportCheckRecordFromTask recordFromTasks);
    /**
     * 批量插入任务记录
     * */
    int insertRecordList(@Param(value="list") List<PreventCJReportCheckRecordFromTask> recordFromTaskList);

    int updateCJReportStatusBatchById(List<PreventCJReportCheckRecordFromTask> cjRecordFromTasks);
}

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

@@ -1,44 +1,44 @@
package com.ruoyi.doublePrevention.repository;



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

import com.baomidou.mybatisplus.core.metadata.IPage;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

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

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

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

import org.springframework.stereotype.Repository;



import java.util.List;



@Repository

public interface PreventCJReportCheckTaskFromWorkRepository extends BaseMapper<PreventCJReportCheckTaskFromWork> {



    /**

     * 任务配置 -查询待上报

     * */

    List<PreventCJReportCheckTaskFromWork> listReportTaskFromWorkDate();

    /**

     * 任务配置 -待上报状态变更

     * */

    int updateWorkReportStatus(HandlerReportParam handlerReportParam);

    /**

     * 任务配置 -待上报状态变更 -通过id

     * */

    int updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);

    /**

     * 插入数据

     * */

    int insertTaskFromWorkList(PreventCJReportCheckTaskFromWork cjTaskFromWork);



    PreventCJReportCheckTaskFromWork geByMeasureUUidAndJobId(String measureUuid, Long jobId);







    List<PreventCJReportCheckTaskFromWork> listWork();



    int updateInfo(PreventCJReportCheckTaskFromWork work);



    List<PreventCJReportCheckTaskFromWork> listWork1();



    int updateInfo1(PreventCJReportCheckTaskFromWork work);

}

package com.ruoyi.doublePrevention.repository;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportCheckTaskFromWork;
import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam;
import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
import org.springframework.stereotype.Repository;

import java.util.List;

@Repository
public interface PreventCJReportCheckTaskFromWorkRepository extends BaseMapper<PreventCJReportCheckTaskFromWork> {

    /**
     * 任务配置 -查询待上报
     * */
    List<PreventCJReportCheckTaskFromWork> listReportTaskFromWorkDate();
    /**
     * 任务配置 -待上报状态变更
     * */
    int updateWorkReportStatus(HandlerReportParam handlerReportParam);
    /**
     * 任务配置 -待上报状态变更 -通过id
     * */
    int updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);
    /**
     * 插入数据
     * */
    int insertTaskFromWorkList(PreventCJReportCheckTaskFromWork cjTaskFromWork);

    PreventCJReportCheckTaskFromWork geByMeasureUUidAndJobId(String measureUuid, Long jobId);



    List<PreventCJReportCheckTaskFromWork> listWork();

    int updateInfo(PreventCJReportCheckTaskFromWork work);

    List<PreventCJReportCheckTaskFromWork> listWork1();

    int updateInfo1(PreventCJReportCheckTaskFromWork work);
}

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

@@ -1,14 +1,14 @@
package com.ruoyi.doublePrevention.repository;



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

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

import org.springframework.stereotype.Repository;



@Repository

public interface PreventCJReportConfigLogRepository extends BaseMapper<PreventCJReportConfigLog> {

//

//    /** extends BaseMapper<>

//     * 数据上报配置历史记录-查询

//     */

//    IPage<PreventCJReportConfigLog> getReportConfigLogPage(Page<Object> page, PreventReportConfigLogQueryReqDTO queryReqDTO);

}

package com.ruoyi.doublePrevention.repository;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportConfigLog;
import org.springframework.stereotype.Repository;

@Repository
public interface PreventCJReportConfigLogRepository extends BaseMapper<PreventCJReportConfigLog> {
//
//    /** extends BaseMapper<>
//     * 数据上报配置历史记录-查询
//     */
//    IPage<PreventCJReportConfigLog> getReportConfigLogPage(Page<Object> page, PreventReportConfigLogQueryReqDTO queryReqDTO);
}

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

@@ -1,23 +1,23 @@
package com.ruoyi.doublePrevention.repository;



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

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

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

import org.springframework.stereotype.Repository;



import java.util.List;



@Repository

public interface PreventCJReportConfigRepository extends BaseMapper<PreventCJReportConfig> {





    /**

     * 数据上报配置-查询

     */

    List<PreventCJReportConfig> ListReportConfigs();



    /**

     * 数据上报配置-修改

     */

    int updateReportConfig(PreventReportConfigUpdateParams updateParams);

}

package com.ruoyi.doublePrevention.repository;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportConfig;
import com.ruoyi.doublePrevention.repository.param.PreventReportConfigUpdateParams;
import org.springframework.stereotype.Repository;

import java.util.List;

@Repository
public interface PreventCJReportConfigRepository extends BaseMapper<PreventCJReportConfig> {


    /**
     * 数据上报配置-查询
     */
    List<PreventCJReportConfig> ListReportConfigs();

    /**
     * 数据上报配置-修改
     */
    int updateReportConfig(PreventReportConfigUpdateParams updateParams);
}

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

@@ -1,40 +1,40 @@
package com.ruoyi.doublePrevention.repository;



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

import com.baomidou.mybatisplus.core.metadata.IPage;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

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

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

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

import org.springframework.stereotype.Repository;



import java.util.List;



@Repository

public interface PreventCJReportDangerInfoRepository extends BaseMapper<PreventCJReportDangerInfo> {

//

//    /**

//     * 上报数据-隐患信息-分页查询

//     */

//    IPage<PreventCJReportDangerInfo> getReportDangerInfoPage(Page<Object> objectPage, PreventReportDangerInfoReqDTO queryReqDTO);

    /**

     * 上报数据-待上报数据查询

     */

    List<PreventCJReportDangerInfo> listReportDangerDate();

    /**

     * 上报数据-待上报状态变更

     */

    int updateTaskReportStatus(HandlerReportParam handlerReportParam);

    /**

     * 上报数据-待上报状态变更-通过id

     */

    int updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);

    /**

     * 上报数据-插入

     */

    int insertDangerInfo(PreventCJReportDangerInfo danger);



    List<PreventCJReportDangerInfo> getDangerListForCheckTask();



    PreventCJReportDangerInfo getDangerById(String dangerId);

}

package com.ruoyi.doublePrevention.repository;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportDangerInfo;
import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam;
import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
import org.springframework.stereotype.Repository;

import java.util.List;

@Repository
public interface PreventCJReportDangerInfoRepository extends BaseMapper<PreventCJReportDangerInfo> {
//
//    /**
//     * 上报数据-隐患信息-分页查询
//     */
//    IPage<PreventCJReportDangerInfo> getReportDangerInfoPage(Page<Object> objectPage, PreventReportDangerInfoReqDTO queryReqDTO);
    /**
     * 上报数据-待上报数据查询
     */
    List<PreventCJReportDangerInfo> listReportDangerDate();
    /**
     * 上报数据-待上报状态变更
     */
    int updateTaskReportStatus(HandlerReportParam handlerReportParam);
    /**
     * 上报数据-待上报状态变更-通过id
     */
    int updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);
    /**
     * 上报数据-插入
     */
    int insertDangerInfo(PreventCJReportDangerInfo danger);

    List<PreventCJReportDangerInfo> getDangerListForCheckTask();

    PreventCJReportDangerInfo getDangerById(String dangerId);
}

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

@@ -1,18 +1,18 @@
package com.ruoyi.doublePrevention.repository;



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

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

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

import org.springframework.stereotype.Repository;



import java.util.List;



@Repository

public interface PreventCJReportOverhaulLogRepository extends BaseMapper<PreventCJReportOverhaulLog> {



    int insertCJOverhaulLists(PreventCJReportOverhaulLog cjOverhaulLog);



    List<PreventCJReportOverhaulLog> listReportOverhaulDate();



    int updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);

}

package com.ruoyi.doublePrevention.repository;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportOverhaulLog;
import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam;
import org.springframework.stereotype.Repository;

import java.util.List;

@Repository
public interface PreventCJReportOverhaulLogRepository extends BaseMapper<PreventCJReportOverhaulLog> {

    int insertCJOverhaulLists(PreventCJReportOverhaulLog cjOverhaulLog);

    List<PreventCJReportOverhaulLog> listReportOverhaulDate();

    int updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);
}

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

@@ -1,9 +1,9 @@
package com.ruoyi.doublePrevention.repository;



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

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

import org.springframework.stereotype.Repository;



@Repository

public interface PreventCJReportPointRepository extends BaseMapper<PreventCJReportPoint> {

}

package com.ruoyi.doublePrevention.repository;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportPoint;
import org.springframework.stereotype.Repository;

@Repository
public interface PreventCJReportPointRepository extends BaseMapper<PreventCJReportPoint> {
}

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

@@ -1,9 +1,9 @@
package com.ruoyi.doublePrevention.repository;



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

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

import org.springframework.stereotype.Repository;



@Repository

public interface PreventCJReportResultDataRepository extends BaseMapper<PreventCJReportResultData> {

}

package com.ruoyi.doublePrevention.repository;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportResultData;
import org.springframework.stereotype.Repository;

@Repository
public interface PreventCJReportResultDataRepository extends BaseMapper<PreventCJReportResultData> {
}

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

@@ -1,33 +1,33 @@
package com.ruoyi.doublePrevention.repository;



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

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

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

import org.springframework.stereotype.Repository;



import java.util.List;



@Repository

public interface PreventCJReportRiskAnaUnitRepository extends BaseMapper<PreventCJReportRiskAnaUnit> {



//    /**

//     * 上报数据-风险分析单元-分页查询

//     */

//    IPage<PreventCJReportRiskAnaUnit> getReportRiskUnitPage(Page<Object> page, PreReportRiskUnitQueryReqDTO queryReqDTO);

    /**

     * 上报数据-查询待上报数据

     */

    List<PreventCJReportRiskAnaUnit> listReportUnitDate();

    /**

     * 上报数据-修改待上报

     */

    int updateReportStatus();

    /**

     * 上报数据-修改待上报-通过id

     */

    int updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);

    /**

     * 上报数据-插入

     */

    int insertUnitList(PreventCJReportRiskAnaUnit unit);

}

package com.ruoyi.doublePrevention.repository;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportRiskAnaUnit;
import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam;
import org.springframework.stereotype.Repository;

import java.util.List;

@Repository
public interface PreventCJReportRiskAnaUnitRepository extends BaseMapper<PreventCJReportRiskAnaUnit> {

//    /**
//     * 上报数据-风险分析单元-分页查询
//     */
//    IPage<PreventCJReportRiskAnaUnit> getReportRiskUnitPage(Page<Object> page, PreReportRiskUnitQueryReqDTO queryReqDTO);
    /**
     * 上报数据-查询待上报数据
     */
    List<PreventCJReportRiskAnaUnit> listReportUnitDate();
    /**
     * 上报数据-修改待上报
     */
    int updateReportStatus();
    /**
     * 上报数据-修改待上报-通过id
     */
    int updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);
    /**
     * 上报数据-插入
     */
    int insertUnitList(PreventCJReportRiskAnaUnit unit);
}

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

@@ -1,39 +1,39 @@
package com.ruoyi.doublePrevention.repository;



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

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

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

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

import org.springframework.stereotype.Repository;



import java.util.List;



@Repository

public interface PreventCJReportRiskControlMeasureRepository extends BaseMapper<PreventCJReportRiskControlMeasure> {



//    /**

//     * 上报数据-管控措施-分页查询

//     */

//    IPage<PreventCJReportRiskControlMeasure> getReportMeasurePage(Page<Object> objectPage, PreventReportRiskControlMeasureReqDTO queryReqDTO);

    /**

     * 批量插入

     * */

    int insertList(List<PreventCJReportRiskControlMeasure> measureLists);



    /**

     * 管控措施-上报数据

     * */

    List<PreventCJReportRiskControlMeasure> listReportMeasureDate();

    /**

     * 管控措施-修改上报状态

     * */

    int updateMeasureReportStatus(HandlerReportParam handlerReportParam);

    /**

     * 管控措施-修改上报状态-通过id

     * */

    int updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);

    /**

     * 插入管控措施上报数据

     * */

    int insertMeasureList(PreventCJReportRiskControlMeasure cjMeasure);

}

package com.ruoyi.doublePrevention.repository;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportRiskControlMeasure;
import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam;
import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
import org.springframework.stereotype.Repository;

import java.util.List;

@Repository
public interface PreventCJReportRiskControlMeasureRepository extends BaseMapper<PreventCJReportRiskControlMeasure> {

//    /**
//     * 上报数据-管控措施-分页查询
//     */
//    IPage<PreventCJReportRiskControlMeasure> getReportMeasurePage(Page<Object> objectPage, PreventReportRiskControlMeasureReqDTO queryReqDTO);
    /**
     * 批量插入
     * */
    int insertList(List<PreventCJReportRiskControlMeasure> measureLists);

    /**
     * 管控措施-上报数据
     * */
    List<PreventCJReportRiskControlMeasure> listReportMeasureDate();
    /**
     * 管控措施-修改上报状态
     * */
    int updateMeasureReportStatus(HandlerReportParam handlerReportParam);
    /**
     * 管控措施-修改上报状态-通过id
     * */
    int updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);
    /**
     * 插入管控措施上报数据
     * */
    int insertMeasureList(PreventCJReportRiskControlMeasure cjMeasure);
}

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

@@ -1,41 +1,41 @@
package com.ruoyi.doublePrevention.repository;



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

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

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

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

import org.springframework.stereotype.Repository;



import java.util.List;



@Repository

public interface PreventCJReportRiskEventRepository extends BaseMapper<PreventCJReportRiskEvent> {





//    /**

//     * 分页查询

//     * */

//    IPage<PreventCJReportRiskEvent> getReportRiskEventPage(Page<Object> objectPage, PreReportRiskEventQueryReqDTO queryReqDTO);



    /**

     * 批量插入

     * */

    int saveList(List<PreventCJReportRiskEvent> eventLists);



    /**

     * 上报数据-查询待上报数据

     * */

    List<PreventCJReportRiskEvent> listReportEventDate();

    /**

     * 修改上报状态

     * */

    int updateEventReportStatus(HandlerReportParam handlerReportParam);

    /**

     * 修改上报状态-通过id

     * */

    int updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);

    /**

     * 插入风险事件数据

     * */

    int insertEventLists(PreventCJReportRiskEvent event);

}

package com.ruoyi.doublePrevention.repository;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportRiskEvent;
import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam;
import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
import org.springframework.stereotype.Repository;

import java.util.List;

@Repository
public interface PreventCJReportRiskEventRepository extends BaseMapper<PreventCJReportRiskEvent> {


//    /**
//     * 分页查询
//     * */
//    IPage<PreventCJReportRiskEvent> getReportRiskEventPage(Page<Object> objectPage, PreReportRiskEventQueryReqDTO queryReqDTO);

    /**
     * 批量插入
     * */
    int saveList(List<PreventCJReportRiskEvent> eventLists);

    /**
     * 上报数据-查询待上报数据
     * */
    List<PreventCJReportRiskEvent> listReportEventDate();
    /**
     * 修改上报状态
     * */
    int updateEventReportStatus(HandlerReportParam handlerReportParam);
    /**
     * 修改上报状态-通过id
     * */
    int updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);
    /**
     * 插入风险事件数据
     * */
    int insertEventLists(PreventCJReportRiskEvent event);
}

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

@@ -1,29 +1,29 @@
package com.ruoyi.doublePrevention.repository;



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

import com.ruoyi.doublePrevention.entity.PreventOverhaulLog;

import com.ruoyi.doublePrevention.entity.dto.req.PreventOverhaulLogReqBO;

import com.ruoyi.doublePrevention.entity.dto.req.PreventOverhaulLogUpdateReqBO;

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

import org.apache.ibatis.annotations.Param;

import org.springframework.stereotype.Repository;



import java.util.List;



@Repository

public interface PreventOverhaulLogRepository extends BaseMapper<PreventOverhaulLog> {



    List<PreventOverhaulLog> selectOverhaulLogPage(@Param("overhaulLogReqBO") PreventOverhaulLogReqBO overhaulLogReqBO);



    int savePreventOverhaulLog(PreventOverhaulLog preventOverhaulLog);



    PreventOverhaulLog getOverhaulLogById(Long id);



    int updateOverhaulLog(@Param("preventOverhaulLog") PreventOverhaulLog preventOverhaulLog);



    int deleteOverhaulLogByIds(String[] ids);



    List<PreventOverhaulLog> listReportOverhaulLog();



    int updateOverhaulReportStatus(HandlerReportParam handlerReportParam);

}

package com.ruoyi.doublePrevention.repository;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.doublePrevention.entity.PreventOverhaulLog;
import com.ruoyi.doublePrevention.entity.dto.req.PreventOverhaulLogReqBO;
import com.ruoyi.doublePrevention.entity.dto.req.PreventOverhaulLogUpdateReqBO;
import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;

import java.util.List;

@Repository
public interface PreventOverhaulLogRepository extends BaseMapper<PreventOverhaulLog> {

    List<PreventOverhaulLog> selectOverhaulLogPage(@Param("overhaulLogReqBO") PreventOverhaulLogReqBO overhaulLogReqBO);

    int savePreventOverhaulLog(PreventOverhaulLog preventOverhaulLog);

    PreventOverhaulLog getOverhaulLogById(Long id);

    int updateOverhaulLog(@Param("preventOverhaulLog") PreventOverhaulLog preventOverhaulLog);

    int deleteOverhaulLogByIds(String[] ids);

    List<PreventOverhaulLog> listReportOverhaulLog();

    int updateOverhaulReportStatus(HandlerReportParam handlerReportParam);
}

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

@@ -1,26 +1,26 @@
package com.ruoyi.doublePrevention.repository;



import com.ruoyi.doublePrevention.entity.PreventRiskCheckUnit;

import com.ruoyi.project.tr.baseCheckPoint.domain.BaseCheckPoint;

import org.springframework.stereotype.Repository;



import java.util.List;



@Repository

public interface PreventRiskCheckUnitRepository {



    /**

     * 保存原检查点与管控措施的对应关系

     */

    int insertPointAndMeasure(PreventRiskCheckUnit checkUnit);



    List<PreventRiskCheckUnit> getUnitByRiskId(String riskId);

    /**

     * 删除原检查点与管控措施的对应关系

     */

    int deletePointAndMeasure(String id);

    /**

     * 通过baseCheckPointId 查询管控措施列表

     */

    PreventRiskCheckUnit getUnitByBaseCheckPointId(Long baseCheckPointId);

}

package com.ruoyi.doublePrevention.repository;

import com.ruoyi.doublePrevention.entity.PreventRiskCheckUnit;
import com.ruoyi.project.tr.baseCheckPoint.domain.BaseCheckPoint;
import org.springframework.stereotype.Repository;

import java.util.List;

@Repository
public interface PreventRiskCheckUnitRepository {

    /**
     * 保存原检查点与管控措施的对应关系
     */
    int insertPointAndMeasure(PreventRiskCheckUnit checkUnit);

    List<PreventRiskCheckUnit> getUnitByRiskId(String riskId);
    /**
     * 删除原检查点与管控措施的对应关系
     */
    int deletePointAndMeasure(String id);
    /**
     * 通过baseCheckPointId 查询管控措施列表
     */
    PreventRiskCheckUnit getUnitByBaseCheckPointId(Long baseCheckPointId);
}

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

@@ -1,24 +1,24 @@
package com.ruoyi.doublePrevention.repository;



import com.ruoyi.doublePrevention.entity.PreventRiskDangerCheckAndMeasure;

import com.ruoyi.project.tr.hiddenDangerCheckPoint.domain.HiddenDangerCheckPoint;

import org.springframework.stereotype.Repository;



import java.util.List;



@Repository

public interface PreventRiskDangerCheckAndMeasureRepository {



    /**

     * 写入核查任务检查点与管控措施信息

     * */

    int insertCheckAndMeasure(PreventRiskDangerCheckAndMeasure checkAndMeasure);



    List<PreventRiskDangerCheckAndMeasure> getByBaseCheckPointId(Long checkPointId);



    PreventRiskDangerCheckAndMeasure getByDangerCheckPointId(Long dangerCheckPointId);



    int updateCheckDesc(HiddenDangerCheckPoint hdcp);



    List<PreventRiskDangerCheckAndMeasure> getByCheckId(Long checkId);

}

package com.ruoyi.doublePrevention.repository;

import com.ruoyi.doublePrevention.entity.PreventRiskDangerCheckAndMeasure;
import com.ruoyi.project.tr.hiddenDangerCheckPoint.domain.HiddenDangerCheckPoint;
import org.springframework.stereotype.Repository;

import java.util.List;

@Repository
public interface PreventRiskDangerCheckAndMeasureRepository {

    /**
     * 写入核查任务检查点与管控措施信息
     * */
    int insertCheckAndMeasure(PreventRiskDangerCheckAndMeasure checkAndMeasure);

    List<PreventRiskDangerCheckAndMeasure> getByBaseCheckPointId(Long checkPointId);

    PreventRiskDangerCheckAndMeasure getByDangerCheckPointId(Long dangerCheckPointId);

    int updateCheckDesc(HiddenDangerCheckPoint hdcp);

    List<PreventRiskDangerCheckAndMeasure> getByCheckId(Long checkId);
}

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

@@ -1,49 +1,49 @@
package com.ruoyi.doublePrevention.repository;



import com.ruoyi.doublePrevention.entity.CJReport.CJdto.Data;

import com.ruoyi.doublePrevention.entity.PreventRiskDangerCheckLog;

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

import org.springframework.stereotype.Repository;



import java.util.Date;

import java.util.List;



@Repository

public interface PreventRiskDangerCheckLogRepository {

    /**

     * 定时生成排查任务记录时，

     * 插入排查记录附属表

     */

    int insertDangerCheckLog(PreventRiskDangerCheckLog dangerCheck);

    /**

     * 删除定时核查任务

     * */

    int deleteDangerCheck(Long checkId);







    /**

     * 检索需要上报的任务记录

     * */

    List<PreventRiskDangerCheckLog> listReportTask();

    /**

     * 修改上报的数据状态

     * */

    int updateEventReportStatus(HandlerReportParam handlerReportParam);

    /**

     * 查询by checkId

     * */

    PreventRiskDangerCheckLog getByDangerCheckByCheckId(Long checkId);



    PreventRiskDangerCheckLog getByDangerCheckByJobId(Long jobId);



    int updateCheckLog(Long checkId, Long mobileCode);



    int updateTaskReportStatusByList(List<Long> ids, Byte reportStatus, Date reportTime);



    List<PreventRiskDangerCheckLog> listRectifyReportTask();



    List<PreventRiskDangerCheckLog> listSearchRectifyReportTask();



    int updateSearchRectifyReportTask(PreventRiskDangerCheckLog dangerCheckLog);

}

package com.ruoyi.doublePrevention.repository;

import com.ruoyi.doublePrevention.entity.CJReport.CJdto.Data;
import com.ruoyi.doublePrevention.entity.PreventRiskDangerCheckLog;
import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
import org.springframework.stereotype.Repository;

import java.util.Date;
import java.util.List;

@Repository
public interface PreventRiskDangerCheckLogRepository {
    /**
     * 定时生成排查任务记录时，
     * 插入排查记录附属表
     */
    int insertDangerCheckLog(PreventRiskDangerCheckLog dangerCheck);
    /**
     * 删除定时核查任务
     * */
    int deleteDangerCheck(Long checkId);



    /**
     * 检索需要上报的任务记录
     * */
    List<PreventRiskDangerCheckLog> listReportTask();
    /**
     * 修改上报的数据状态
     * */
    int updateEventReportStatus(HandlerReportParam handlerReportParam);
    /**
     * 查询by checkId
     * */
    PreventRiskDangerCheckLog getByDangerCheckByCheckId(Long checkId);

    PreventRiskDangerCheckLog getByDangerCheckByJobId(Long jobId);

    int updateCheckLog(Long checkId, Long mobileCode);

    int updateTaskReportStatusByList(List<Long> ids, Byte reportStatus, Date reportTime);

    List<PreventRiskDangerCheckLog> listRectifyReportTask();

    List<PreventRiskDangerCheckLog> listSearchRectifyReportTask();

    int updateSearchRectifyReportTask(PreventRiskDangerCheckLog dangerCheckLog);
}

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

@@ -1,18 +1,18 @@
package com.ruoyi.doublePrevention.repository;





import com.ruoyi.doublePrevention.entity.PreventRiskDangerConfirmLog;

import com.ruoyi.project.tr.hiddenDangerCheckPoint.domain.HiddenDangerCheckPoint;

import org.springframework.stereotype.Repository;



import java.util.List;



@Repository

public interface PreventRiskDangerConfirmLogRepository {





    int saveConfirmLog(PreventRiskDangerConfirmLog confirmLog);





    List<PreventRiskDangerConfirmLog> getLogsByDangerCheckPointId(Long dangerCheckPointId);

}

package com.ruoyi.doublePrevention.repository;


import com.ruoyi.doublePrevention.entity.PreventRiskDangerConfirmLog;
import com.ruoyi.project.tr.hiddenDangerCheckPoint.domain.HiddenDangerCheckPoint;
import org.springframework.stereotype.Repository;

import java.util.List;

@Repository
public interface PreventRiskDangerConfirmLogRepository {


    int saveConfirmLog(PreventRiskDangerConfirmLog confirmLog);


    List<PreventRiskDangerConfirmLog> getLogsByDangerCheckPointId(Long dangerCheckPointId);
}

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

@@ -1,51 +1,51 @@
package com.ruoyi.doublePrevention.repository;



import com.ruoyi.doublePrevention.entity.PreventRiskDangerInfo;

import com.ruoyi.doublePrevention.entity.dto.DataCountDangerResultRespDO;

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

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

import org.apache.ibatis.annotations.Param;

import org.springframework.stereotype.Repository;



import java.util.Date;

import java.util.List;



@Repository

public interface PreventRiskDangerInfoRepository {



    /**

     * 新增隐患上报

     * */

    int insertDangerInfo(PreventRiskDangerInfo dangerInfo);

    /**

     * 修改隐患上报

     * */

    int updateDangerInfo(PreventRiskDangerInfo dangerInfo);



    int deleteDangerInfo(Long id);

    /**

     * 修改隐患整改状态

     */

    int updateDangerInfoState(PreventRiskDangerInfo dangerInfo);



    /**

     * @description 统计时间段内所有、死亡、重伤、轻伤的隐患数量

     */

    DataCountDangerResultRespDO listDangerResultCountByTime(@Param("startTime") Date startTime, @Param("endTime") Date endTime,@Param("depIds") List<Long> depIds);







    /**

     * 搜索需要上报的隐患

     */

    List<PreventRiskDangerInfo> listReportDanger();

    /**

     * 修改上报的数据的姿态

     */

    PreventRiskDangerInfo updateDangerInfoReportStatus(HandlerReportParam handlerReportParam);

    /**

     * 查询隐患附属表信息

     */

    PreventRiskDangerInfo getByHiddenDangerId(Long id);



}

package com.ruoyi.doublePrevention.repository;

import com.ruoyi.doublePrevention.entity.PreventRiskDangerInfo;
import com.ruoyi.doublePrevention.entity.dto.DataCountDangerResultRespDO;
import com.ruoyi.doublePrevention.repository.param.DataCountStartAndEndTimeParams;
import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;

import java.util.Date;
import java.util.List;

@Repository
public interface PreventRiskDangerInfoRepository {

    /**
     * 新增隐患上报
     * */
    int insertDangerInfo(PreventRiskDangerInfo dangerInfo);
    /**
     * 修改隐患上报
     * */
    int updateDangerInfo(PreventRiskDangerInfo dangerInfo);

    int deleteDangerInfo(Long id);
    /**
     * 修改隐患整改状态
     */
    int updateDangerInfoState(PreventRiskDangerInfo dangerInfo);

    /**
     * @description 统计时间段内所有、死亡、重伤、轻伤的隐患数量
     */
    DataCountDangerResultRespDO listDangerResultCountByTime(@Param("startTime") Date startTime, @Param("endTime") Date endTime,@Param("depIds") List<Long> depIds);



    /**
     * 搜索需要上报的隐患
     */
    List<PreventRiskDangerInfo> listReportDanger();
    /**
     * 修改上报的数据的姿态
     */
    PreventRiskDangerInfo updateDangerInfoReportStatus(HandlerReportParam handlerReportParam);
    /**
     * 查询隐患附属表信息
     */
    PreventRiskDangerInfo getByHiddenDangerId(Long id);

}

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

@@ -1,45 +1,45 @@
package com.ruoyi.doublePrevention.repository;



import com.ruoyi.doublePrevention.entity.PreventRiskJobAndMeasure;

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

import org.springframework.stereotype.Repository;



import java.util.List;



@Repository

public interface PreventRiskJobAndMeasureRepository {



    /**

     * 插入管控措施与job的对应关系

     * */

    int insertJobAndMeasure(PreventRiskJobAndMeasure jobAndMeasure);

    /**

     * 查询JobAndMeasure - By JobId

     */

    PreventRiskJobAndMeasure getJobAndMeasureByJobId(Long jobId);



    List<PreventRiskJobAndMeasure> getJobAndMeasureListByJobId(Long jobId);

    /**

     * 删除job管控措施的附属表关联信息

     */

    int deleteJobAndMeasure(Long jobId);







    /**

     * 检索需要上报的隐患排查任务

     */

    List<PreventRiskJobAndMeasure> listReportWork();

    /**

     * 根据jobId查询对应的管控措施

     */

    List<PreventRiskJobAndMeasure> getMeasureListByJobId(Long jobId);

    /**

     * 修改上报状态

     */

    int updateWorkReportStatus(HandlerReportParam handlerReportParam);



    List<PreventRiskJobAndMeasure> listReportWorkTest();



    List<PreventRiskJobAndMeasure> getRectifyJobData(Long jobId);

}

package com.ruoyi.doublePrevention.repository;

import com.ruoyi.doublePrevention.entity.PreventRiskJobAndMeasure;
import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
import org.springframework.stereotype.Repository;

import java.util.List;

@Repository
public interface PreventRiskJobAndMeasureRepository {

    /**
     * 插入管控措施与job的对应关系
     * */
    int insertJobAndMeasure(PreventRiskJobAndMeasure jobAndMeasure);
    /**
     * 查询JobAndMeasure - By JobId
     */
    PreventRiskJobAndMeasure getJobAndMeasureByJobId(Long jobId);

    List<PreventRiskJobAndMeasure> getJobAndMeasureListByJobId(Long jobId);
    /**
     * 删除job管控措施的附属表关联信息
     */
    int deleteJobAndMeasure(Long jobId);



    /**
     * 检索需要上报的隐患排查任务
     */
    List<PreventRiskJobAndMeasure> listReportWork();
    /**
     * 根据jobId查询对应的管控措施
     */
    List<PreventRiskJobAndMeasure> getMeasureListByJobId(Long jobId);
    /**
     * 修改上报状态
     */
    int updateWorkReportStatus(HandlerReportParam handlerReportParam);

    List<PreventRiskJobAndMeasure> listReportWorkTest();

    List<PreventRiskJobAndMeasure> getRectifyJobData(Long jobId);
}

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

@@ -1,42 +1,42 @@
package com.ruoyi.doublePrevention.repository;



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

import com.ruoyi.doublePrevention.entity.PreventRiskUnitUuid;

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

import org.springframework.stereotype.Repository;



import java.util.List;



@Repository

public interface PreventRiskUnitUuidRepository{

    /**

     * 为设施设备清单附属表添加uuid

     * */

    int insertUuid(PreventRiskUnitUuid riskUnitUuid);

    /**

     * 通过id获取uuid

     * */

    PreventRiskUnitUuid getRiskUnitUuidById(Long id);

    /**

     * 修改

     * */

    int updateRiskUnitUuid(PreventRiskUnitUuid riskUnitUuid);

    /**

     * 删除附属表信息

     */

    int deleteRiskUnit(String[] riskListIds);









    /**

     * 检索需要上报的数据

     */

    List<PreventRiskUnitUuid> listRiskAnaUnit();

    /**

     * 修改已经被检索读取完成数据的状态

     */

    int updateReportStatus(HandlerReportParam handlerReportParam);



    PreventRiskUnitUuid getRiskUnitUuidByUnitId(Long riskUnitId);

}

package com.ruoyi.doublePrevention.repository;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.doublePrevention.entity.PreventRiskUnitUuid;
import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
import org.springframework.stereotype.Repository;

import java.util.List;

@Repository
public interface PreventRiskUnitUuidRepository{
    /**
     * 为设施设备清单附属表添加uuid
     * */
    int insertUuid(PreventRiskUnitUuid riskUnitUuid);
    /**
     * 通过id获取uuid
     * */
    PreventRiskUnitUuid getRiskUnitUuidById(Long id);
    /**
     * 修改
     * */
    int updateRiskUnitUuid(PreventRiskUnitUuid riskUnitUuid);
    /**
     * 删除附属表信息
     */
    int deleteRiskUnit(String[] riskListIds);




    /**
     * 检索需要上报的数据
     */
    List<PreventRiskUnitUuid> listRiskAnaUnit();
    /**
     * 修改已经被检索读取完成数据的状态
     */
    int updateReportStatus(HandlerReportParam handlerReportParam);

    PreventRiskUnitUuid getRiskUnitUuidByUnitId(Long riskUnitId);
}

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

@@ -1,17 +1,17 @@
package com.ruoyi.doublePrevention.repository;



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

import com.ruoyi.doublePrevention.entity.PreventTaskType;

import org.springframework.stereotype.Repository;



import java.util.List;



@Repository

public interface PreventTaskTypeRepository extends BaseMapper<PreventTaskType> {



    PreventTaskType getInfoByTaskId(Long taskId);



    List<PreventTaskType> getInfoByJobId(Long jobId);



    List<PreventTaskType> getAllTaskTypeList();

}

package com.ruoyi.doublePrevention.repository;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.doublePrevention.entity.PreventTaskType;
import org.springframework.stereotype.Repository;

import java.util.List;

@Repository
public interface PreventTaskTypeRepository extends BaseMapper<PreventTaskType> {

    PreventTaskType getInfoByTaskId(Long taskId);

    List<PreventTaskType> getInfoByJobId(Long jobId);

    List<PreventTaskType> getAllTaskTypeList();
}

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

@@ -1,10 +1,10 @@
package com.ruoyi.doublePrevention.repository;



import org.springframework.stereotype.Repository;



import java.util.List;



@Repository

public interface PreventTaskUnitAndMeasureRepository {



}

package com.ruoyi.doublePrevention.repository;

import org.springframework.stereotype.Repository;

import java.util.List;

@Repository
public interface PreventTaskUnitAndMeasureRepository {

}

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

@@ -1,17 +1,17 @@
package com.ruoyi.doublePrevention.repository;



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

import com.ruoyi.doublePrevention.entity.RiskAndPeopleInfo;

import com.ruoyi.doublePrevention.entity.dto.req.RiskAndPeopleInfoReqBO;

import org.apache.ibatis.annotations.Param;

import org.springframework.stereotype.Repository;



import java.util.List;



@Repository

public interface RiskAndPeopleInfoRepository extends BaseMapper<RiskAndPeopleInfo> {



    List<RiskAndPeopleInfo> listRiskAndPeoplePage(@Param("reqBO") RiskAndPeopleInfoReqBO reqBO);



    RiskAndPeopleInfo selectRiskAndPeopleInfoById(Long id);

}

package com.ruoyi.doublePrevention.repository;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.doublePrevention.entity.RiskAndPeopleInfo;
import com.ruoyi.doublePrevention.entity.dto.req.RiskAndPeopleInfoReqBO;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;

import java.util.List;

@Repository
public interface RiskAndPeopleInfoRepository extends BaseMapper<RiskAndPeopleInfo> {

    List<RiskAndPeopleInfo> listRiskAndPeoplePage(@Param("reqBO") RiskAndPeopleInfoReqBO reqBO);

    RiskAndPeopleInfo selectRiskAndPeopleInfoById(Long id);
}

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

@@ -1,20 +1,20 @@
package com.ruoyi.doublePrevention.repository;





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

import com.ruoyi.doublePrevention.entity.RiskOldInfo;

import com.ruoyi.doublePrevention.entity.dto.req.RiskOldInfoQueryReqDTO;

import org.apache.ibatis.annotations.Param;

import org.springframework.stereotype.Repository;



import java.util.List;





@Repository

public interface RiskOldInfoRepository extends BaseMapper<RiskOldInfo> {





    List<RiskOldInfo> selectOldRiskInfoPage(@Param("queryReqDTO") RiskOldInfoQueryReqDTO queryReqDTO);





}

package com.ruoyi.doublePrevention.repository;


import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.doublePrevention.entity.RiskOldInfo;
import com.ruoyi.doublePrevention.entity.dto.req.RiskOldInfoQueryReqDTO;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;

import java.util.List;


@Repository
public interface RiskOldInfoRepository extends BaseMapper<RiskOldInfo> {


    List<RiskOldInfo> selectOldRiskInfoPage(@Param("queryReqDTO") RiskOldInfoQueryReqDTO queryReqDTO);


}

 src/main/java/com/ruoyi/doublePrevention/repository/param/HandlerCJReportParam.java

@@ -1,42 +1,42 @@
package com.ruoyi.doublePrevention.repository.param;



import java.util.Date;



public class HandlerCJReportParam {

    /**

     * 主键

     */

    private String id;

    /**

     * 上报状态 1-待上报；2-已上报；3-不上报；4-变更需上传

     */

    private Byte reportStatus;

    /**

     * 上报时间

     */

    private Date reportTime;



    public String getId() {

        return id;

    }



    public void setId(String id) {

        this.id = id;

    }



    public Byte getReportStatus() {

        return reportStatus;

    }



    public void setReportStatus(Byte reportStatus) {

        this.reportStatus = reportStatus;

    }



    public Date getReportTime() {

        return reportTime;

    }



    public void setReportTime(Date reportTime) {

        this.reportTime = reportTime;

    }

}

package com.ruoyi.doublePrevention.repository.param;

import java.util.Date;

public class HandlerCJReportParam {
    /**
     * 主键
     */
    private String id;
    /**
     * 上报状态 1-待上报；2-已上报；3-不上报；4-变更需上传
     */
    private Byte reportStatus;
    /**
     * 上报时间
     */
    private Date reportTime;

    public String getId() {
        return id;
    }

    public void setId(String id) {
        this.id = id;
    }

    public Byte getReportStatus() {
        return reportStatus;
    }

    public void setReportStatus(Byte reportStatus) {
        this.reportStatus = reportStatus;
    }

    public Date getReportTime() {
        return reportTime;
    }

    public void setReportTime(Date reportTime) {
        this.reportTime = reportTime;
    }
}

 src/main/java/com/ruoyi/doublePrevention/repository/param/HandlerReportParam.java

@@ -1,42 +1,42 @@
package com.ruoyi.doublePrevention.repository.param;



import java.util.Date;



public class HandlerReportParam {

    /**

     * 主键

     */

    private Long id;

    /**

     * 上报状态 1-待上报；2-已上报；3-不上报；4-变更需上传

     */

    private Byte reportStatus;

    /**

     * 上报时间

     */

    private Date reportTime;



    public Long getId() {

        return id;

    }



    public void setId(Long id) {

        this.id = id;

    }



    public Byte getReportStatus() {

        return reportStatus;

    }



    public void setReportStatus(Byte reportStatus) {

        this.reportStatus = reportStatus;

    }



    public Date getReportTime() {

        return reportTime;

    }



    public void setReportTime(Date reportTime) {

        this.reportTime = reportTime;

    }

}

package com.ruoyi.doublePrevention.repository.param;

import java.util.Date;

public class HandlerReportParam {
    /**
     * 主键
     */
    private Long id;
    /**
     * 上报状态 1-待上报；2-已上报；3-不上报；4-变更需上传
     */
    private Byte reportStatus;
    /**
     * 上报时间
     */
    private Date reportTime;

    public Long getId() {
        return id;
    }

    public void setId(Long id) {
        this.id = id;
    }

    public Byte getReportStatus() {
        return reportStatus;
    }

    public void setReportStatus(Byte reportStatus) {
        this.reportStatus = reportStatus;
    }

    public Date getReportTime() {
        return reportTime;
    }

    public void setReportTime(Date reportTime) {
        this.reportTime = reportTime;
    }
}

 src/main/java/com/ruoyi/doublePrevention/repository/param/PreventPointAndMeasureParams.java

@@ -1,42 +1,42 @@
package com.ruoyi.doublePrevention.repository.param;



import java.util.List;



public class PreventPointAndMeasureParams {

    /**

     * 原-检查点id

     * */

    private Long baseCheckPointId;

    /**

     * 管控措施id

     * */

    private Long controlMeasureId;

    /**

     * 风险点-单元-基础清单 id

     * */

    private Long riskId;



    public Long getBaseCheckPointId() {

        return baseCheckPointId;

    }



    public void setBaseCheckPointId(Long baseCheckPointId) {

        this.baseCheckPointId = baseCheckPointId;

    }



    public Long getControlMeasureId() {

        return controlMeasureId;

    }



    public void setControlMeasureId(Long controlMeasureId) {

        this.controlMeasureId = controlMeasureId;

    }



    public Long getRiskId() {

        return riskId;

    }



    public void setRiskId(Long riskId) {

        this.riskId = riskId;

    }

}

package com.ruoyi.doublePrevention.repository.param;

import java.util.List;

public class PreventPointAndMeasureParams {
    /**
     * 原-检查点id
     * */
    private Long baseCheckPointId;
    /**
     * 管控措施id
     * */
    private Long controlMeasureId;
    /**
     * 风险点-单元-基础清单 id
     * */
    private Long riskId;

    public Long getBaseCheckPointId() {
        return baseCheckPointId;
    }

    public void setBaseCheckPointId(Long baseCheckPointId) {
        this.baseCheckPointId = baseCheckPointId;
    }

    public Long getControlMeasureId() {
        return controlMeasureId;
    }

    public void setControlMeasureId(Long controlMeasureId) {
        this.controlMeasureId = controlMeasureId;
    }

    public Long getRiskId() {
        return riskId;
    }

    public void setRiskId(Long riskId) {
        this.riskId = riskId;
    }
}

 src/main/java/com/ruoyi/doublePrevention/repository/param/PreventReportConfigUpdateParams.java

@@ -1,70 +1,70 @@
package com.ruoyi.doublePrevention.repository.param;



import com.baomidou.mybatisplus.annotation.TableName;



import java.util.Date;



@TableName("prevent_report_config")

public class PreventReportConfigUpdateParams {



    /**

     * 主键

     */

    private Integer id;

    /**

     * 上报开关：1-开启；2-关闭

     */

    private Byte reportState;

    /**

     * 上报方式：0-手动；1-自动

     */

    private Byte reportType;

    /**

     * 最后修改时间

     */

    private Date gmtModitify;

    /**

     * 修改人

     */

    private String lastEditUserName;



    public String getLastEditUserName() {

        return lastEditUserName;

    }



    public void setLastEditUserName(String lastEditUserName) {

        this.lastEditUserName = lastEditUserName;

    }



    public Date getGmtModitify() {

        return gmtModitify;

    }



    public void setGmtModitify(Date gmtModitify) {

        this.gmtModitify = gmtModitify;

    }



    public Integer getId() {

        return id;

    }



    public void setId(Integer id) {

        this.id = id;

    }



    public Byte getReportState() {

        return reportState;

    }



    public void setReportState(Byte reportState) {

        this.reportState = reportState;

    }



    public Byte getReportType() {

        return reportType;

    }



    public void setReportType(Byte reportType) {

        this.reportType = reportType;

    }

}

package com.ruoyi.doublePrevention.repository.param;

import com.baomidou.mybatisplus.annotation.TableName;

import java.util.Date;

@TableName("prevent_report_config")
public class PreventReportConfigUpdateParams {

    /**
     * 主键
     */
    private Integer id;
    /**
     * 上报开关：1-开启；2-关闭
     */
    private Byte reportState;
    /**
     * 上报方式：0-手动；1-自动
     */
    private Byte reportType;
    /**
     * 最后修改时间
     */
    private Date gmtModitify;
    /**
     * 修改人
     */
    private String lastEditUserName;

    public String getLastEditUserName() {
        return lastEditUserName;
    }

    public void setLastEditUserName(String lastEditUserName) {
        this.lastEditUserName = lastEditUserName;
    }

    public Date getGmtModitify() {
        return gmtModitify;
    }

    public void setGmtModitify(Date gmtModitify) {
        this.gmtModitify = gmtModitify;
    }

    public Integer getId() {
        return id;
    }

    public void setId(Integer id) {
        this.id = id;
    }

    public Byte getReportState() {
        return reportState;
    }

    public void setReportState(Byte reportState) {
        this.reportState = reportState;
    }

    public Byte getReportType() {
        return reportType;
    }

    public void setReportType(Byte reportType) {
        this.reportType = reportType;
    }
}

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

@@ -1,273 +1,273 @@
package com.ruoyi.doublePrevention.scheduls;





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

import com.ruoyi.doublePrevention.entity.*;

import com.ruoyi.doublePrevention.enums.E;

import com.ruoyi.doublePrevention.enums.SyncEnum;

import com.ruoyi.doublePrevention.exception.AusinessException;

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

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

import com.ruoyi.project.system.dept.domain.Dept;

import com.ruoyi.project.system.dept.service.IDeptService;

import com.ruoyi.project.system.user.domain.User;

import com.ruoyi.project.system.user.service.IUserService;

import com.ruoyi.project.tr.HiddenDangerCheckJob.domain.HiddenDangerCheckJob;

import com.ruoyi.project.tr.HiddenDangerCheckJob.service.IHiddenDangerCheckJobService;

import com.ruoyi.project.tr.hiddenDangerCheck.domain.HiddenDangerCheck;

import com.ruoyi.project.tr.hiddenDangerCheck.service.IHiddenDangerCheckService;

import com.ruoyi.project.tr.hiddenDangerCheckPoint.domain.HiddenDangerCheckPoint;

import com.ruoyi.project.tr.hiddenDangerCheckPoint.service.IHiddenDangerCheckPointService;

import com.ruoyi.project.tr.riskList.domain.RiskList;

import com.ruoyi.project.tr.riskList.service.IRiskListService;

import org.apache.commons.lang3.ObjectUtils;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;

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

import org.springframework.scheduling.annotation.Scheduled;

import org.springframework.stereotype.Component;

import org.springframework.transaction.annotation.Transactional;



import java.text.SimpleDateFormat;

import java.util.*;



@Component

public class DateSchedule {



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



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

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



    public static SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");



    @Autowired

    private PreventReportConfigService preventReportConfigService;



    @Autowired

    private PreventCJReportRiskAnaUnitService CJRiskAnaUnitService;

    @Autowired

    private PreventCJReportRiskEventService CJEventService;

    @Autowired

    private PreventCJReportRiskControlMeasureService CJMeasureService;

    @Autowired

    private PreventCJReportCheckTaskFromWorkService CJTaskFromWorkService;

    @Autowired

    private PreventCJReportCheckRecordFromTaskService CJTaskRecordService;

    @Autowired

    private PreventCJReportDangerInfoService CJDangerInfoService;

    @Autowired

    private PreventCJReportPointService CJPointService;





    @Autowired

    private IDeptService trDeptService; //部门服务

    @Autowired

    private IUserService trUserService; //用户服务



    @Autowired

    private IRiskListService trRiskAnaUnitService; //风险设备、分析单元

    @Autowired

    private PreventRiskUnitUuidService preventRiskUnitUuidService; //风险设备、分析单元附属表



    @Autowired

    private PreventRiskEventService preventRiskEventService;

    @Autowired

    private PreventRiskControlMeasureService preventRiskControlMeasureService;

    @Autowired

    private PreventRiskControlTemplateService preventRiskControlTemplateService;



    @Autowired

    private IHiddenDangerCheckJobService trHiddenDangerCheckJobService;//排查任务job

    @Autowired

    private PreventRiskJobAndMeasureService preventRiskJobAndMeasureService;//排查任务附属表



    @Autowired

    private IHiddenDangerCheckService trHiddenDangerCheckService;//排查任务记录

    @Autowired

    private PreventRiskDangerCheckLogService preventRiskDangerCheckLogService;//排查任务记录附属表



    @Autowired

    private IHiddenDangerCheckPointService trHiddenDangerCheckPointService;//隐患信息上报、整改、验收

    @Autowired

    private PreventRiskDangerInfoService preventRiskDangerInfoService;//隐患信息附属表



    @Autowired

    private PreventRiskCheckUnitService preventRiskCheckUnitService;//管控措施，任务清单对应关系。基础排查点附属表

    @Autowired

    private PreventRiskDangerCheckAndMeasureService riskDangerCheckAndMeasureService;//管控措施，任务清单对应关系。基础排查点附属表



    @Autowired

    private PreventTaskTypeService taskTypeService;//管控措施，任务清单对应关系。基础排查点附属表



    @Autowired

    private PreventOverhaulLogService overhaulLogService;

    @Autowired

    private PreventCJReportOverhaulLogService reportOverhaulLogService;





    @Transactional

//    @Scheduled(cron = "0 0/1 * * * ? ")    // 分钟

//    @Scheduled(cron = "0/30 * * * * ?")  // 30秒

//    @Scheduled(cron = "0 0 0/2 * * ?")  // 小时



    public void searchReportDate(){

        String companyCode = "652310082";



//        logger.info("【日巡检】任务数据重置");

//

//        List<PreventCJReportCheckTaskFromWork> workLists = CJTaskFromWorkService.listWork();

//        for (PreventCJReportCheckTaskFromWork work : workLists) {

//            PreventRiskControlMeasure measure = preventRiskControlMeasureService.getPreventRiskControlMeasureByUuid(work.getRiskMeasureId());

//            work.setTroubleshootContent(measure.getCheckContent());

//            work.setWorkStartTime("00:00:00");

//            work.setWorkEndTime("23:59:59");

//            int result = CJTaskFromWorkService.updateInfo(work);

//            if (result < 1){

//                throw new RuntimeException("执行出错");

//            }

//        }















//        logger.info("【包保责任人】任务数据重置");

//

//        List<PreventCJReportCheckTaskFromWork> workLists1 = CJTaskFromWorkService.listWork1();

//        for (PreventCJReportCheckTaskFromWork work : workLists1) {

//            PreventRiskControlMeasure measure = preventRiskControlMeasureService.getPreventRiskControlMeasureByUuid(work.getRiskMeasureId());

//            work.setTroubleshootContent(measure.getCheckContent());

//            HiddenDangerCheckJob jobById = trHiddenDangerCheckJobService.getJobById(work.getWorkId());

//            work.setTaskStartTime(jobById.getStartTime());

//            work.setWorkDayType("2");

//            List<PreventTaskType> infoByJobId = taskTypeService.getInfoByJobId(work.getWorkId());

//            int typeTag = 0;

//            for (PreventTaskType taskType : infoByJobId) {

//                typeTag = taskType.getType();

//            }

//            work.setWorkType(String.valueOf(typeTag));

//            work.setTaskNum("1");

//            int result = CJTaskFromWorkService.updateInfo1(work);

//            if (result < 1){

//                throw new RuntimeException("执行出错");

//            }

//        }









//

//        logger.info("任务数据重置");

//

//        /**

//         * 4、检索 任务配置 数据 prevent_report_check_record_from_task

//         * */

//        //读取任务配置数据上报主配置信息

//        PreventReportConfig workReportConfig = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_TASK_FROM_WORK.getCode());

//        //如果任务配置主配置开启上报

//        if (workReportConfig.getReportState().equals(SyncEnum.REPORT_ON.getCode())){

//            //  logger.info("【##】4.检索任务配置...");

//            //查询所有 选择上报的数据 && (reportTime == null 或者 reportTime < updateReportDataTime）

//            List<PreventRiskJobAndMeasure> works = preventRiskJobAndMeasureService.listReportWorkTest();

//            //获取上报数据对象与list

//            List<PreventCJReportCheckTaskFromWork> CJTaskFromWorkLists = new ArrayList<>();

//            HandlerReportParam handlerReportParam = new HandlerReportParam();

//

//            if (ObjectUtils.isNotEmpty(works)){

//                //遍历，封装数据

//                for (PreventRiskJobAndMeasure work : works) {

//                    //通过work中的信息，查询主表数据

//                    HiddenDangerCheckJob jobById = trHiddenDangerCheckJobService.getJobById(work.getJobId());

//                    //获取数据对象

//                    PreventCJReportCheckTaskFromWork CJTaskFromWork = new PreventCJReportCheckTaskFromWork();

//                    //转换时间周期单位 (1小时,2日,3周,4月,5年)

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

//                        CJTaskFromWork.setCheckCycle(Math.toIntExact(jobById.getTroubleshootTypeCycleNum()));

//                        CJTaskFromWork.setCheckCycleUnit("小时");

//                        CJTaskFromWork.setWorkStartTime("00:00:00");

//                        CJTaskFromWork.setWorkEndTime("23:59:59");

//                    }else if (jobById.getTroubleshootTypeCycleType() == 2){

//                        CJTaskFromWork.setCheckCycle(Math.toIntExact(jobById.getTroubleshootTypeCycleNum()));

//                        CJTaskFromWork.setCheckCycleUnit("天");

//                    }else if (jobById.getTroubleshootTypeCycleType() == 3){

//                        Long num = jobById.getTroubleshootTypeCycleNum() * 7;

//                        CJTaskFromWork.setCheckCycle(Math.toIntExact(num));

//                        CJTaskFromWork.setCheckCycleUnit("天");

//                    }else if (jobById.getTroubleshootTypeCycleType() == 4){

//                        CJTaskFromWork.setCheckCycle(Math.toIntExact(jobById.getTroubleshootTypeCycleNum()));

//                        CJTaskFromWork.setCheckCycleUnit("月");

//                    }else if (jobById.getTroubleshootTypeCycleType() == 5){

//                        CJTaskFromWork.setCheckCycle(Math.toIntExact(jobById.getTroubleshootTypeCycleNum()));

//                        CJTaskFromWork.setCheckCycleUnit("年");

//                    }

//                    //获取用户信息

//                    User createUser = trUserService.getUserByLoginName(jobById.getCreateBy());

//                    User updateUser = trUserService.getUserByLoginName(jobById.getUpdateBy());

//

//                    //封装上报昌吉州任务配置数据

//                    CJTaskFromWork.setId(work.getJobUuid());

//                    CJTaskFromWork.setCompanyCode(companyCode);

////                    if (work.getReportStatus().equals(SyncEnum.SYNC_EXEC_SUCCESS.getCode())){

////                        CJTaskFromWork.setDeleted("2");//数据更新状态标识，目前仅昌吉州需要 2022-08-10

////                    }else {

////                        CJTaskFromWork.setDeleted("0");

////                    }

//                    CJTaskFromWork.setCreateBy(createUser.getUserName());

//                    CJTaskFromWork.setCreateDate(jobById.getCreateTime());

//                    if (ObjectUtils.isEmpty(updateUser)){

//                        CJTaskFromWork.setUpdateBy(createUser.getUserName());

//                        CJTaskFromWork.setUpdateDate(jobById.getCreateTime());

//                    }else {

//                        CJTaskFromWork.setUpdateBy(updateUser.getUserName());

//                        CJTaskFromWork.setUpdateDate(jobById.getCreateTime());

//                    }

//

//                    CJTaskFromWork.setReportStatus((byte) 77);

//                    CJTaskFromWork.setDeleted("2");//

//

//                    CJTaskFromWork.setReportTime(null);

//                    CJTaskFromWork.setDataSource((byte) 1);

//                    CJTaskFromWork.setRiskMeasureId(work.getMeasureUuid());

//                    CJTaskFromWork.setWorkId(jobById.getJobId());

//

//                    //第二版标准新增

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

//                    CJTaskFromWork.setTroubleshootContent(measureById.getCheckContent());

//                    CJTaskFromWork.setTaskStartTime(jobById.getStartTime());

//

//                    CJTaskFromWork.setWorkDayType("0");

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

//                    int typeTag = 0;

//                    for (PreventTaskType taskType : typeByJobId) {

//                        typeTag = taskType.getType();

//                    }

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

//                    if (typeTag !=0){

//                        CJTaskFromWork.setTaskNum("1");

//                    }

//                    //封装数据

//                    CJTaskFromWorkLists.add(CJTaskFromWork);

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

//                    handlerReportParam.setId(work.getId());

//                    handlerReportParam.setReportTime(new Date());

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

//                    preventRiskJobAndMeasureService.updateWorkReportStatus(handlerReportParam);

//                }

//            }else {

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

//            }

//            //写入上报昌吉州数据转换表

//            for (PreventCJReportCheckTaskFromWork CJTaskFromWorks : CJTaskFromWorkLists) {

//                CJTaskFromWorkService.insertTaskFromWorkList(CJTaskFromWorks);

//                logger.info("【双重预防】任务配置CJ：数据处理...");

//            }

//        }else {

//            logger.info("任务配置数据上报已关闭");

//        }

//

//

    }

}

package com.ruoyi.doublePrevention.scheduls;


import com.ruoyi.doublePrevention.entity.CJReport.*;
import com.ruoyi.doublePrevention.entity.*;
import com.ruoyi.doublePrevention.enums.E;
import com.ruoyi.doublePrevention.enums.SyncEnum;
import com.ruoyi.doublePrevention.exception.AusinessException;
import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
import com.ruoyi.doublePrevention.service.baseService.*;
import com.ruoyi.project.system.dept.domain.Dept;
import com.ruoyi.project.system.dept.service.IDeptService;
import com.ruoyi.project.system.user.domain.User;
import com.ruoyi.project.system.user.service.IUserService;
import com.ruoyi.project.tr.HiddenDangerCheckJob.domain.HiddenDangerCheckJob;
import com.ruoyi.project.tr.HiddenDangerCheckJob.service.IHiddenDangerCheckJobService;
import com.ruoyi.project.tr.hiddenDangerCheck.domain.HiddenDangerCheck;
import com.ruoyi.project.tr.hiddenDangerCheck.service.IHiddenDangerCheckService;
import com.ruoyi.project.tr.hiddenDangerCheckPoint.domain.HiddenDangerCheckPoint;
import com.ruoyi.project.tr.hiddenDangerCheckPoint.service.IHiddenDangerCheckPointService;
import com.ruoyi.project.tr.riskList.domain.RiskList;
import com.ruoyi.project.tr.riskList.service.IRiskListService;
import org.apache.commons.lang3.ObjectUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;

import java.text.SimpleDateFormat;
import java.util.*;

@Component
public class DateSchedule {

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

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

    public static SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

    @Autowired
    private PreventReportConfigService preventReportConfigService;

    @Autowired
    private PreventCJReportRiskAnaUnitService CJRiskAnaUnitService;
    @Autowired
    private PreventCJReportRiskEventService CJEventService;
    @Autowired
    private PreventCJReportRiskControlMeasureService CJMeasureService;
    @Autowired
    private PreventCJReportCheckTaskFromWorkService CJTaskFromWorkService;
    @Autowired
    private PreventCJReportCheckRecordFromTaskService CJTaskRecordService;
    @Autowired
    private PreventCJReportDangerInfoService CJDangerInfoService;
    @Autowired
    private PreventCJReportPointService CJPointService;


    @Autowired
    private IDeptService trDeptService; //部门服务
    @Autowired
    private IUserService trUserService; //用户服务

    @Autowired
    private IRiskListService trRiskAnaUnitService; //风险设备、分析单元
    @Autowired
    private PreventRiskUnitUuidService preventRiskUnitUuidService; //风险设备、分析单元附属表

    @Autowired
    private PreventRiskEventService preventRiskEventService;
    @Autowired
    private PreventRiskControlMeasureService preventRiskControlMeasureService;
    @Autowired
    private PreventRiskControlTemplateService preventRiskControlTemplateService;

    @Autowired
    private IHiddenDangerCheckJobService trHiddenDangerCheckJobService;//排查任务job
    @Autowired
    private PreventRiskJobAndMeasureService preventRiskJobAndMeasureService;//排查任务附属表

    @Autowired
    private IHiddenDangerCheckService trHiddenDangerCheckService;//排查任务记录
    @Autowired
    private PreventRiskDangerCheckLogService preventRiskDangerCheckLogService;//排查任务记录附属表

    @Autowired
    private IHiddenDangerCheckPointService trHiddenDangerCheckPointService;//隐患信息上报、整改、验收
    @Autowired
    private PreventRiskDangerInfoService preventRiskDangerInfoService;//隐患信息附属表

    @Autowired
    private PreventRiskCheckUnitService preventRiskCheckUnitService;//管控措施，任务清单对应关系。基础排查点附属表
    @Autowired
    private PreventRiskDangerCheckAndMeasureService riskDangerCheckAndMeasureService;//管控措施，任务清单对应关系。基础排查点附属表

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

    @Autowired
    private PreventOverhaulLogService overhaulLogService;
    @Autowired
    private PreventCJReportOverhaulLogService reportOverhaulLogService;


    @Transactional
//    @Scheduled(cron = "0 0/1 * * * ? ")    // 分钟
//    @Scheduled(cron = "0/30 * * * * ?")  // 30秒
//    @Scheduled(cron = "0 0 0/2 * * ?")  // 小时

    public void searchReportDate(){
        String companyCode = "652310082";

//        logger.info("【日巡检】任务数据重置");
//
//        List<PreventCJReportCheckTaskFromWork> workLists = CJTaskFromWorkService.listWork();
//        for (PreventCJReportCheckTaskFromWork work : workLists) {
//            PreventRiskControlMeasure measure = preventRiskControlMeasureService.getPreventRiskControlMeasureByUuid(work.getRiskMeasureId());
//            work.setTroubleshootContent(measure.getCheckContent());
//            work.setWorkStartTime("00:00:00");
//            work.setWorkEndTime("23:59:59");
//            int result = CJTaskFromWorkService.updateInfo(work);
//            if (result < 1){
//                throw new RuntimeException("执行出错");
//            }
//        }







//        logger.info("【包保责任人】任务数据重置");
//
//        List<PreventCJReportCheckTaskFromWork> workLists1 = CJTaskFromWorkService.listWork1();
//        for (PreventCJReportCheckTaskFromWork work : workLists1) {
//            PreventRiskControlMeasure measure = preventRiskControlMeasureService.getPreventRiskControlMeasureByUuid(work.getRiskMeasureId());
//            work.setTroubleshootContent(measure.getCheckContent());
//            HiddenDangerCheckJob jobById = trHiddenDangerCheckJobService.getJobById(work.getWorkId());
//            work.setTaskStartTime(jobById.getStartTime());
//            work.setWorkDayType("2");
//            List<PreventTaskType> infoByJobId = taskTypeService.getInfoByJobId(work.getWorkId());
//            int typeTag = 0;
//            for (PreventTaskType taskType : infoByJobId) {
//                typeTag = taskType.getType();
//            }
//            work.setWorkType(String.valueOf(typeTag));
//            work.setTaskNum("1");
//            int result = CJTaskFromWorkService.updateInfo1(work);
//            if (result < 1){
//                throw new RuntimeException("执行出错");
//            }
//        }




//
//        logger.info("任务数据重置");
//
//        /**
//         * 4、检索 任务配置 数据 prevent_report_check_record_from_task
//         * */
//        //读取任务配置数据上报主配置信息
//        PreventReportConfig workReportConfig = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_TASK_FROM_WORK.getCode());
//        //如果任务配置主配置开启上报
//        if (workReportConfig.getReportState().equals(SyncEnum.REPORT_ON.getCode())){
//            //  logger.info("【##】4.检索任务配置...");
//            //查询所有 选择上报的数据 && (reportTime == null 或者 reportTime < updateReportDataTime）
//            List<PreventRiskJobAndMeasure> works = preventRiskJobAndMeasureService.listReportWorkTest();
//            //获取上报数据对象与list
//            List<PreventCJReportCheckTaskFromWork> CJTaskFromWorkLists = new ArrayList<>();
//            HandlerReportParam handlerReportParam = new HandlerReportParam();
//
//            if (ObjectUtils.isNotEmpty(works)){
//                //遍历，封装数据
//                for (PreventRiskJobAndMeasure work : works) {
//                    //通过work中的信息，查询主表数据
//                    HiddenDangerCheckJob jobById = trHiddenDangerCheckJobService.getJobById(work.getJobId());
//                    //获取数据对象
//                    PreventCJReportCheckTaskFromWork CJTaskFromWork = new PreventCJReportCheckTaskFromWork();
//                    //转换时间周期单位 (1小时,2日,3周,4月,5年)
//                    if (jobById.getTroubleshootTypeCycleType() == 1){
//                        CJTaskFromWork.setCheckCycle(Math.toIntExact(jobById.getTroubleshootTypeCycleNum()));
//                        CJTaskFromWork.setCheckCycleUnit("小时");
//                        CJTaskFromWork.setWorkStartTime("00:00:00");
//                        CJTaskFromWork.setWorkEndTime("23:59:59");
//                    }else if (jobById.getTroubleshootTypeCycleType() == 2){
//                        CJTaskFromWork.setCheckCycle(Math.toIntExact(jobById.getTroubleshootTypeCycleNum()));
//                        CJTaskFromWork.setCheckCycleUnit("天");
//                    }else if (jobById.getTroubleshootTypeCycleType() == 3){
//                        Long num = jobById.getTroubleshootTypeCycleNum() * 7;
//                        CJTaskFromWork.setCheckCycle(Math.toIntExact(num));
//                        CJTaskFromWork.setCheckCycleUnit("天");
//                    }else if (jobById.getTroubleshootTypeCycleType() == 4){
//                        CJTaskFromWork.setCheckCycle(Math.toIntExact(jobById.getTroubleshootTypeCycleNum()));
//                        CJTaskFromWork.setCheckCycleUnit("月");
//                    }else if (jobById.getTroubleshootTypeCycleType() == 5){
//                        CJTaskFromWork.setCheckCycle(Math.toIntExact(jobById.getTroubleshootTypeCycleNum()));
//                        CJTaskFromWork.setCheckCycleUnit("年");
//                    }
//                    //获取用户信息
//                    User createUser = trUserService.getUserByLoginName(jobById.getCreateBy());
//                    User updateUser = trUserService.getUserByLoginName(jobById.getUpdateBy());
//
//                    //封装上报昌吉州任务配置数据
//                    CJTaskFromWork.setId(work.getJobUuid());
//                    CJTaskFromWork.setCompanyCode(companyCode);
////                    if (work.getReportStatus().equals(SyncEnum.SYNC_EXEC_SUCCESS.getCode())){
////                        CJTaskFromWork.setDeleted("2");//数据更新状态标识，目前仅昌吉州需要 2022-08-10
////                    }else {
////                        CJTaskFromWork.setDeleted("0");
////                    }
//                    CJTaskFromWork.setCreateBy(createUser.getUserName());
//                    CJTaskFromWork.setCreateDate(jobById.getCreateTime());
//                    if (ObjectUtils.isEmpty(updateUser)){
//                        CJTaskFromWork.setUpdateBy(createUser.getUserName());
//                        CJTaskFromWork.setUpdateDate(jobById.getCreateTime());
//                    }else {
//                        CJTaskFromWork.setUpdateBy(updateUser.getUserName());
//                        CJTaskFromWork.setUpdateDate(jobById.getCreateTime());
//                    }
//
//                    CJTaskFromWork.setReportStatus((byte) 77);
//                    CJTaskFromWork.setDeleted("2");//
//
//                    CJTaskFromWork.setReportTime(null);
//                    CJTaskFromWork.setDataSource((byte) 1);
//                    CJTaskFromWork.setRiskMeasureId(work.getMeasureUuid());
//                    CJTaskFromWork.setWorkId(jobById.getJobId());
//
//                    //第二版标准新增
//                    PreventRiskControlMeasure measureById = preventRiskControlMeasureService.getPreventRiskControlMeasureById(work.getMeasureId());
//                    CJTaskFromWork.setTroubleshootContent(measureById.getCheckContent());
//                    CJTaskFromWork.setTaskStartTime(jobById.getStartTime());
//
//                    CJTaskFromWork.setWorkDayType("0");
//                    List<PreventTaskType> typeByJobId = taskTypeService.getInfoByJobId(work.getJobId());
//                    int typeTag = 0;
//                    for (PreventTaskType taskType : typeByJobId) {
//                        typeTag = taskType.getType();
//                    }
//                    CJTaskFromWork.setWorkType(String.valueOf(typeTag));
//                    if (typeTag !=0){
//                        CJTaskFromWork.setTaskNum("1");
//                    }
//                    //封装数据
//                    CJTaskFromWorkLists.add(CJTaskFromWork);
//                    //设置原始数据上报状态
//                    handlerReportParam.setId(work.getId());
//                    handlerReportParam.setReportTime(new Date());
//                    handlerReportParam.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
//                    preventRiskJobAndMeasureService.updateWorkReportStatus(handlerReportParam);
//                }
//            }else {
//                logger.info("【双重预防】当前无任务配置数据需要处理");
//            }
//            //写入上报昌吉州数据转换表
//            for (PreventCJReportCheckTaskFromWork CJTaskFromWorks : CJTaskFromWorkLists) {
//                CJTaskFromWorkService.insertTaskFromWorkList(CJTaskFromWorks);
//                logger.info("【双重预防】任务配置CJ：数据处理...");
//            }
//        }else {
//            logger.info("任务配置数据上报已关闭");
//        }
//
//
    }
}

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

@@ -1,905 +1,910 @@
package com.ruoyi.doublePrevention.scheduls;



import com.alibaba.fastjson.JSON;

import com.alibaba.fastjson.JSONArray;

import com.alibaba.fastjson.JSONObject;



import com.ruoyi.common.utils.BeanCopyUtils;

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

import com.ruoyi.doublePrevention.entity.CJReport.CJdto.CJReportResultData;

import com.ruoyi.doublePrevention.entity.CJReport.CJdto.Data;

import com.ruoyi.doublePrevention.entity.CJReport.CJdto.ErrorMsgDetails;

import com.ruoyi.doublePrevention.entity.CJReport.CJdto.HandlerDO.*;

import com.ruoyi.doublePrevention.entity.PreventReportConfig;

import com.ruoyi.doublePrevention.enums.CJReportEnum;

import com.ruoyi.doublePrevention.enums.SyncEnum;

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

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

import com.ruoyi.project.tr.report.service.ReportService;

import org.apache.commons.lang3.ObjectUtils;

import org.bouncycastle.crypto.engines.AESFastEngine;

import org.bouncycastle.crypto.modes.GCMBlockCipher;

import org.bouncycastle.crypto.params.AEADParameters;

import org.bouncycastle.crypto.params.KeyParameter;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;

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

import org.springframework.scheduling.annotation.Scheduled;

import org.springframework.stereotype.Component;

import org.springframework.transaction.annotation.Transactional;



import java.io.*;

import java.lang.reflect.Array;

import java.net.HttpURLConnection;

import java.net.URL;

import java.nio.charset.StandardCharsets;

import java.text.SimpleDateFormat;

import java.util.*;



@Component

public class ExecCJReportDateSchedule {



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



    @Autowired

    private ReportService reportService;



    @Autowired

    private PreventCJReportRiskAnaUnitService CJRiskAnaUnitService;

    @Autowired

    private PreventCJReportRiskEventService CJEventService;

    @Autowired

    private PreventCJReportRiskControlMeasureService CJMeasureService;

    @Autowired

    private PreventCJReportCheckTaskFromWorkService CJTaskFromWorkService;

    @Autowired

    private PreventCJReportCheckRecordFromTaskService CJTaskRecordService;

    @Autowired

    private PreventCJReportDangerInfoService CJDangerInfoService;

    @Autowired

    private PreventCJReportPointService CJPointService;

    @Autowired

    private PreventCJReportOverhaulLogService CJOverhaulLogService;

    @Autowired

    private PreventReportConfigService preventReportConfigService;



    String token = "GT6gGJV7JV";

    String key = "Bv+NeBolwqg2Pbc1yVwrZA==";

    String iv = "4QC9V8eAiB7tdlgBkMsTAw==";



    public static final int MAC_BIT_SIZE = 128;



    public static String encrypt(String plainText, byte[] key, byte[] iv) {

        String sr;

        try {

            byte[] plainBytes = plainText.getBytes(StandardCharsets.UTF_8);

            GCMBlockCipher cipher = new GCMBlockCipher(new

                    AESFastEngine());

            AEADParameters parameters =

                    new AEADParameters(new KeyParameter(key),

                            MAC_BIT_SIZE, iv, null);

            cipher.init(true, parameters);

            byte[] encryptedBytes = new

                    byte[cipher.getOutputSize(plainBytes.length)];

            int retLen = cipher.processBytes(plainBytes, 0, plainBytes.length,

                    encryptedBytes, 0);

            cipher.doFinal(encryptedBytes, retLen);

            sr = Base64.getEncoder().encodeToString(encryptedBytes);

        } catch (Exception ex) {

            throw new RuntimeException(ex.getMessage());

        }

        return sr;

    }





    @Transactional

//    @Scheduled(cron = "0 0 23 * * ?")    //每天晚上23点执行一次0 0 22,23 * * ?

//    @Scheduled(cron = "0 0 22,23 * * ?")    //每天晚上22、23点执行一次

    @Scheduled(cron = "0 0/10 * * * ? ")    // 分钟

//    @Scheduled(cron = "0/30 * * * * ?")

    public void execReportDateSchedule() throws UnsupportedEncodingException {

        logger.info("【####】上报数据开始...");



        HttpURLConnection con = null;

        BufferedReader buffer = null;

        int responseCode = 200;



        SimpleDateFormat dateFormat= new SimpleDateFormat("yyyy-MM-dd HH:MM:ss");



        Date date = new Date();

        //格式化时间，作为token的时间戳

        SimpleDateFormat tokenDate= new SimpleDateFormat("yyyyMMddHHmmssSSS");

        String formatDate = tokenDate.format(date);



        logger.info("【token时间】" + formatDate);



        //使用风险分析单元数据上报主配置，作为自动上报开关

        PreventReportConfig reportConfig = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_RISK_ANA_UNIT.getCode());

        if (reportConfig.getReportType() == 0){

            return;

        }



        /**

         * 1、处理安全风险分析单元数据

         * */

        logger.info("【1】安全风险分析单元-处理数据...");

        List<PreventCJReportRiskAnaUnit> CJRiskAnaUnits = CJRiskAnaUnitService.listReportUnitDate();

        if (ObjectUtils.isNotEmpty(CJRiskAnaUnits)){

            //封装上报数据,时间格式化

            List<CJReportRiskAnaUnitDTO> list = new ArrayList<>();

            for (PreventCJReportRiskAnaUnit cjRiskAnaUnit : CJRiskAnaUnits) {

                CJReportRiskAnaUnitDTO riskAnaUnit = BeanCopyUtils.copyBean(cjRiskAnaUnit, CJReportRiskAnaUnitDTO.class);

                riskAnaUnit.setCreateDate(dateFormat.format(cjRiskAnaUnit.getCreateDate()));

                riskAnaUnit.setUpdateDate(dateFormat.format(cjRiskAnaUnit.getUpdateDate()));

                list.add(riskAnaUnit);

            }

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

            String AESReportUnitDate = encrypt(JSONObject.toJSONString(list), key.getBytes(), iv.getBytes());

//            logger.info("【【AES加密结果】】"+ AESReportUnitDate);![](C:/Users/Ad![](C:/Users/Admin/Desktop/所有桌面文件存放/9}AM56M10$6WX){0JRK`$6X.jpg)min/Desktop/所有桌面文件存放/9}AM56M10$6WX){0JRK`$6X.jpg)

            StringBuffer unitResultBuffer = null;

            //上报数据

            try {

                URL url = new URL("http://120.71.182.198:9999/v1/data/receive/unitMsg");

                //得到连接对象

                con = (HttpURLConnection) url.openConnection();

                //设置请求类型

                con.setRequestMethod("POST");

                //允许写出

                con.setDoOutput(true);

                //允许读入

                con.setDoInput(true);

                //不使用缓存

                con.setUseCaches(false);

                con.setInstanceFollowRedirects(true);

                //设置请求头

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

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

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



                OutputStream os = con.getOutputStream();

                Map paraMap = new HashMap();

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

                logger.info("【【加密请求体】】" +  JSONArray.toJSON(paraMap).toString());

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

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



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

                if (responseCode == HttpURLConnection.HTTP_OK) {

                    //得到响应流

                    InputStream inputStream = con.getInputStream();

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

                    unitResultBuffer = new StringBuffer();

                    String line;

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

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

                        unitResultBuffer.append(line);

                    }

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

                }



            } catch (Exception e) {

                e.printStackTrace();

            }

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

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

            //接收参数，转为对象

            CJReportResultData CJUnitResult = JSONObject.parseObject(unitResultBuffer.toString(), CJReportResultData.class);

//            Object parse = JSON.parse(CJUnitResult.getData());

            //取出需要的data部分，再次转换为对象

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

            if (ObjectUtils.isNotEmpty(data)){

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

                    errorIdList.add(errorMsgDetail.getId());

                }

            }

            if (CJUnitResult.getCode().equals(CJReportEnum.SUCCESS.getCode())){

                logger.info("【#】RiskAnaUnit所有数据全部入库成功");

                for (PreventCJReportRiskAnaUnit CJRiskAnaUnit : CJRiskAnaUnits) {

                    HandlerCJReportParam handlerCJReportParam = new HandlerCJReportParam();

                    //封装数据

                    handlerCJReportParam.setId(CJRiskAnaUnit.getId());

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

                    handlerCJReportParam.setReportTime(date);

                    CJRiskAnaUnitService.updateCJReportStatusById(handlerCJReportParam);

                }

            }else if (CJUnitResult.getCode().equals(CJReportEnum.SUCESS_AND_FAIL.getCode())){

                logger.info("【#】RiskAnaUnit部分数据上传失败原因" + CJUnitResult.getErrorMsg());



                CJUnitResult.getData();

                //遍历数据，设置数据上报成功

                for (PreventCJReportRiskAnaUnit CJRiskAnaUnit : CJRiskAnaUnits) {

                    HandlerCJReportParam handlerCJReportParam = new HandlerCJReportParam();

                    //封装数据

                    handlerCJReportParam.setId(CJRiskAnaUnit.getId());

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

                    handlerCJReportParam.setReportTime(date);

                    CJRiskAnaUnitService.updateCJReportStatusById(handlerCJReportParam);

                }

                //遍历失败数据，设置数据上报失败

                for (String failId : errorIdList) {

                    //上报失败

                    HandlerCJReportParam handlerCJReportParam = new HandlerCJReportParam();

                    //封装数据

                    handlerCJReportParam.setId(failId);

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

                    handlerCJReportParam.setReportTime(date);

                    CJRiskAnaUnitService.updateCJReportStatusById(handlerCJReportParam);

                }

            }

            else if (CJUnitResult.getCode().equals(CJReportEnum.FAIL.getCode())){

                logger.info("【#】RiskAnaUnit所有数据全部入库失败");

                for (String failId : errorIdList) {

                    //上报失败

                    HandlerCJReportParam handlerCJReportParam = new HandlerCJReportParam();

                    //封装数据

                    handlerCJReportParam.setId(failId);

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

                    handlerCJReportParam.setReportTime(date);

                    CJRiskAnaUnitService.updateCJReportStatusById(handlerCJReportParam);

                }

            }

            logger.info("【1】安全风险分析单元-数据处理完成");

        }else {

            logger.info("【1】风险分析单元-无数据上报昌吉州");

        }





        /**

         * 2、处理安全风险事件数据

         * */

        logger.info("【2】安全风险事件-处理数据...");

        List<PreventCJReportRiskEvent> CJEvents = CJEventService.listReportEventDate();

        if (ObjectUtils.isNotEmpty(CJEvents)){

            //封装上报数据

            List<CJReportRiskEventDTO> eventList = new ArrayList<>();



            for (PreventCJReportRiskEvent cjEvent : CJEvents) {

                CJReportRiskEventDTO CJReportRiskEvent = BeanCopyUtils.copyBean(cjEvent, CJReportRiskEventDTO.class);

                CJReportRiskEvent.setCreateDate(dateFormat.format(cjEvent.getCreateDate()));

                CJReportRiskEvent.setUpdateDate(dateFormat.format(cjEvent.getUpdateDate()));

                eventList.add(CJReportRiskEvent);

            }

            logger.info("【【风险事件原始数据】】" + JSONObject.toJSONString(eventList));

            //加密数据

            String AESReportUnitDate = encrypt(JSONObject.toJSONString(eventList), key.getBytes(), iv.getBytes());



            StringBuffer eventResultBuffer = null;

            //上报数据

            try {

                URL url = new URL("http://120.71.182.198:9999/v1/data/receive/eventMsg");

                //得到连接对象

                con = (HttpURLConnection) url.openConnection();

                //设置请求类型

                con.setRequestMethod("POST");

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

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

                //允许写出

                con.setDoOutput(true);

                //允许读入

                con.setDoInput(true);

                //不使用缓存

                con.setUseCaches(false);

                //设置请求头

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

                con.setInstanceFollowRedirects(true);

                OutputStream os = con.getOutputStream();

                Map paraMap = new HashMap();

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

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

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

                //得到响应码

                responseCode = con.getResponseCode();

                //确认响应流不为空

                if (responseCode == HttpURLConnection.HTTP_OK) {

                    //得到响应流

                    InputStream inputStream = con.getInputStream();

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

                    eventResultBuffer = new StringBuffer();

                    String line;

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

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

                        eventResultBuffer.append(line);

                    }

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

                }

            } catch (Exception e) {

                e.printStackTrace();

            }



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

            CJReportResultData CJEventResult = JSONObject.parseObject(eventResultBuffer.toString(), CJReportResultData.class);



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

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

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

            if (ObjectUtils.isNotEmpty(data)){

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

                    errorIdList.add(errorMsgDetail.getId());

                }

            }

            if (CJEventResult.getCode().equals(CJReportEnum.SUCCESS.getCode())){

                logger.info("【#】Event所有数据全部入库成功");

                for (PreventCJReportRiskEvent CJEvent : CJEvents) {

                    HandlerCJReportParam handlerCJReportParam = new HandlerCJReportParam();

                    //封装数据

                    handlerCJReportParam.setId(CJEvent.getId());

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

                    handlerCJReportParam.setReportTime(date);

                    CJEventService.updateCJReportStatusById(handlerCJReportParam);

                }

            }else if (CJEventResult.getCode().equals(CJReportEnum.SUCESS_AND_FAIL.getCode())){

                logger.info("【#】Event部分数据上传失败原因" + CJEventResult.getErrorMsg());

                //遍历数据，上报数据设置为成功状态

                for (PreventCJReportRiskEvent CJEvent : CJEvents) {

                    HandlerCJReportParam handlerCJReportParam = new HandlerCJReportParam();

                    //封装数据

                    handlerCJReportParam.setId(CJEvent.getId());

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

                    handlerCJReportParam.setReportTime(date);

                    CJEventService.updateCJReportStatusById(handlerCJReportParam);

                }

                //遍历失败数据，设置为失败状态

                for (String failId : errorIdList) {

                    //上报失败

                    HandlerCJReportParam handlerCJReportParam = new HandlerCJReportParam();

                    //封装数据

                    handlerCJReportParam.setId(failId);

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

                    handlerCJReportParam.setReportTime(date);

                    CJEventService.updateCJReportStatusById(handlerCJReportParam);

                }

            } else if (CJEventResult.getCode().equals(CJReportEnum.FAIL.getCode())){

                logger.info("【#】Event所有数据全部入库失败");

                for (String failId : errorIdList) {

                    //上报失败

                    HandlerCJReportParam handlerCJReportParam = new HandlerCJReportParam();

                    //封装数据

                    handlerCJReportParam.setId(failId);

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

                    handlerCJReportParam.setReportTime(date);

                    CJEventService.updateCJReportStatusById(handlerCJReportParam);

                }

            }

            logger.info("【2】安全风险事件-数据处理完成");

        }else {

            logger.info("【2】风险事件-无数据上报昌吉州");

        }





        /**

         * 3、处理风险管控措施数据

         * */

        logger.info("【3】风险管控措施-处理数据...");

        List<PreventCJReportRiskControlMeasure> CJMeasures = CJMeasureService.listReportMeasureDate();

        //封装上报数据

        List<CJReportRiskControlMeasureDTO> reportMeasureList = new ArrayList<>();

        if (ObjectUtils.isNotEmpty(CJMeasures)){

            for (PreventCJReportRiskControlMeasure cjMeasure : CJMeasures) {

                CJReportRiskControlMeasureDTO cjReportRiskControlMeasureDTO = BeanCopyUtils.copyBean(cjMeasure, CJReportRiskControlMeasureDTO.class);

                cjReportRiskControlMeasureDTO.setCreateDate(dateFormat.format(cjMeasure.getCreateDate()));

                cjReportRiskControlMeasureDTO.setUpdateDate(dateFormat.format(cjMeasure.getUpdateDate()));

                reportMeasureList.add(cjReportRiskControlMeasureDTO);

            }

            //数据上报

            String AESReportMeasure = encrypt(JSONObject.toJSONString(reportMeasureList), key.getBytes(), iv.getBytes());



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



            StringBuffer measureResultBuffer = null;

            //上报数据

            try {

                URL url = new URL("http://120.71.182.198:9999/v1/data/receive/controlMeasuresMsg");

                //得到连接对象

                con = (HttpURLConnection) url.openConnection();

                //设置请求类型

                con.setRequestMethod("POST");

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

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

                //允许写出

                con.setDoOutput(true);

                //允许读入

                con.setDoInput(true);

                //不使用缓存

                con.setUseCaches(false);

                //设置请求头

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

                OutputStream os = con.getOutputStream();

                Map paraMap = new HashMap();

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

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

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

                //得到响应码

                responseCode = con.getResponseCode();

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

                if (responseCode == HttpURLConnection.HTTP_OK) {

                    //得到响应流

                    InputStream inputStream = con.getInputStream();

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

                    measureResultBuffer = new StringBuffer();

                    String line;

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

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

                        measureResultBuffer.append(line);

                    }

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

                }

            } catch (Exception e) {

                e.printStackTrace();

            }



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

            CJReportResultData CJMeasureResult = JSONObject.parseObject(measureResultBuffer.toString(), CJReportResultData.class);

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

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

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

            //保存失败结果

            if (ObjectUtils.isNotEmpty(data)){

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

                    errorIdList.add(errorMsgDetail.getId());

                }

            }

            logger.info("【】管控措施-数据上报结果：" + CJMeasureResult.getCode());

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

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

                for (PreventCJReportRiskControlMeasure CJMeasure : CJMeasures) {

                    HandlerCJReportParam handlerCJReportParam = new HandlerCJReportParam();

                    //封装数据

                    handlerCJReportParam.setId(CJMeasure.getId());

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

                    handlerCJReportParam.setReportTime(date);

                    CJMeasureService.updateCJReportStatusById(handlerCJReportParam);

                }

            }

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

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

                for (String failId : errorIdList) {

                    //上报失败

                    HandlerCJReportParam handlerCJReportParam = new HandlerCJReportParam();

                    //封装数据

                    handlerCJReportParam.setId(failId);

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

                    handlerCJReportParam.setReportTime(date);

                    CJMeasureService.updateCJReportStatusById(handlerCJReportParam);

                }

            }

            logger.info("【3】风险管控措施-数据处理完成");

        }else {

            logger.info("【3】风险管控措施-无数据上报昌吉州");

        }





        /**

         * 4、处理 任务-配置 数据

         * */

        logger.info("【4】任务-处理数据...");

        List<PreventCJReportCheckTaskFromWork> CJTaskFromWorks = CJTaskFromWorkService.listReportTaskFromWorkDate();

        if(ObjectUtils.isNotEmpty(CJTaskFromWorks)){

            //封装上报数据

            List<CJReportCheckTaskFromWorkDTO> reportCheckTaskFromWorkList = new ArrayList<>();

            for (PreventCJReportCheckTaskFromWork cjTaskFromWork : CJTaskFromWorks) {

                CJReportCheckTaskFromWorkDTO cjReportCheckTaskFromWorkDTO = BeanCopyUtils.copyBean(cjTaskFromWork, CJReportCheckTaskFromWorkDTO.class);

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

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

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

                reportCheckTaskFromWorkList.add(cjReportCheckTaskFromWorkDTO);

            }

            System.out.println(Arrays.toString(reportCheckTaskFromWorkList.toArray()));

            //数据上报

            String AESReportTaskFromWork = encrypt(JSONObject.toJSONString(reportCheckTaskFromWorkList), key.getBytes(), iv.getBytes());

            StringBuffer taskFromWorkResultBuffer = null;

            //上报数据

            try {

                URL url = new URL("http://120.71.182.198:9999/v1/data/receive/measuresTaskMsg");

                //得到连接对象

                con = (HttpURLConnection) url.openConnection();

                //设置请求类型

                con.setRequestMethod("POST");

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

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

                //允许写出

                con.setDoOutput(true);

                //允许读入

                con.setDoInput(true);

                //不使用缓存

                con.setUseCaches(false);

                //设置请求头

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

                OutputStream os = con.getOutputStream();

                Map paraMap = new HashMap();

                paraMap.put("data", AESReportTaskFromWork);

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

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

                //得到响应码

                responseCode = con.getResponseCode();

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

                if (responseCode == HttpURLConnection.HTTP_OK) {

                    //得到响应流

                    InputStream inputStream = con.getInputStream();

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

                    taskFromWorkResultBuffer = new StringBuffer();

                    String line;

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

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

                        taskFromWorkResultBuffer.append(line);

                    }

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

                }

            } catch (Exception e) {

                e.printStackTrace();

            }



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

            CJReportResultData CJTaskFromWorkResult = JSONObject.parseObject(taskFromWorkResultBuffer.toString(), CJReportResultData.class);

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

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

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

            //保存失败结果

            if (ObjectUtils.isNotEmpty(data)){

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

                    errorIdList.add(errorMsgDetail.getId());

                }

            }

            logger.info("【】任务：数据上报结果：" + CJTaskFromWorkResult.getCode());

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

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

                for (PreventCJReportCheckTaskFromWork CJTaskFromWork : CJTaskFromWorks) {

                    HandlerCJReportParam handlerCJReportParam = new HandlerCJReportParam();

                    //封装数据

                    handlerCJReportParam.setId(CJTaskFromWork.getId());

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

                    handlerCJReportParam.setReportTime(date);

                    CJTaskFromWorkService.updateCJReportStatusById(handlerCJReportParam);

                }

            }

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

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

                for (String failId : errorIdList) {

                    //上报失败

                    HandlerCJReportParam handlerCJReportParam = new HandlerCJReportParam();

                    //封装数据

                    handlerCJReportParam.setId(failId);

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

                    handlerCJReportParam.setReportTime(date);

                    CJTaskFromWorkService.updateCJReportStatusById(handlerCJReportParam);

                }

            }

            logger.info("【4】任务-数据处理完成");

        }else {

            logger.info("【4】任务-无数据上报昌吉州");

        }



        /**

         * 5、处理 任务-记录 数据

         * */

        logger.info("【5】任务记录-处理数据...");

        List<PreventCJReportCheckRecordFromTask> CJRecordFromTasks = CJTaskRecordService.listReportTaskRecordDate();

        if (ObjectUtils.isNotEmpty(CJRecordFromTasks)){

            //封装上报数据

            List<CJReportCheckRecordFromTaskDTO> reportRecordFromTaskList = new ArrayList<>();

            for (PreventCJReportCheckRecordFromTask cjRecordFromTask : CJRecordFromTasks) {

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

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

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

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

                cjReportCheckRecordFromTaskDTO.setMobileMe(cjRecordFromTask.getMobileCode());

                cjReportCheckRecordFromTaskDTO.setIsDefend(cjRecordFromTask.getDefend());

                reportRecordFromTaskList.add(cjReportCheckRecordFromTaskDTO);

            }

//            System.out.println(Arrays.toString(reportRecordFromTaskList.toArray()));

            //数据加密

            String AESReportRecordFromTask = encrypt(JSONObject.toJSONString(reportRecordFromTaskList), key.getBytes(), iv.getBytes());

            logger.info("【test】数据加密完成,开始上报数据");

            StringBuffer recordFromTaskResultBuffer = null;

            //上报数据

            try {

                URL url = new URL("http://120.71.182.198:9999/v1/data/receive/measuresTaskRecordMsg");

                //得到连接对象

                con = (HttpURLConnection) url.openConnection();

                //设置请求类型

                con.setRequestMethod("POST");

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

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

                //允许写出

                con.setDoOutput(true);

                //允许读入

                con.setDoInput(true);

                //不使用缓存

                con.setUseCaches(false);

                //设置请求头

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

                OutputStream os = con.getOutputStream();

                Map paraMap = new HashMap();

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

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

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

                //得到响应码

                responseCode = con.getResponseCode();

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

                if (responseCode == HttpURLConnection.HTTP_OK) {

                    //得到响应流

                    InputStream inputStream = con.getInputStream();

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

                    recordFromTaskResultBuffer = new StringBuffer();

                    String line;

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

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

                        recordFromTaskResultBuffer.append(line);

                    }

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

                }else {

                    logger.info("Http结果:" + responseCode);

                }

            } catch (Exception e) {

                e.printStackTrace();

            }



            logger.info("【test】接收返回值");

            CJReportResultData CJRecordFromTaskResult = new CJReportResultData();

            try {

                CJRecordFromTaskResult =  JSONObject.parseObject(recordFromTaskResultBuffer.toString(), CJReportResultData.class);

                if (ObjectUtils.isEmpty(CJRecordFromTaskResult)){

                    throw new RuntimeException("返回值为空");

                }

            }catch (Exception e){

                e.printStackTrace();

                logger.info("【test】接收返回值异常");

            }



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

//            CJReportResultData CJRecordFromTaskResult = JSONObject.parseObject(recordFromTaskResultBuffer.toString(), CJReportResultData.class);

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

            logger.info("【test】保存上报结果");

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

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

            //保存失败结果

            if (ObjectUtils.isNotEmpty(data)){

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

                    errorIdList.add(errorMsgDetail.getId());

                }

            }

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

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

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

                for (PreventCJReportCheckRecordFromTask CJRecordFromTask : CJRecordFromTasks) {

                    HandlerCJReportParam handlerCJReportParam = new HandlerCJReportParam();

                    //封装数据

                    handlerCJReportParam.setId(CJRecordFromTask.getId());

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

                    handlerCJReportParam.setReportTime(date);

                    CJTaskRecordService.updateCJReportStatusById(handlerCJReportParam);

                }

            }

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

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

                for (String failId : errorIdList) {

                    //上报失败

                    HandlerCJReportParam handlerCJReportParam = new HandlerCJReportParam();

                    //封装数据

                    handlerCJReportParam.setId(failId);

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

                    handlerCJReportParam.setReportTime(date);

                    CJTaskRecordService.updateCJReportStatusById(handlerCJReportParam);

                }

            }

            logger.info("【5】任务记录-数据处理完成");

        }else {

            logger.info("【5】任务记录-无数据上报昌吉州");

        }



        /**

         * 6、处理隐患信息数据

         * */

        logger.info("【6】隐患信息-处理数据...");

        List<PreventCJReportDangerInfo> CJDangerInfos = CJDangerInfoService.listReportDangerDate();

       if (ObjectUtils.isNotEmpty(CJDangerInfos)){

           //封装上报数据

           List<CJReportDangerInfoDTO> reportDangerInfoLists = new ArrayList<>();

           for (PreventCJReportDangerInfo cjDangerInfo : CJDangerInfos) {

               CJReportDangerInfoDTO cjReportDangerInfoDTO = BeanCopyUtils.copyBean(cjDangerInfo, CJReportDangerInfoDTO.class);

               cjReportDangerInfoDTO.setCreateDate(dateFormat.format(cjDangerInfo.getCreateDate()));

               cjReportDangerInfoDTO.setUpdateDate(dateFormat.format(cjDangerInfo.getUpdateDate()));

               if (ObjectUtils.isNotEmpty(cjDangerInfo.getCheckAcceptTime())){

                   cjReportDangerInfoDTO.setCheckAcceptTime(dateFormat.format(cjDangerInfo.getCheckAcceptTime()));

               }else {

                   cjReportDangerInfoDTO.setCheckAcceptTime(null);

               }

               cjReportDangerInfoDTO.setRegistTime(dateFormat.format(cjDangerInfo.getRegistTime()));

               cjReportDangerInfoDTO.setDangerManageDeadline(dateFormat.format(cjDangerInfo.getDangerManageDeadline()));

               reportDangerInfoLists.add(cjReportDangerInfoDTO);

           }

           //数据上报

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

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

           StringBuffer dangerInfoResultBuffer = null;

           //上报数据

           try {

               URL url = new URL("http://120.71.182.198:9999/v1/data/receive/dangerInvestigationMsg");

               //得到连接对象

               con = (HttpURLConnection) url.openConnection();

               //设置请求类型

               con.setRequestMethod("POST");

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

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

               //允许写出

               con.setDoOutput(true);

               //允许读入

               con.setDoInput(true);

               //不使用缓存

               con.setUseCaches(false);

               //设置请求头

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

               OutputStream os = con.getOutputStream();

               Map paraMap = new HashMap();

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

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

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

               //得到响应码

               responseCode = con.getResponseCode();

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

               if (responseCode == HttpURLConnection.HTTP_OK) {

                   //得到响应流

                   InputStream inputStream = con.getInputStream();

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

                   dangerInfoResultBuffer = new StringBuffer();

                   String line;

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

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

                       dangerInfoResultBuffer.append(line);

                   }

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

               }

           } catch (Exception e) {

               e.printStackTrace();

           }



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

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

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

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

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

           //保存失败结果

           if (ObjectUtils.isNotEmpty(data)){

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

                   errorIdList.add(errorMsgDetail.getId());

               }

           }

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

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

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

               for (PreventCJReportDangerInfo CJDangerInfo : CJDangerInfos) {

                   HandlerCJReportParam handlerCJReportParam = new HandlerCJReportParam();

                   //封装数据

                   handlerCJReportParam.setId(CJDangerInfo.getId());

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

                   handlerCJReportParam.setReportTime(date);

                   CJDangerInfoService.updateCJReportStatusById(handlerCJReportParam);

               }

           }

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

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

               for (String failId : errorIdList) {

                   //上报失败

                   HandlerCJReportParam handlerCJReportParam = new HandlerCJReportParam();

                   //封装数据

                   handlerCJReportParam.setId(failId);

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

                   handlerCJReportParam.setReportTime(date);

                   CJDangerInfoService.updateCJReportStatusById(handlerCJReportParam);

               }

           }

           logger.info("【6】隐患信息-数据处理完成");

       }else {

           logger.info("【6】隐患信息-无数据上报昌吉州");

       }





        /**

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

         * */

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

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

        if (ObjectUtils.isNotEmpty(CJOverhaulLogs)){

            //封装上报数据

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

            for (PreventCJReportOverhaulLog cjOverhaulLog : CJOverhaulLogs) {

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



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

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

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

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

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

                }else {

                    cjReportOverhaulLogDTO.setStopEndTime(null);

                }

                reportOverhaulLogDTOS.add(cjReportOverhaulLogDTO);

            }



            //数据上报

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

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

            StringBuffer dangerInfoResultBuffer = null;

            //上报数据

            try {

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

                //得到连接对象

                con = (HttpURLConnection) url.openConnection();

                //设置请求类型

                con.setRequestMethod("POST");

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

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

                //允许写出

                con.setDoOutput(true);

                //允许读入

                con.setDoInput(true);

                //不使用缓存

                con.setUseCaches(false);

                //设置请求头

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

                OutputStream os = con.getOutputStream();

                Map paraMap = new HashMap();

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

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

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

                //得到响应码

                responseCode = con.getResponseCode();

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

                if (responseCode == HttpURLConnection.HTTP_OK) {

                    //得到响应流

                    InputStream inputStream = con.getInputStream();

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

                    dangerInfoResultBuffer = new StringBuffer();

                    String line;

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

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

                        dangerInfoResultBuffer.append(line);

                    }

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

                }

            } catch (Exception e) {

                e.printStackTrace();

            }



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

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

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

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

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

            //保存失败结果

            if (ObjectUtils.isNotEmpty(data)){

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

                    errorIdList.add(errorMsgDetail.getId());

                }

            }

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

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



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

                for (PreventCJReportOverhaulLog cjOverhaulLog : CJOverhaulLogs) {

                    HandlerCJReportParam handlerCJReportParam = new HandlerCJReportParam();

                    //封装数据

                    handlerCJReportParam.setId(cjOverhaulLog.getId());

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

                    handlerCJReportParam.setReportTime(date);

                    CJOverhaulLogService.updateCJReportStatusById(handlerCJReportParam);

                }

            }

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

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

                for (String failId : errorIdList) {

                    //上报失败

                    HandlerCJReportParam handlerCJReportParam = new HandlerCJReportParam();

                    //封装数据

                    handlerCJReportParam.setId(failId);

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

                    handlerCJReportParam.setReportTime(date);

                    CJOverhaulLogService.updateCJReportStatusById(handlerCJReportParam);

                }

            }

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

        }else {

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

        }



    }

}

package com.ruoyi.doublePrevention.scheduls;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.ruoyi.common.utils.BeanCopyUtils;
import com.ruoyi.doublePrevention.entity.CJReport.CJdto.CJReportResultData;
import com.ruoyi.doublePrevention.entity.CJReport.CJdto.Data;
import com.ruoyi.doublePrevention.entity.CJReport.CJdto.ErrorMsgDetails;
import com.ruoyi.doublePrevention.entity.CJReport.CJdto.HandlerDO.*;
import com.ruoyi.doublePrevention.entity.CJReport.*;
import com.ruoyi.doublePrevention.entity.PreventReportConfig;
import com.ruoyi.doublePrevention.enums.CJReportEnum;
import com.ruoyi.doublePrevention.enums.SyncEnum;
import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam;
import com.ruoyi.doublePrevention.service.baseService.*;
import com.ruoyi.project.tr.report.service.ReportService;
import org.apache.commons.lang3.ObjectUtils;
import org.bouncycastle.crypto.engines.AESFastEngine;
import org.bouncycastle.crypto.modes.GCMBlockCipher;
import org.bouncycastle.crypto.params.AEADParameters;
import org.bouncycastle.crypto.params.KeyParameter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;

import java.io.*;
import java.net.HttpURLConnection;
import java.net.URL;
import java.nio.charset.StandardCharsets;
import java.text.SimpleDateFormat;
import java.util.*;

@Component
public class ExecCJReportDateSchedule {

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

    @Autowired
    private ReportService reportService;

    @Autowired
    private PreventCJReportRiskAnaUnitService CJRiskAnaUnitService;
    @Autowired
    private PreventCJReportRiskEventService CJEventService;
    @Autowired
    private PreventCJReportRiskControlMeasureService CJMeasureService;
    @Autowired
    private PreventCJReportCheckTaskFromWorkService CJTaskFromWorkService;
    @Autowired
    private PreventCJReportCheckRecordFromTaskService CJTaskRecordService;
    @Autowired
    private PreventCJReportDangerInfoService CJDangerInfoService;
    @Autowired
    private PreventCJReportPointService CJPointService;
    @Autowired
    private PreventCJReportOverhaulLogService CJOverhaulLogService;
    @Autowired
    private PreventReportConfigService preventReportConfigService;

    String token = "GT6gGJV7JV";
    String key = "Bv+NeBolwqg2Pbc1yVwrZA==";
    String iv = "4QC9V8eAiB7tdlgBkMsTAw==";

    public static final int MAC_BIT_SIZE = 128;

    public static String encrypt(String plainText, byte[] key, byte[] iv) {
        String sr;
        try {
            byte[] plainBytes = plainText.getBytes(StandardCharsets.UTF_8);
            GCMBlockCipher cipher = new GCMBlockCipher(new
                    AESFastEngine());
            AEADParameters parameters =
                    new AEADParameters(new KeyParameter(key),
                            MAC_BIT_SIZE, iv, null);
            cipher.init(true, parameters);
            byte[] encryptedBytes = new
                    byte[cipher.getOutputSize(plainBytes.length)];
            int retLen = cipher.processBytes(plainBytes, 0, plainBytes.length,
                    encryptedBytes, 0);
            cipher.doFinal(encryptedBytes, retLen);
            sr = Base64.getEncoder().encodeToString(encryptedBytes);
        } catch (Exception ex) {
            throw new RuntimeException(ex.getMessage());
        }
        return sr;
    }


    @Transactional
//    @Scheduled(cron = "0 0 23 * * ?")    //每天晚上23点执行一次0 0 22,23 * * ?
//    @Scheduled(cron = "0 0 22,23 * * ?")    //每天晚上22、23点执行一次
    // @Scheduled(cron = "0 0/5 * * * ? ")    // 分钟
   // @Scheduled(cron = "0 0/5 * * * ? ")
    @Scheduled(cron = "0 0/1 * * * ? ")
    public void execReportDateSchedule() throws UnsupportedEncodingException {
        logger.info("【####】上报数据开始...");

        HttpURLConnection con = null;
        BufferedReader buffer = null;
        int responseCode = 200;

        SimpleDateFormat dateFormat= new SimpleDateFormat("yyyy-MM-dd HH:MM:ss");

        Date date = new Date();
        //格式化时间，作为token的时间戳
        SimpleDateFormat tokenDate= new SimpleDateFormat("yyyyMMddHHmmssSSS");
        String formatDate = tokenDate.format(date);

        logger.info("【token时间】" + formatDate);

        //使用风险分析单元数据上报主配置，作为自动上报开关
        PreventReportConfig reportConfig = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_RISK_ANA_UNIT.getCode());
        if (reportConfig.getReportType() == 0){
            return;
        }

        /**
         * 1、处理安全风险分析单元数据
         * */
        logger.info("【1】安全风险分析单元-处理数据...");
        List<PreventCJReportRiskAnaUnit> CJRiskAnaUnits = CJRiskAnaUnitService.listReportUnitDate();
        if (ObjectUtils.isNotEmpty(CJRiskAnaUnits)){
            //封装上报数据,时间格式化
            List<CJReportRiskAnaUnitDTO> list = new ArrayList<>();
            for (PreventCJReportRiskAnaUnit cjRiskAnaUnit : CJRiskAnaUnits) {
                CJReportRiskAnaUnitDTO riskAnaUnit = BeanCopyUtils.copyBean(cjRiskAnaUnit, CJReportRiskAnaUnitDTO.class);
                riskAnaUnit.setCreateDate(dateFormat.format(cjRiskAnaUnit.getCreateDate()));
                riskAnaUnit.setUpdateDate(dateFormat.format(cjRiskAnaUnit.getUpdateDate()));
                list.add(riskAnaUnit);
            }
//            logger.info("【【原始数据】】" + JSONObject.toJSONString(list));
            String AESReportUnitDate = encrypt(JSONObject.toJSONString(list), key.getBytes(), iv.getBytes());
//            logger.info("【【AES加密结果】】"+ AESReportUnitDate);![](C:/Users/Ad![](C:/Users/Admin/Desktop/所有桌面文件存放/9}AM56M10$6WX){0JRK`$6X.jpg)min/Desktop/所有桌面文件存放/9}AM56M10$6WX){0JRK`$6X.jpg)
            StringBuffer unitResultBuffer = null;
            //上报数据
            try {
                URL url = new URL("http://120.71.182.198:9999/v1/data/receive/unitMsg");
                //得到连接对象
                con = (HttpURLConnection) url.openConnection();
                //设置请求类型
                con.setRequestMethod("POST");
                //允许写出
                con.setDoOutput(true);
                //允许读入
                con.setDoInput(true);
                //不使用缓存
                con.setUseCaches(false);
                con.setInstanceFollowRedirects(true);
                //设置请求头
                con.setRequestProperty("X-Access-Token",token+formatDate.toString());
                //设置Content-Type，此处根据实际情况确定
                con.setRequestProperty("Content-Type", "application/json;charset=utf8");

                OutputStream os = con.getOutputStream();
                Map paraMap = new HashMap();
                paraMap.put("data", AESReportUnitDate); /**封装数据*/
                logger.info("【【加密请求体】】" +  JSONArray.toJSON(paraMap).toString());
                //组装入参，设置请求体
                os.write(JSON.toJSONString(paraMap).getBytes());

                //本段日志，测试成功后，可注释掉
                if (responseCode == HttpURLConnection.HTTP_OK) {
                    //得到响应流
                    InputStream inputStream = con.getInputStream();
                    //将响应流转换成字符串
                    unitResultBuffer = new StringBuffer();
                    String line;
                    buffer = new BufferedReader(new InputStreamReader(inputStream, "UTF-8"));
                    while ((line = buffer.readLine()) != null) {
                        unitResultBuffer.append(line);
                    }
                    logger.info("result:" + unitResultBuffer.toString());
                }

            } catch (Exception e) {
                e.printStackTrace();
            }
            //接收返回值，保存返回值
            List<String> errorIdList= new ArrayList<>();
            //接收参数，转为对象
            CJReportResultData CJUnitResult = JSONObject.parseObject(unitResultBuffer.toString(), CJReportResultData.class);
//            Object parse = JSON.parse(CJUnitResult.getData());
            //取出需要的data部分，再次转换为对象
            Data data = JSONObject.parseObject(CJUnitResult.getData(), Data.class);
            if (ObjectUtils.isNotEmpty(data)){
                for (ErrorMsgDetails errorMsgDetail : data.getErrorMsgDetails()) {
                    errorIdList.add(errorMsgDetail.getId());
                }
            }
            if (CJUnitResult.getCode().equals(CJReportEnum.SUCCESS.getCode())){
                logger.info("【#】RiskAnaUnit所有数据全部入库成功");
                for (PreventCJReportRiskAnaUnit CJRiskAnaUnit : CJRiskAnaUnits) {
                    HandlerCJReportParam handlerCJReportParam = new HandlerCJReportParam();
                    //封装数据
                    handlerCJReportParam.setId(CJRiskAnaUnit.getId());
                    handlerCJReportParam.setReportStatus(SyncEnum.SYNC_EXEC_SUCCESS.getCode());
                    handlerCJReportParam.setReportTime(date);
                    CJRiskAnaUnitService.updateCJReportStatusById(handlerCJReportParam);
                }
            }else if (CJUnitResult.getCode().equals(CJReportEnum.SUCESS_AND_FAIL.getCode())){
                logger.info("【#】RiskAnaUnit部分数据上传失败原因" + CJUnitResult.getErrorMsg());

                CJUnitResult.getData();
                //遍历数据，设置数据上报成功
                for (PreventCJReportRiskAnaUnit CJRiskAnaUnit : CJRiskAnaUnits) {
                    HandlerCJReportParam handlerCJReportParam = new HandlerCJReportParam();
                    //封装数据
                    handlerCJReportParam.setId(CJRiskAnaUnit.getId());
                    handlerCJReportParam.setReportStatus(SyncEnum.SYNC_EXEC_SUCCESS.getCode());
                    handlerCJReportParam.setReportTime(date);
                    CJRiskAnaUnitService.updateCJReportStatusById(handlerCJReportParam);
                }
                //遍历失败数据，设置数据上报失败
                for (String failId : errorIdList) {
                    //上报失败
                    HandlerCJReportParam handlerCJReportParam = new HandlerCJReportParam();
                    //封装数据
                    handlerCJReportParam.setId(failId);
                    handlerCJReportParam.setReportStatus(SyncEnum.SYNC_EXEC_FAIL.getCode());
                    handlerCJReportParam.setReportTime(date);
                    CJRiskAnaUnitService.updateCJReportStatusById(handlerCJReportParam);
                }
            }
            else if (CJUnitResult.getCode().equals(CJReportEnum.FAIL.getCode())){
                logger.info("【#】RiskAnaUnit所有数据全部入库失败");
                for (String failId : errorIdList) {
                    //上报失败
                    HandlerCJReportParam handlerCJReportParam = new HandlerCJReportParam();
                    //封装数据
                    handlerCJReportParam.setId(failId);
                    handlerCJReportParam.setReportStatus(SyncEnum.SYNC_EXEC_FAIL.getCode());
                    handlerCJReportParam.setReportTime(date);
                    CJRiskAnaUnitService.updateCJReportStatusById(handlerCJReportParam);
                }
            }
            logger.info("【1】安全风险分析单元-数据处理完成");
        }else {
            logger.info("【1】风险分析单元-无数据上报昌吉州");
        }


        /**
         * 2、处理安全风险事件数据
         * */
        logger.info("【2】安全风险事件-处理数据...");
        List<PreventCJReportRiskEvent> CJEvents = CJEventService.listReportEventDate();
        if (ObjectUtils.isNotEmpty(CJEvents)){
            //封装上报数据
            List<CJReportRiskEventDTO> eventList = new ArrayList<>();

            for (PreventCJReportRiskEvent cjEvent : CJEvents) {
                CJReportRiskEventDTO CJReportRiskEvent = BeanCopyUtils.copyBean(cjEvent, CJReportRiskEventDTO.class);
                CJReportRiskEvent.setCreateDate(dateFormat.format(cjEvent.getCreateDate()));
                CJReportRiskEvent.setUpdateDate(dateFormat.format(cjEvent.getUpdateDate()));
                eventList.add(CJReportRiskEvent);
            }
            logger.info("【【风险事件原始数据】】" + JSONObject.toJSONString(eventList));
            //加密数据
            String AESReportUnitDate = encrypt(JSONObject.toJSONString(eventList), key.getBytes(), iv.getBytes());

            StringBuffer eventResultBuffer = null;
            //上报数据
            try {
                URL url = new URL("http://120.71.182.198:9999/v1/data/receive/eventMsg");
                //得到连接对象
                con = (HttpURLConnection) url.openConnection();
                //设置请求类型
                con.setRequestMethod("POST");
                //设置Content-Type，此处根据实际情况确定
                con.setRequestProperty("Content-Type", "application/json;charset=UTF-8");
                //允许写出
                con.setDoOutput(true);
                //允许读入
                con.setDoInput(true);
                //不使用缓存
                con.setUseCaches(false);
                //设置请求头
                con.setRequestProperty("X-Access-Token",token+formatDate.toString());
                con.setInstanceFollowRedirects(true);
                OutputStream os = con.getOutputStream();
                Map paraMap = new HashMap();
                paraMap.put("data", AESReportUnitDate); /**封装数据*/
                //组装入参，设置请求体
                os.write(JSON.toJSONString(paraMap).getBytes());
                //得到响应码
                responseCode = con.getResponseCode();
                //确认响应流不为空
                if (responseCode == HttpURLConnection.HTTP_OK) {
                    //得到响应流
                    InputStream inputStream = con.getInputStream();
                    //将响应流转换成字符串
                    eventResultBuffer = new StringBuffer();
                    String line;
                    buffer = new BufferedReader(new InputStreamReader(inputStream, "UTF-8"));
                    while ((line = buffer.readLine()) != null) {
                        eventResultBuffer.append(line);
                    }
                    logger.info("result:" + eventResultBuffer.toString());
                }
            } catch (Exception e) {
                e.printStackTrace();
            }

            //接收返回值，保存返回值
            CJReportResultData CJEventResult = JSONObject.parseObject(eventResultBuffer.toString(), CJReportResultData.class);

            //接收返回值，保存返回值
            List<String> errorIdList= new ArrayList<>();
            Data data = JSONObject.parseObject(CJEventResult.getData(), Data.class);
            if (ObjectUtils.isNotEmpty(data)){
                for (ErrorMsgDetails errorMsgDetail : data.getErrorMsgDetails()) {
                    errorIdList.add(errorMsgDetail.getId());
                }
            }
            if (CJEventResult.getCode().equals(CJReportEnum.SUCCESS.getCode())){
                logger.info("【#】Event所有数据全部入库成功");
                for (PreventCJReportRiskEvent CJEvent : CJEvents) {
                    HandlerCJReportParam handlerCJReportParam = new HandlerCJReportParam();
                    //封装数据
                    handlerCJReportParam.setId(CJEvent.getId());
                    handlerCJReportParam.setReportStatus(SyncEnum.SYNC_EXEC_SUCCESS.getCode());
                    handlerCJReportParam.setReportTime(date);
                    CJEventService.updateCJReportStatusById(handlerCJReportParam);
                }
            }else if (CJEventResult.getCode().equals(CJReportEnum.SUCESS_AND_FAIL.getCode())){
                logger.info("【#】Event部分数据上传失败原因" + CJEventResult.getErrorMsg());
                //遍历数据，上报数据设置为成功状态
                for (PreventCJReportRiskEvent CJEvent : CJEvents) {
                    HandlerCJReportParam handlerCJReportParam = new HandlerCJReportParam();
                    //封装数据
                    handlerCJReportParam.setId(CJEvent.getId());
                    handlerCJReportParam.setReportStatus(SyncEnum.SYNC_EXEC_SUCCESS.getCode());
                    handlerCJReportParam.setReportTime(date);
                    CJEventService.updateCJReportStatusById(handlerCJReportParam);
                }
                //遍历失败数据，设置为失败状态
                for (String failId : errorIdList) {
                    //上报失败
                    HandlerCJReportParam handlerCJReportParam = new HandlerCJReportParam();
                    //封装数据
                    handlerCJReportParam.setId(failId);
                    handlerCJReportParam.setReportStatus(SyncEnum.SYNC_EXEC_FAIL.getCode());
                    handlerCJReportParam.setReportTime(date);
                    CJEventService.updateCJReportStatusById(handlerCJReportParam);
                }
            } else if (CJEventResult.getCode().equals(CJReportEnum.FAIL.getCode())){
                logger.info("【#】Event所有数据全部入库失败");
                for (String failId : errorIdList) {
                    //上报失败
                    HandlerCJReportParam handlerCJReportParam = new HandlerCJReportParam();
                    //封装数据
                    handlerCJReportParam.setId(failId);
                    handlerCJReportParam.setReportStatus(SyncEnum.SYNC_EXEC_FAIL.getCode());
                    handlerCJReportParam.setReportTime(date);
                    CJEventService.updateCJReportStatusById(handlerCJReportParam);
                }
            }
            logger.info("【2】安全风险事件-数据处理完成");
        }else {
            logger.info("【2】风险事件-无数据上报昌吉州");
        }


        /**
         * 3、处理风险管控措施数据
         * */
        logger.info("【3】风险管控措施-处理数据...");
        List<PreventCJReportRiskControlMeasure> CJMeasures = CJMeasureService.listReportMeasureDate();
        //封装上报数据
        List<CJReportRiskControlMeasureDTO> reportMeasureList = new ArrayList<>();
        if (ObjectUtils.isNotEmpty(CJMeasures)){
            for (PreventCJReportRiskControlMeasure cjMeasure : CJMeasures) {
                CJReportRiskControlMeasureDTO cjReportRiskControlMeasureDTO = BeanCopyUtils.copyBean(cjMeasure, CJReportRiskControlMeasureDTO.class);
                cjReportRiskControlMeasureDTO.setCreateDate(dateFormat.format(cjMeasure.getCreateDate()));
                cjReportRiskControlMeasureDTO.setUpdateDate(dateFormat.format(cjMeasure.getUpdateDate()));
                reportMeasureList.add(cjReportRiskControlMeasureDTO);
            }
            //数据上报
            String AESReportMeasure = encrypt(JSONObject.toJSONString(reportMeasureList), key.getBytes(), iv.getBytes());

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

            StringBuffer measureResultBuffer = null;
            //上报数据
            try {
                URL url = new URL("http://120.71.182.198:9999/v1/data/receive/controlMeasuresMsg");
                //得到连接对象
                con = (HttpURLConnection) url.openConnection();
                //设置请求类型
                con.setRequestMethod("POST");
                //设置Content-Type，此处根据实际情况确定
                con.setRequestProperty("Content-Type", "application/json;charset=UTF-8");
                //允许写出
                con.setDoOutput(true);
                //允许读入
                con.setDoInput(true);
                //不使用缓存
                con.setUseCaches(false);
                //设置请求头
                con.setRequestProperty("X-Access-Token",token+formatDate.toString());
                OutputStream os = con.getOutputStream();
                Map paraMap = new HashMap();
                paraMap.put("data", AESReportMeasure); /**封装数据*/
                //组装入参，设置请求体
                os.write(JSON.toJSONString(paraMap).getBytes());
                //得到响应码
                responseCode = con.getResponseCode();
                //本段日志，测试成功后，可注释掉
                if (responseCode == HttpURLConnection.HTTP_OK) {
                    //得到响应流
                    InputStream inputStream = con.getInputStream();
                    //将响应流转换成字符串
                    measureResultBuffer = new StringBuffer();
                    String line;
                    buffer = new BufferedReader(new InputStreamReader(inputStream, "UTF-8"));
                    while ((line = buffer.readLine()) != null) {
                        measureResultBuffer.append(line);
                    }
                    logger.info("result:" + measureResultBuffer.toString());
                }
            } catch (Exception e) {
                e.printStackTrace();
            }

            //接收返回值，保存返回值
            CJReportResultData CJMeasureResult = JSONObject.parseObject(measureResultBuffer.toString(), CJReportResultData.class);
            //接收返回值，保存返回值
            List<String> errorIdList= new ArrayList<>();
            Data data = JSONObject.parseObject(CJMeasureResult.getData(), Data.class);
            //保存失败结果
            if (ObjectUtils.isNotEmpty(data)){
                for (ErrorMsgDetails errorMsgDetail : data.getErrorMsgDetails()) {
                    errorIdList.add(errorMsgDetail.getId());
                }
            }
            logger.info("【】管控措施-数据上报结果：" + CJMeasureResult.getCode());
            //设置所有数据上报成功
            if (CJMeasureResult.getCode().equals(CJReportEnum.SUCCESS.getCode()) || CJMeasureResult.getCode().equals(CJReportEnum.SUCESS_AND_FAIL.getCode())){
                for (PreventCJReportRiskControlMeasure CJMeasure : CJMeasures) {
                    HandlerCJReportParam handlerCJReportParam = new HandlerCJReportParam();
                    //封装数据
                    handlerCJReportParam.setId(CJMeasure.getId());
                    handlerCJReportParam.setReportStatus(SyncEnum.SYNC_EXEC_SUCCESS.getCode());
                    handlerCJReportParam.setReportTime(date);
                    CJMeasureService.updateCJReportStatusById(handlerCJReportParam);
                }
            }
            //设置上报失败的数据，上报失败
            if (CJMeasureResult.getCode().equals(CJReportEnum.FAIL.getCode()) || CJMeasureResult.getCode().equals(CJReportEnum.SUCESS_AND_FAIL.getCode())){
                for (String failId : errorIdList) {
                    //上报失败
                    HandlerCJReportParam handlerCJReportParam = new HandlerCJReportParam();
                    //封装数据
                    handlerCJReportParam.setId(failId);
                    handlerCJReportParam.setReportStatus(SyncEnum.SYNC_EXEC_FAIL.getCode());
                    handlerCJReportParam.setReportTime(date);
                    CJMeasureService.updateCJReportStatusById(handlerCJReportParam);
                }
            }
            logger.info("【3】风险管控措施-数据处理完成");
        }else {
            logger.info("【3】风险管控措施-无数据上报昌吉州");
        }


        /**
         * 4、处理 任务-配置 数据
         * */
        logger.info("【4】任务-处理数据...");
        List<PreventCJReportCheckTaskFromWork> CJTaskFromWorks = CJTaskFromWorkService.listReportTaskFromWorkDate();
        if(ObjectUtils.isNotEmpty(CJTaskFromWorks)){
            //封装上报数据
            List<CJReportCheckTaskFromWorkDTO> reportCheckTaskFromWorkList = new ArrayList<>();
            for (PreventCJReportCheckTaskFromWork cjTaskFromWork : CJTaskFromWorks) {
                CJReportCheckTaskFromWorkDTO cjReportCheckTaskFromWorkDTO = BeanCopyUtils.copyBean(cjTaskFromWork, CJReportCheckTaskFromWorkDTO.class);
                cjReportCheckTaskFromWorkDTO.setCreateDate(dateFormat.format(cjTaskFromWork.getCreateDate()));
                cjReportCheckTaskFromWorkDTO.setUpdateDate(dateFormat.format(cjTaskFromWork.getUpdateDate()));
                cjReportCheckTaskFromWorkDTO.setTaskStartTime(dateFormat.format(cjTaskFromWork.getCreateDate()));
                reportCheckTaskFromWorkList.add(cjReportCheckTaskFromWorkDTO);
            }
            System.out.println(Arrays.toString(reportCheckTaskFromWorkList.toArray()));
            //数据上报
            String AESReportTaskFromWork = encrypt(JSONObject.toJSONString(reportCheckTaskFromWorkList), key.getBytes(), iv.getBytes());
            StringBuffer taskFromWorkResultBuffer = null;
            //上报数据
            try {
                URL url = new URL("http://120.71.182.198:9999/v1/data/receive/measuresTaskMsg");
                //得到连接对象
                con = (HttpURLConnection) url.openConnection();
                //设置请求类型
                con.setRequestMethod("POST");
                //设置Content-Type，此处根据实际情况确定
                con.setRequestProperty("Content-Type", "application/json;charset=UTF-8");
                //允许写出
                con.setDoOutput(true);
                //允许读入
                con.setDoInput(true);
                //不使用缓存
                con.setUseCaches(false);
                //设置请求头
                con.setRequestProperty("X-Access-Token",token+formatDate.toString());
                OutputStream os = con.getOutputStream();
                Map paraMap = new HashMap();
                paraMap.put("data", AESReportTaskFromWork);
                //组装入参，设置请求体
                os.write(JSON.toJSONString(paraMap).getBytes());
                //得到响应码
                responseCode = con.getResponseCode();
                //本段日志，测试成功后，可注释掉
                if (responseCode == HttpURLConnection.HTTP_OK) {
                    //得到响应流
                    InputStream inputStream = con.getInputStream();
                    //将响应流转换成字符串
                    taskFromWorkResultBuffer = new StringBuffer();
                    String line;
                    buffer = new BufferedReader(new InputStreamReader(inputStream, "UTF-8"));
                    while ((line = buffer.readLine()) != null) {
                        taskFromWorkResultBuffer.append(line);
                    }
                    logger.info("result:" + taskFromWorkResultBuffer.toString());
                }
            } catch (Exception e) {
                e.printStackTrace();
            }

            //接收返回值，保存返回值
            CJReportResultData CJTaskFromWorkResult = JSONObject.parseObject(taskFromWorkResultBuffer.toString(), CJReportResultData.class);
            //接收返回值，保存返回值
            List<String> errorIdList= new ArrayList<>();
            Data data = JSONObject.parseObject(CJTaskFromWorkResult.getData(), Data.class);
            //保存失败结果
            if (ObjectUtils.isNotEmpty(data)){
                for (ErrorMsgDetails errorMsgDetail : data.getErrorMsgDetails()) {
                    errorIdList.add(errorMsgDetail.getId());
                }
            }
            logger.info("【】任务：数据上报结果：" + CJTaskFromWorkResult.getCode());
            //设置所有数据上报成功
            if (CJTaskFromWorkResult.getCode().equals(CJReportEnum.SUCCESS.getCode()) || CJTaskFromWorkResult.getCode().equals(CJReportEnum.SUCESS_AND_FAIL.getCode())){
                for (PreventCJReportCheckTaskFromWork CJTaskFromWork : CJTaskFromWorks) {
                    HandlerCJReportParam handlerCJReportParam = new HandlerCJReportParam();
                    //封装数据
                    handlerCJReportParam.setId(CJTaskFromWork.getId());
                    handlerCJReportParam.setReportStatus(SyncEnum.SYNC_EXEC_SUCCESS.getCode());
                    handlerCJReportParam.setReportTime(date);
                    CJTaskFromWorkService.updateCJReportStatusById(handlerCJReportParam);
                }
            }
            //设置上报失败的数据，上报失败
            if (CJTaskFromWorkResult.getCode().equals(CJReportEnum.FAIL.getCode()) || CJTaskFromWorkResult.getCode().equals(CJReportEnum.SUCESS_AND_FAIL.getCode())){
                for (String failId : errorIdList) {
                    //上报失败
                    HandlerCJReportParam handlerCJReportParam = new HandlerCJReportParam();
                    //封装数据
                    handlerCJReportParam.setId(failId);
                    handlerCJReportParam.setReportStatus(SyncEnum.SYNC_EXEC_FAIL.getCode());
                    handlerCJReportParam.setReportTime(date);
                    CJTaskFromWorkService.updateCJReportStatusById(handlerCJReportParam);
                }
            }
            logger.info("【4】任务-数据处理完成");
        }else {
            logger.info("【4】任务-无数据上报昌吉州");
        }

        /**
         * 5、处理 任务-记录 数据
         * */
        logger.info("【5】任务记录-处理数据...");
        List<PreventCJReportCheckRecordFromTask> CJRecordFromTasks = CJTaskRecordService.listReportTaskRecordDate();
        if (ObjectUtils.isNotEmpty(CJRecordFromTasks)){
            //封装上报数据
            List<CJReportCheckRecordFromTaskDTO> reportRecordFromTaskList = new ArrayList<>();
            for (PreventCJReportCheckRecordFromTask cjRecordFromTask : CJRecordFromTasks) {
                CJReportCheckRecordFromTaskDTO cjReportCheckRecordFromTaskDTO = BeanCopyUtils.copyBean(cjRecordFromTask, CJReportCheckRecordFromTaskDTO.class);
//                cjReportCheckRecordFromTaskDTO.setCreateDate(dateFormat.format(cjRecordFromTask.getCreateDate()));
//                cjReportCheckRecordFromTaskDTO.setUpdateDate(dateFormat.format(cjRecordFromTask.getUpdateDate()));
                cjReportCheckRecordFromTaskDTO.setCheckTime(dateFormat.format(cjRecordFromTask.getCheckTime()));
                cjReportCheckRecordFromTaskDTO.setMobileMe(cjRecordFromTask.getMobileCode());
                cjReportCheckRecordFromTaskDTO.setIsDefend(cjRecordFromTask.getDefend());
                reportRecordFromTaskList.add(cjReportCheckRecordFromTaskDTO);
            }
//            System.out.println(Arrays.toString(reportRecordFromTaskList.toArray()));
            //数据加密
            String AESReportRecordFromTask = encrypt(JSONObject.toJSONString(reportRecordFromTaskList), key.getBytes(), iv.getBytes());
            logger.info("【test】数据加密完成,开始上报数据");

            StringBuffer recordFromTaskResultBuffer = null;
            //上报数据
            try {
               // URL url = new URL("http://120.71.182.198:9999/v1/data/receive/measuresTaskRecordMsg");
                URL url = new URL("https://cjzjg.gtaq.com.cn:7004/v1/data/receive/measuresTaskRecordMsg");  //备用地址
                //得到连接对象
                con = (HttpURLConnection) url.openConnection();
                //设置请求类型
                con.setRequestMethod("POST");
                //设置Content-Type，此处根据实际情况确定
                con.setRequestProperty("Content-Type", "application/json;charset=UTF-8");
            //    con.setRequestProperty(HTTP.CONN_DIRECTIVE,HTTP.CONN_CLOSE);
                con.setConnectTimeout(600000);
                con.setReadTimeout(600000);

                //允许写出
                con.setDoOutput(true);
                //允许读入
                con.setDoInput(true);
                //不使用缓存
                con.setUseCaches(false);
                //设置请求头
                con.setRequestProperty("X-Access-Token",token+tokenDate.format(new Date()).toString());
                OutputStream os = con.getOutputStream();
                Map paraMap = new HashMap();
                paraMap.put("data", AESReportRecordFromTask);/**封装数据*/
                //组装入参，设置请求体
                os.write(JSON.toJSONString(paraMap).getBytes());
                //得到响应码
                responseCode = con.getResponseCode();
                //本段日志，测试成功后，可注释掉
                if (responseCode == HttpURLConnection.HTTP_OK) {
                    //得到响应流
                    InputStream inputStream = con.getInputStream();
                    //将响应流转换成字符串
                    recordFromTaskResultBuffer = new StringBuffer();
                    String line;
                    buffer = new BufferedReader(new InputStreamReader(inputStream, "UTF-8"));
                    while ((line = buffer.readLine()) != null) {
                        recordFromTaskResultBuffer.append(line);
                    }
                    logger.info("result:" + recordFromTaskResultBuffer.toString());
                }else {
                    logger.info("Http结果:" + responseCode);
                }
            } catch (Exception e) {
                e.printStackTrace();
            }

            logger.info("【test】接收返回值");
            CJReportResultData CJRecordFromTaskResult = new CJReportResultData();
            try {
                CJRecordFromTaskResult =  JSONObject.parseObject(recordFromTaskResultBuffer.toString(), CJReportResultData.class);
                if (ObjectUtils.isEmpty(CJRecordFromTaskResult)){
                    throw new RuntimeException("返回值为空");
                }
            }catch (Exception e){
                e.printStackTrace();
                logger.info("【test】接收返回值异常");
            }

            //接收返回值，保存返回值
//            CJReportResultData CJRecordFromTaskResult = JSONObject.parseObject(recordFromTaskResultBuffer.toString(), CJReportResultData.class);
            //接收返回值，保存返回值
            logger.info("【test】保存上报结果");
            List<String> errorIdList= new ArrayList<>();
            Data data = JSONObject.parseObject(CJRecordFromTaskResult.getData(), Data.class);
            //保存失败结果
            if (ObjectUtils.isNotEmpty(data)){
                for (ErrorMsgDetails errorMsgDetail : data.getErrorMsgDetails()) {
                    errorIdList.add(errorMsgDetail.getId());
                }
            }
            logger.info("【】CJRecordFromTask数据上报结果：" + CJRecordFromTaskResult.getCode());
            //设置所有数据上报成功
            if (CJRecordFromTaskResult.getCode().equals(CJReportEnum.SUCCESS.getCode()) || CJRecordFromTaskResult.getCode().equals(CJReportEnum.SUCESS_AND_FAIL.getCode())){
                for (PreventCJReportCheckRecordFromTask CJRecordFromTask : CJRecordFromTasks) {
                    HandlerCJReportParam handlerCJReportParam = new HandlerCJReportParam();
                    //封装数据
                    handlerCJReportParam.setId(CJRecordFromTask.getId());
                    handlerCJReportParam.setReportStatus(SyncEnum.SYNC_EXEC_SUCCESS.getCode());
                    handlerCJReportParam.setReportTime(date);
                    CJTaskRecordService.updateCJReportStatusById(handlerCJReportParam);
                }
            }
            //设置上报失败的数据，上报失败
            if (CJRecordFromTaskResult.getCode().equals(CJReportEnum.FAIL.getCode()) || CJRecordFromTaskResult.getCode().equals(CJReportEnum.SUCESS_AND_FAIL.getCode())){
                for (String failId : errorIdList) {
                    //上报失败
                    HandlerCJReportParam handlerCJReportParam = new HandlerCJReportParam();
                    //封装数据
                    handlerCJReportParam.setId(failId);
                    handlerCJReportParam.setReportStatus(SyncEnum.SYNC_EXEC_FAIL.getCode());
                    handlerCJReportParam.setReportTime(date);
                    CJTaskRecordService.updateCJReportStatusById(handlerCJReportParam);
                }
            }
            logger.info("【5】任务记录-数据处理完成");
        }else {
            logger.info("【5】任务记录-无数据上报昌吉州");
        }

        /**
         * 6、处理隐患信息数据
         * */
        logger.info("【6】隐患信息-处理数据...");
        List<PreventCJReportDangerInfo> CJDangerInfos = CJDangerInfoService.listReportDangerDate();
       if (ObjectUtils.isNotEmpty(CJDangerInfos)){
           //封装上报数据
           List<CJReportDangerInfoDTO> reportDangerInfoLists = new ArrayList<>();
           for (PreventCJReportDangerInfo cjDangerInfo : CJDangerInfos) {
               CJReportDangerInfoDTO cjReportDangerInfoDTO = BeanCopyUtils.copyBean(cjDangerInfo, CJReportDangerInfoDTO.class);
               cjReportDangerInfoDTO.setCreateDate(dateFormat.format(cjDangerInfo.getCreateDate()));
               cjReportDangerInfoDTO.setUpdateDate(dateFormat.format(cjDangerInfo.getUpdateDate()));
               if (ObjectUtils.isNotEmpty(cjDangerInfo.getCheckAcceptTime())){
                   cjReportDangerInfoDTO.setCheckAcceptTime(dateFormat.format(cjDangerInfo.getCheckAcceptTime()));
               }else {
                   cjReportDangerInfoDTO.setCheckAcceptTime(null);
               }
               cjReportDangerInfoDTO.setRegistTime(dateFormat.format(cjDangerInfo.getRegistTime()));
               cjReportDangerInfoDTO.setDangerManageDeadline(dateFormat.format(cjDangerInfo.getDangerManageDeadline()));
               reportDangerInfoLists.add(cjReportDangerInfoDTO);
           }
           //数据上报
           logger.info("【原始数据】" + JSONObject.toJSONString(reportDangerInfoLists));
           String AESReportDangerInfo = encrypt(JSONObject.toJSONString(reportDangerInfoLists), key.getBytes(), iv.getBytes());
           StringBuffer dangerInfoResultBuffer = null;
           //上报数据
           try {
               URL url = new URL("http://120.71.182.198:9999/v1/data/receive/dangerInvestigationMsg");
               //得到连接对象
               con = (HttpURLConnection) url.openConnection();
               //设置请求类型
               con.setRequestMethod("POST");
               //设置Content-Type，此处根据实际情况确定
               con.setRequestProperty("Content-Type", "application/json;charset=UTF-8");
               //允许写出
               con.setDoOutput(true);
               //允许读入
               con.setDoInput(true);
               //不使用缓存
               con.setUseCaches(false);
               //设置请求头
               con.setRequestProperty("X-Access-Token",token + formatDate.toString());
               OutputStream os = con.getOutputStream();
               Map paraMap = new HashMap();
               paraMap.put("data", AESReportDangerInfo);/**封装数据*/
               //组装入参，设置请求体
               os.write(JSON.toJSONString(paraMap).getBytes());
               //得到响应码
               responseCode = con.getResponseCode();
               //本段日志，测试成功后，可注释掉
               if (responseCode == HttpURLConnection.HTTP_OK) {
                   //得到响应流
                   InputStream inputStream = con.getInputStream();
                   //将响应流转换成字符串
                   dangerInfoResultBuffer = new StringBuffer();
                   String line;
                   buffer = new BufferedReader(new InputStreamReader(inputStream, "UTF-8"));
                   while ((line = buffer.readLine()) != null) {
                       dangerInfoResultBuffer.append(line);
                   }
                   logger.info("result:" + dangerInfoResultBuffer.toString());
               }
           } catch (Exception e) {
               e.printStackTrace();
           }

           //接收返回值，保存返回值
           CJReportResultData CJDangerInfoResult = JSONObject.parseObject(dangerInfoResultBuffer.toString(), CJReportResultData.class);
           //接收返回值，保存返回值
           List<String> errorIdList= new ArrayList<>();
           Data data = JSONObject.parseObject(CJDangerInfoResult.getData(), Data.class);
           //保存失败结果
           if (ObjectUtils.isNotEmpty(data)){
               for (ErrorMsgDetails errorMsgDetail : data.getErrorMsgDetails()) {
                   errorIdList.add(errorMsgDetail.getId());
               }
           }
           logger.info("【】CJDangerInfo数据上报结果：" + CJDangerInfoResult.getCode());
           //设置所有数据上报成功
           if (CJDangerInfoResult.getCode().equals(CJReportEnum.SUCCESS.getCode()) || CJDangerInfoResult.getCode().equals(CJReportEnum.SUCESS_AND_FAIL.getCode())){
               for (PreventCJReportDangerInfo CJDangerInfo : CJDangerInfos) {
                   HandlerCJReportParam handlerCJReportParam = new HandlerCJReportParam();
                   //封装数据
                   handlerCJReportParam.setId(CJDangerInfo.getId());
                   handlerCJReportParam.setReportStatus(SyncEnum.SYNC_EXEC_SUCCESS.getCode());
                   handlerCJReportParam.setReportTime(date);
                   CJDangerInfoService.updateCJReportStatusById(handlerCJReportParam);
               }
           }
           //设置上报失败的数据，上报失败
           if (CJDangerInfoResult.getCode().equals(CJReportEnum.FAIL.getCode()) || CJDangerInfoResult.getCode().equals(CJReportEnum.SUCESS_AND_FAIL.getCode())){
               for (String failId : errorIdList) {
                   //上报失败
                   HandlerCJReportParam handlerCJReportParam = new HandlerCJReportParam();
                   //封装数据
                   handlerCJReportParam.setId(failId);
                   handlerCJReportParam.setReportStatus(SyncEnum.SYNC_EXEC_FAIL.getCode());
                   handlerCJReportParam.setReportTime(date);
                   CJDangerInfoService.updateCJReportStatusById(handlerCJReportParam);
               }
           }
           logger.info("【6】隐患信息-数据处理完成");
       }else {
           logger.info("【6】隐患信息-无数据上报昌吉州");
       }


        /**
         * 7、检修停用记录信息数据
         * */
        logger.info("【7】检修停用记录-处理数据...");
        List<PreventCJReportOverhaulLog> CJOverhaulLogs = CJOverhaulLogService.listReportOverhaulDate();
        if (ObjectUtils.isNotEmpty(CJOverhaulLogs)){
            //封装上报数据
            List<CJReportOverhaulLogDTO> reportOverhaulLogDTOS = new ArrayList<>();
            for (PreventCJReportOverhaulLog cjOverhaulLog : CJOverhaulLogs) {
                CJReportOverhaulLogDTO cjReportOverhaulLogDTO = BeanCopyUtils.copyBean(cjOverhaulLog, CJReportOverhaulLogDTO.class);

                cjReportOverhaulLogDTO.setCreateDate(dateFormat.format(cjOverhaulLog.getCreateDate()));
                cjReportOverhaulLogDTO.setUpdateDate(dateFormat.format(cjOverhaulLog.getUpdateDate()));
                cjReportOverhaulLogDTO.setStopStartTime(dateFormat.format(cjOverhaulLog.getStopStartTime()));
                if (ObjectUtils.isNotEmpty(cjOverhaulLog.getStopEndTime())){
                    cjReportOverhaulLogDTO.setStopEndTime(dateFormat.format(cjOverhaulLog.getStopEndTime()));
                }else {
                    cjReportOverhaulLogDTO.setStopEndTime(null);
                }
                reportOverhaulLogDTOS.add(cjReportOverhaulLogDTO);
            }

            //数据上报
            logger.info("【原始数据】" + JSONObject.toJSONString(reportOverhaulLogDTOS));
            String AESReportDangerInfo = encrypt(JSONObject.toJSONString(reportOverhaulLogDTOS), key.getBytes(), iv.getBytes());
            StringBuffer dangerInfoResultBuffer = null;
            //上报数据
            try {
                URL url = new URL("http://v1/data/receive/receiveUnitStop");
                //得到连接对象
                con = (HttpURLConnection) url.openConnection();
                //设置请求类型
                con.setRequestMethod("POST");
                //设置Content-Type，此处根据实际情况确定
                con.setRequestProperty("Content-Type", "application/json;charset=UTF-8");
                //允许写出
                con.setDoOutput(true);
                //允许读入
                con.setDoInput(true);
                //不使用缓存
                con.setUseCaches(false);
                //设置请求头
                con.setRequestProperty("X-Access-Token",token + formatDate.toString());
                OutputStream os = con.getOutputStream();
                Map paraMap = new HashMap();
                paraMap.put("data", AESReportDangerInfo);/**封装数据*/
                //组装入参，设置请求体
                os.write(JSON.toJSONString(paraMap).getBytes());
                //得到响应码
                responseCode = con.getResponseCode();
                //本段日志，测试成功后，可注释掉
                if (responseCode == HttpURLConnection.HTTP_OK) {
                    //得到响应流
                    InputStream inputStream = con.getInputStream();
                    //将响应流转换成字符串
                    dangerInfoResultBuffer = new StringBuffer();
                    String line;
                    buffer = new BufferedReader(new InputStreamReader(inputStream, "UTF-8"));
                    while ((line = buffer.readLine()) != null) {
                        dangerInfoResultBuffer.append(line);
                    }
                    logger.info("result:" + dangerInfoResultBuffer.toString());
                }
            } catch (Exception e) {
                e.printStackTrace();
            }

            //接收返回值，保存返回值
            CJReportResultData CJOverhaulLogResult = JSONObject.parseObject(dangerInfoResultBuffer.toString(), CJReportResultData.class);
            //接收返回值，保存返回值
            List<String> errorIdList= new ArrayList<>();
            Data data = JSONObject.parseObject(CJOverhaulLogResult.getData(), Data.class);
            //保存失败结果
            if (ObjectUtils.isNotEmpty(data)){
                for (ErrorMsgDetails errorMsgDetail : data.getErrorMsgDetails()) {
                    errorIdList.add(errorMsgDetail.getId());
                }
            }
            logger.info("【】CJOverhaulLog数据上报结果：" + CJOverhaulLogResult.getCode());
            //设置所有数据上报成功

            if (CJOverhaulLogResult.getCode().equals(CJReportEnum.SUCCESS.getCode()) || CJOverhaulLogResult.getCode().equals(CJReportEnum.SUCESS_AND_FAIL.getCode())){
                for (PreventCJReportOverhaulLog cjOverhaulLog : CJOverhaulLogs) {
                    HandlerCJReportParam handlerCJReportParam = new HandlerCJReportParam();
                    //封装数据
                    handlerCJReportParam.setId(cjOverhaulLog.getId());
                    handlerCJReportParam.setReportStatus(SyncEnum.SYNC_EXEC_SUCCESS.getCode());
                    handlerCJReportParam.setReportTime(date);
                    CJOverhaulLogService.updateCJReportStatusById(handlerCJReportParam);
                }
            }
            //设置上报失败的数据，上报失败
            if (CJOverhaulLogResult.getCode().equals(CJReportEnum.FAIL.getCode()) || CJOverhaulLogResult.getCode().equals(CJReportEnum.SUCESS_AND_FAIL.getCode())){
                for (String failId : errorIdList) {
                    //上报失败
                    HandlerCJReportParam handlerCJReportParam = new HandlerCJReportParam();
                    //封装数据
                    handlerCJReportParam.setId(failId);
                    handlerCJReportParam.setReportStatus(SyncEnum.SYNC_EXEC_FAIL.getCode());
                    handlerCJReportParam.setReportTime(date);
                    CJOverhaulLogService.updateCJReportStatusById(handlerCJReportParam);
                }
            }
            logger.info("【7】检修停用记录-数据处理完成");
        }else {
            logger.info("【7】检修停用记录-无数据上报昌吉州");
        }

    }
}

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

@@ -1,267 +1,267 @@
package com.ruoyi.doublePrevention.scheduls;





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

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

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

import com.ruoyi.doublePrevention.entity.*;

import com.ruoyi.doublePrevention.enums.E;

import com.ruoyi.doublePrevention.enums.SyncEnum;

import com.ruoyi.doublePrevention.exception.AusinessException;

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

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

import com.ruoyi.project.system.dept.service.IDeptService;

import com.ruoyi.project.system.user.domain.User;

import com.ruoyi.project.system.user.service.IUserService;

import com.ruoyi.project.tr.HiddenDangerCheckJob.domain.HiddenDangerCheckJob;

import com.ruoyi.project.tr.HiddenDangerCheckJob.service.IHiddenDangerCheckJobService;

import com.ruoyi.project.tr.hiddenDangerCheck.domain.HiddenDangerCheck;

import com.ruoyi.project.tr.hiddenDangerCheck.service.IHiddenDangerCheckService;

import com.ruoyi.project.tr.hiddenDangerCheckPoint.domain.HiddenDangerCheckPoint;

import com.ruoyi.project.tr.hiddenDangerCheckPoint.service.IHiddenDangerCheckPointService;

import com.ruoyi.project.tr.riskList.service.IRiskListService;

import org.apache.commons.lang3.ObjectUtils;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;

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

import org.springframework.scheduling.annotation.Scheduled;

import org.springframework.stereotype.Component;

import org.springframework.transaction.annotation.Transactional;



import java.text.SimpleDateFormat;

import java.util.ArrayList;

import java.util.Date;

import java.util.List;

import java.util.UUID;



@Component

public class RectifyDateSchedule {



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



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

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



    public static SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");



    @Autowired

    private PreventReportConfigService preventReportConfigService;



    @Autowired

    private PreventCJReportRiskAnaUnitService CJRiskAnaUnitService;

    @Autowired

    private PreventCJReportRiskEventService CJEventService;

    @Autowired

    private PreventCJReportRiskControlMeasureService CJMeasureService;

    @Autowired

    private PreventCJReportCheckTaskFromWorkService CJTaskFromWorkService;

    @Autowired

    private PreventCJReportCheckRecordFromTaskService CJTaskRecordService;

    @Autowired

    private PreventCJReportDangerInfoService CJDangerInfoService;

    @Autowired

    private PreventCJReportPointService CJPointService;





    @Autowired

    private IDeptService trDeptService; //部门服务

    @Autowired

    private IUserService trUserService; //用户服务



    @Autowired

    private IRiskListService trRiskAnaUnitService; //风险设备、分析单元

    @Autowired

    private PreventRiskUnitUuidService preventRiskUnitUuidService; //风险设备、分析单元附属表



    @Autowired

    private PreventRiskEventService preventRiskEventService;

    @Autowired

    private PreventRiskControlMeasureService preventRiskControlMeasureService;

    @Autowired

    private PreventRiskControlTemplateService preventRiskControlTemplateService;



    @Autowired

    private IHiddenDangerCheckJobService trHiddenDangerCheckJobService;//排查任务job

    @Autowired

    private PreventRiskJobAndMeasureService preventRiskJobAndMeasureService;//排查任务附属表



    @Autowired

    private IHiddenDangerCheckService trHiddenDangerCheckService;//排查任务记录

    @Autowired

    private PreventRiskDangerCheckLogService preventRiskDangerCheckLogService;//排查任务记录附属表



    @Autowired

    private IHiddenDangerCheckPointService trHiddenDangerCheckPointService;//隐患信息上报、整改、验收

    @Autowired

    private PreventRiskDangerInfoService preventRiskDangerInfoService;//隐患信息附属表



    @Autowired

    private PreventRiskCheckUnitService preventRiskCheckUnitService;//管控措施，任务清单对应关系。基础排查点附属表

    @Autowired

    private PreventRiskDangerCheckAndMeasureService riskDangerCheckAndMeasureService;//管控措施，任务清单对应关系。基础排查点附属表



    @Autowired

    private PreventTaskTypeService taskTypeService;//管控措施，任务清单对应关系。基础排查点附属表



    @Autowired

    private PreventOverhaulLogService overhaulLogService;

    @Autowired

    private PreventCJReportOverhaulLogService reportOverhaulLogService;





    @Transactional

//    @Scheduled(cron = "0/10 * * * * ?")  // 30秒

    @Scheduled(cron = "0 0 0/3 * * ? ")

    public void searchReportDate(){



        logger.info("【双重预防】纠正...");

        int step = 1;

        String companyCode = "652310082";





        /**

         * 5、排查任务记录数据  PreventReportCheckRecordFromTask

         * */

        //读取安全风险管控措施数据上报主配置信息

        PreventReportConfig recordReportConfig = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG__CHECK_RECORD.getCode());

        //如果安全风险管控措施主配置开启上报

        if (recordReportConfig.getReportState().equals(SyncEnum.REPORT_ON.getCode())){





            //查询所有 选择上报的数据 && (reportTime == null 或者 reportTime < updateReportDataTime）

            List<PreventRiskDangerCheckLog> tasks = preventRiskDangerCheckLogService.listRectifyReportTask();

            List<Long> taskIds = new ArrayList<>();

            //获取上报数据对象

            List<PreventCJReportCheckRecordFromTask> CJRecordFromTaskLists = new ArrayList<>();

            int tag = 0;

//            HandlerReportParam handlerReportParam = new HandlerReportParam();

//            List<HandlerReportParam> handlerReportParamList = new ArrayList<>();

            if (ObjectUtils.isNotEmpty(tasks)){

                //获取信息

                List<User> allUserList = trUserService.getAllUser();

                List<PreventTaskType> allTaskTypeList = taskTypeService.getAllTaskTypeList();

                //遍历，封装数据

                for (PreventRiskDangerCheckLog task : tasks) {

                    //获取任务记录主表信息

                    HiddenDangerCheck hiddenDangerCheckById = trHiddenDangerCheckService.getHiddenDangerCheckById(task.getCheckId());

                    //如果已经执行过，进入方法

                    if (Integer.valueOf(hiddenDangerCheckById.getScheduleCheckStatus()) == 1){



                        List<HiddenDangerCheckPoint> hiddenDangerCheckPointList = trHiddenDangerCheckPointService.getHiddenDangerCheckPointByCheckId(task.getCheckId());



                        //避免个别任务无检查点的情况

                        if (ObjectUtils.isEmpty(hiddenDangerCheckPointList)) {

                            logger.info("【双重预防】排查任务记录CJ：异常，无检查点...");

                        }else {



                            int i = 0;

                            List<PreventRiskJobAndMeasure> rectifyJobDataList = preventRiskJobAndMeasureService.getRectifyJobData(task.getJobId());

                            HiddenDangerCheckJob jobById = trHiddenDangerCheckJobService.getJobById(task.getJobId());

                            for (HiddenDangerCheckPoint hiddenDangerCheckPoint : hiddenDangerCheckPointList) {

                                //获取上报数据对象

                                PreventCJReportCheckRecordFromTask CJRecordFromTask = new PreventCJReportCheckRecordFromTask();

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

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

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

                                }



                                User createUser = new User();

                                User updateUser = new User();



                                // todo 取出所有用户信息，再循环在匹配

                                for (User user : allUserList) {

                                    if (hiddenDangerCheckById.getCreateBy().equals(user.getLoginName())){

                                        createUser = user;

                                    }

                                    if (hiddenDangerCheckById.getUpdateBy().equals(user.getLoginName())){

                                        updateUser = user;

                                    }

                                }

                                if(ObjectUtils.isEmpty(createUser)){

                                    for (User user : allUserList) {

                                        if (hiddenDangerCheckById.getCreateBy().equals(user.getUserName())){

                                            createUser = user;

                                        }

                                    }

                                }



                                //封装上报昌吉州的任务数据

                                CJRecordFromTask.setId(UUID.randomUUID().toString());

                                CJRecordFromTask.setCompanyCode(companyCode);

                                CJRecordFromTask.setCreateBy(createUser.getUserName());

                                CJRecordFromTask.setCreateDate(hiddenDangerCheckById.getCreateTime());

                                CJRecordFromTask.setCreateByMobile(createUser.getPhonenumber());

                                if (ObjectUtils.isEmpty(updateUser)){

                                    CJRecordFromTask.setUpdateBy(createUser.getUserName());

                                    CJRecordFromTask.setUpdateDate(hiddenDangerCheckById.getCreateTime());

                                    CJRecordFromTask.setUpdateByMobile(createUser.getPhonenumber());

                                }else {

                                    CJRecordFromTask.setUpdateBy(updateUser.getUserName());

                                    CJRecordFromTask.setUpdateDate(hiddenDangerCheckById.getUpdateTime());

                                    CJRecordFromTask.setUpdateByMobile(updateUser.getPhonenumber());

                                }

                                if (task.getReportStatus().equals(SyncEnum.SYNC_EXEC_SUCCESS.getCode())){

                                    CJRecordFromTask.setDeleted("2");//数据更新状态标识，目前仅昌吉州需要 2022-08-10

                                }else {

                                    CJRecordFromTask.setDeleted("0");

                                }

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

                                CJRecordFromTask.setReportTime(null);

                                CJRecordFromTask.setDataSource((byte) 1);



                                CJRecordFromTask.setCheckTaskId(rectifyJobDataList.get(i).getJobUuid());



                                CJRecordFromTask.setCheckTime(hiddenDangerCheckById.getCheckTime());

                                CJRecordFromTask.setTaskId(task.getCheckId());

                                //第二版标准新增

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



                                int typeTag = 0;

//

                                // todo 取出所有任务信息表，再循环在匹配

                                for (PreventTaskType taskType : allTaskTypeList) {

                                    if (taskType.getJobId().equals(task.getJobId())){

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

                                            typeTag = 1;

                                        }

                                    }

                                }

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

                                //封装数据

                                CJRecordFromTaskLists.add(CJRecordFromTask);

                                i++;

                            }



                        }



                            int i = 1;

                        taskIds.add(task.getId());

                        tag ++;

                    }

                    System.out.println("【##】5.数据封装完成...");



                }

            }else {

                logger.info("【双重预防】当前无纠正记录需要处理");

            }



            if (CJRecordFromTaskLists.size() > 0){

                logger.info("【双重预防】纠正记录CJ：数据处理...");

                //设置原始数据状态

                int taskUpdateResult = preventRiskDangerCheckLogService.updateTaskReportStatusByList(taskIds);

                if (taskUpdateResult < taskIds.size()){

                    throw new AusinessException(E.ADD_FAIL.getCode(), "排查任务记录原始数据更新失败, 取消操作");

                }

                int result = CJTaskRecordService.insertRecordList(CJRecordFromTaskLists);

                if (result < CJRecordFromTaskLists.size()){

                    throw new AusinessException(E.ADD_FAIL.getCode(), "排查任务记录插入失败, 取消操作");

                }

            }

            step = 6;

        }else {

            step = 6;

            logger.info("排查任务记录数据上报已关闭");

        }



    }

}

package com.ruoyi.doublePrevention.scheduls;


import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportCheckRecordFromTask;
import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportCheckTaskFromWork;
import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportDangerInfo;
import com.ruoyi.doublePrevention.entity.*;
import com.ruoyi.doublePrevention.enums.E;
import com.ruoyi.doublePrevention.enums.SyncEnum;
import com.ruoyi.doublePrevention.exception.AusinessException;
import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
import com.ruoyi.doublePrevention.service.baseService.*;
import com.ruoyi.project.system.dept.service.IDeptService;
import com.ruoyi.project.system.user.domain.User;
import com.ruoyi.project.system.user.service.IUserService;
import com.ruoyi.project.tr.HiddenDangerCheckJob.domain.HiddenDangerCheckJob;
import com.ruoyi.project.tr.HiddenDangerCheckJob.service.IHiddenDangerCheckJobService;
import com.ruoyi.project.tr.hiddenDangerCheck.domain.HiddenDangerCheck;
import com.ruoyi.project.tr.hiddenDangerCheck.service.IHiddenDangerCheckService;
import com.ruoyi.project.tr.hiddenDangerCheckPoint.domain.HiddenDangerCheckPoint;
import com.ruoyi.project.tr.hiddenDangerCheckPoint.service.IHiddenDangerCheckPointService;
import com.ruoyi.project.tr.riskList.service.IRiskListService;
import org.apache.commons.lang3.ObjectUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;

import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.UUID;

@Component
public class RectifyDateSchedule {

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

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

    public static SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

    @Autowired
    private PreventReportConfigService preventReportConfigService;

    @Autowired
    private PreventCJReportRiskAnaUnitService CJRiskAnaUnitService;
    @Autowired
    private PreventCJReportRiskEventService CJEventService;
    @Autowired
    private PreventCJReportRiskControlMeasureService CJMeasureService;
    @Autowired
    private PreventCJReportCheckTaskFromWorkService CJTaskFromWorkService;
    @Autowired
    private PreventCJReportCheckRecordFromTaskService CJTaskRecordService;
    @Autowired
    private PreventCJReportDangerInfoService CJDangerInfoService;
    @Autowired
    private PreventCJReportPointService CJPointService;


    @Autowired
    private IDeptService trDeptService; //部门服务
    @Autowired
    private IUserService trUserService; //用户服务

    @Autowired
    private IRiskListService trRiskAnaUnitService; //风险设备、分析单元
    @Autowired
    private PreventRiskUnitUuidService preventRiskUnitUuidService; //风险设备、分析单元附属表

    @Autowired
    private PreventRiskEventService preventRiskEventService;
    @Autowired
    private PreventRiskControlMeasureService preventRiskControlMeasureService;
    @Autowired
    private PreventRiskControlTemplateService preventRiskControlTemplateService;

    @Autowired
    private IHiddenDangerCheckJobService trHiddenDangerCheckJobService;//排查任务job
    @Autowired
    private PreventRiskJobAndMeasureService preventRiskJobAndMeasureService;//排查任务附属表

    @Autowired
    private IHiddenDangerCheckService trHiddenDangerCheckService;//排查任务记录
    @Autowired
    private PreventRiskDangerCheckLogService preventRiskDangerCheckLogService;//排查任务记录附属表

    @Autowired
    private IHiddenDangerCheckPointService trHiddenDangerCheckPointService;//隐患信息上报、整改、验收
    @Autowired
    private PreventRiskDangerInfoService preventRiskDangerInfoService;//隐患信息附属表

    @Autowired
    private PreventRiskCheckUnitService preventRiskCheckUnitService;//管控措施，任务清单对应关系。基础排查点附属表
    @Autowired
    private PreventRiskDangerCheckAndMeasureService riskDangerCheckAndMeasureService;//管控措施，任务清单对应关系。基础排查点附属表

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

    @Autowired
    private PreventOverhaulLogService overhaulLogService;
    @Autowired
    private PreventCJReportOverhaulLogService reportOverhaulLogService;


    @Transactional
//    @Scheduled(cron = "0/10 * * * * ?")  // 30秒
    @Scheduled(cron = "0 0 0/3 * * ? ")
    public void searchReportDate(){

        logger.info("【双重预防】纠正...");
        int step = 1;
        String companyCode = "652310082";


        /**
         * 5、排查任务记录数据  PreventReportCheckRecordFromTask
         * */
        //读取安全风险管控措施数据上报主配置信息
        PreventReportConfig recordReportConfig = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG__CHECK_RECORD.getCode());
        //如果安全风险管控措施主配置开启上报
        if (recordReportConfig.getReportState().equals(SyncEnum.REPORT_ON.getCode())){


            //查询所有 选择上报的数据 && (reportTime == null 或者 reportTime < updateReportDataTime）
            List<PreventRiskDangerCheckLog> tasks = preventRiskDangerCheckLogService.listRectifyReportTask();
            List<Long> taskIds = new ArrayList<>();
            //获取上报数据对象
            List<PreventCJReportCheckRecordFromTask> CJRecordFromTaskLists = new ArrayList<>();
            int tag = 0;
//            HandlerReportParam handlerReportParam = new HandlerReportParam();
//            List<HandlerReportParam> handlerReportParamList = new ArrayList<>();
            if (ObjectUtils.isNotEmpty(tasks)){
                //获取信息
                List<User> allUserList = trUserService.getAllUser();
                List<PreventTaskType> allTaskTypeList = taskTypeService.getAllTaskTypeList();
                //遍历，封装数据
                for (PreventRiskDangerCheckLog task : tasks) {
                    //获取任务记录主表信息
                    HiddenDangerCheck hiddenDangerCheckById = trHiddenDangerCheckService.getHiddenDangerCheckById(task.getCheckId());
                    //如果已经执行过，进入方法
                    if (Integer.valueOf(hiddenDangerCheckById.getScheduleCheckStatus()) == 1){

                        List<HiddenDangerCheckPoint> hiddenDangerCheckPointList = trHiddenDangerCheckPointService.getHiddenDangerCheckPointByCheckId(task.getCheckId());

                        //避免个别任务无检查点的情况
                        if (ObjectUtils.isEmpty(hiddenDangerCheckPointList)) {
                            logger.info("【双重预防】排查任务记录CJ：异常，无检查点...");
                        }else {

                            int i = 0;
                            List<PreventRiskJobAndMeasure> rectifyJobDataList = preventRiskJobAndMeasureService.getRectifyJobData(task.getJobId());
                            HiddenDangerCheckJob jobById = trHiddenDangerCheckJobService.getJobById(task.getJobId());
                            for (HiddenDangerCheckPoint hiddenDangerCheckPoint : hiddenDangerCheckPointList) {
                                //获取上报数据对象
                                PreventCJReportCheckRecordFromTask CJRecordFromTask = new PreventCJReportCheckRecordFromTask();
                                CJRecordFromTask.setCheckStatus("0");// 0-正常；1-存在隐患；2-未处理；3-其他
                                if (Integer.valueOf(hiddenDangerCheckPoint.getWhetherDanger()) == 1){
                                    CJRecordFromTask.setCheckStatus("1");// 0-正常；1-存在隐患；2-未处理；3-其他
                                }

                                User createUser = new User();
                                User updateUser = new User();

                                // todo 取出所有用户信息，再循环在匹配
                                for (User user : allUserList) {
                                    if (hiddenDangerCheckById.getCreateBy().equals(user.getLoginName())){
                                        createUser = user;
                                    }
                                    if (hiddenDangerCheckById.getUpdateBy().equals(user.getLoginName())){
                                        updateUser = user;
                                    }
                                }
                                if(ObjectUtils.isEmpty(createUser)){
                                    for (User user : allUserList) {
                                        if (hiddenDangerCheckById.getCreateBy().equals(user.getUserName())){
                                            createUser = user;
                                        }
                                    }
                                }

                                //封装上报昌吉州的任务数据
                                CJRecordFromTask.setId(UUID.randomUUID().toString());
                                CJRecordFromTask.setCompanyCode(companyCode);
                                CJRecordFromTask.setCreateBy(createUser.getUserName());
                                CJRecordFromTask.setCreateDate(hiddenDangerCheckById.getCreateTime());
                                CJRecordFromTask.setCreateByMobile(createUser.getPhonenumber());
                                if (ObjectUtils.isEmpty(updateUser)){
                                    CJRecordFromTask.setUpdateBy(createUser.getUserName());
                                    CJRecordFromTask.setUpdateDate(hiddenDangerCheckById.getCreateTime());
                                    CJRecordFromTask.setUpdateByMobile(createUser.getPhonenumber());
                                }else {
                                    CJRecordFromTask.setUpdateBy(updateUser.getUserName());
                                    CJRecordFromTask.setUpdateDate(hiddenDangerCheckById.getUpdateTime());
                                    CJRecordFromTask.setUpdateByMobile(updateUser.getPhonenumber());
                                }
                                if (task.getReportStatus().equals(SyncEnum.SYNC_EXEC_SUCCESS.getCode())){
                                    CJRecordFromTask.setDeleted("2");//数据更新状态标识，目前仅昌吉州需要 2022-08-10
                                }else {
                                    CJRecordFromTask.setDeleted("0");
                                }
                                CJRecordFromTask.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
                                CJRecordFromTask.setReportTime(null);
                                CJRecordFromTask.setDataSource((byte) 1);

                                CJRecordFromTask.setCheckTaskId(rectifyJobDataList.get(i).getJobUuid());

                                CJRecordFromTask.setCheckTime(hiddenDangerCheckById.getCheckTime());
                                CJRecordFromTask.setTaskId(task.getCheckId());
                                //第二版标准新增
                                CJRecordFromTask.setMobileCode(task.getMobileCode().toString());

                                int typeTag = 0;
//
                                // todo 取出所有任务信息表，再循环在匹配
                                for (PreventTaskType taskType : allTaskTypeList) {
                                    if (taskType.getJobId().equals(task.getJobId())){
                                        if (taskType.getType()!= 0) {
                                            typeTag = 1;
                                        }
                                    }
                                }
                                CJRecordFromTask.setDefend(String.valueOf(typeTag));
                                //封装数据
                                CJRecordFromTaskLists.add(CJRecordFromTask);
                                i++;
                            }

                        }

                            int i = 1;
                        taskIds.add(task.getId());
                        tag ++;
                    }
                    System.out.println("【##】5.数据封装完成...");

                }
            }else {
                logger.info("【双重预防】当前无纠正记录需要处理");
            }

            if (CJRecordFromTaskLists.size() > 0){
                logger.info("【双重预防】纠正记录CJ：数据处理...");
                //设置原始数据状态
                int taskUpdateResult = preventRiskDangerCheckLogService.updateTaskReportStatusByList(taskIds);
                if (taskUpdateResult < taskIds.size()){
                    throw new AusinessException(E.ADD_FAIL.getCode(), "排查任务记录原始数据更新失败, 取消操作");
                }
                int result = CJTaskRecordService.insertRecordList(CJRecordFromTaskLists);
                if (result < CJRecordFromTaskLists.size()){
                    throw new AusinessException(E.ADD_FAIL.getCode(), "排查任务记录插入失败, 取消操作");
                }
            }
            step = 6;
        }else {
            step = 6;
            logger.info("排查任务记录数据上报已关闭");
        }

    }
}

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

@@ -1,155 +1,155 @@
package com.ruoyi.doublePrevention.scheduls;





import com.ruoyi.doublePrevention.entity.CJReport.CJdto.Data;

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

import com.ruoyi.doublePrevention.entity.PreventReportConfig;

import com.ruoyi.doublePrevention.entity.PreventRiskDangerCheckLog;

import com.ruoyi.doublePrevention.entity.PreventRiskJobAndMeasure;

import com.ruoyi.doublePrevention.entity.PreventTaskType;

import com.ruoyi.doublePrevention.enums.E;

import com.ruoyi.doublePrevention.enums.SyncEnum;

import com.ruoyi.doublePrevention.exception.AusinessException;

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

import com.ruoyi.project.system.dept.service.IDeptService;

import com.ruoyi.project.system.user.domain.User;

import com.ruoyi.project.system.user.service.IUserService;

import com.ruoyi.project.tr.HiddenDangerCheckJob.domain.HiddenDangerCheckJob;

import com.ruoyi.project.tr.HiddenDangerCheckJob.service.IHiddenDangerCheckJobService;

import com.ruoyi.project.tr.hiddenDangerCheck.domain.HiddenDangerCheck;

import com.ruoyi.project.tr.hiddenDangerCheck.service.IHiddenDangerCheckService;

import com.ruoyi.project.tr.hiddenDangerCheckPoint.domain.HiddenDangerCheckPoint;

import com.ruoyi.project.tr.hiddenDangerCheckPoint.service.IHiddenDangerCheckPointService;

import com.ruoyi.project.tr.riskList.service.IRiskListService;

import org.apache.commons.lang3.ObjectUtils;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;

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

import org.springframework.scheduling.annotation.Scheduled;

import org.springframework.stereotype.Component;

import org.springframework.transaction.annotation.Transactional;



import java.text.SimpleDateFormat;

import java.util.*;



@Component

public class SearchRectifyDateSchedule {



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



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

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



    public static SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");



    @Autowired

    private PreventReportConfigService preventReportConfigService;



    @Autowired

    private PreventCJReportRiskAnaUnitService CJRiskAnaUnitService;

    @Autowired

    private PreventCJReportRiskEventService CJEventService;

    @Autowired

    private PreventCJReportRiskControlMeasureService CJMeasureService;

    @Autowired

    private PreventCJReportCheckTaskFromWorkService CJTaskFromWorkService;

    @Autowired

    private PreventCJReportCheckRecordFromTaskService CJTaskRecordService;

    @Autowired

    private PreventCJReportDangerInfoService CJDangerInfoService;

    @Autowired

    private PreventCJReportPointService CJPointService;





    @Autowired

    private IDeptService trDeptService; //部门服务

    @Autowired

    private IUserService trUserService; //用户服务



    @Autowired

    private IRiskListService trRiskAnaUnitService; //风险设备、分析单元

    @Autowired

    private PreventRiskUnitUuidService preventRiskUnitUuidService; //风险设备、分析单元附属表



    @Autowired

    private PreventRiskEventService preventRiskEventService;

    @Autowired

    private PreventRiskControlMeasureService preventRiskControlMeasureService;

    @Autowired

    private PreventRiskControlTemplateService preventRiskControlTemplateService;



    @Autowired

    private IHiddenDangerCheckJobService trHiddenDangerCheckJobService;//排查任务job

    @Autowired

    private PreventRiskJobAndMeasureService preventRiskJobAndMeasureService;//排查任务附属表



    @Autowired

    private IHiddenDangerCheckService trHiddenDangerCheckService;//排查任务记录

    @Autowired

    private PreventRiskDangerCheckLogService preventRiskDangerCheckLogService;//排查任务记录附属表



    @Autowired

    private IHiddenDangerCheckPointService trHiddenDangerCheckPointService;//隐患信息上报、整改、验收

    @Autowired

    private PreventRiskDangerInfoService preventRiskDangerInfoService;//隐患信息附属表



    @Autowired

    private PreventRiskCheckUnitService preventRiskCheckUnitService;//管控措施，任务清单对应关系。基础排查点附属表

    @Autowired

    private PreventRiskDangerCheckAndMeasureService riskDangerCheckAndMeasureService;//管控措施，任务清单对应关系。基础排查点附属表



    @Autowired

    private PreventTaskTypeService taskTypeService;//管控措施，任务清单对应关系。基础排查点附属表



    @Autowired

    private PreventOverhaulLogService overhaulLogService;

    @Autowired

    private PreventCJReportOverhaulLogService reportOverhaulLogService;





    @Transactional

//    @Scheduled(cron = "0/10 * * * * ?")  // 30秒

    @Scheduled(cron = "0 0 0/2 * * ? ")

    public void searchReportDate(){



        logger.info("【双重预防】纠正前置处理...");

        int step = 1;

        String companyCode = "652310082";





        /**

         *

         * */

        //读取安全风险管控措施数据上报主配置信息

        PreventReportConfig recordReportConfig = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG__CHECK_RECORD.getCode());

        //如果安全风险管控措施主配置开启上报

        if (recordReportConfig.getReportState().equals(SyncEnum.REPORT_ON.getCode())){



            List<PreventRiskDangerCheckLog> tasks = preventRiskDangerCheckLogService.listSearchRectifyReportTask();



            if (ObjectUtils.isNotEmpty(tasks)){

                for (PreventRiskDangerCheckLog task : tasks) {



                    PreventRiskDangerCheckLog dangerCheckLog = new PreventRiskDangerCheckLog();

                    Calendar calendar = Calendar.getInstance();

                    calendar.set(Calendar.YEAR, 2040);

                    calendar.set(Calendar.MONTH, 5); // 注意月份从0开始，即0对应1月

                    calendar.set(Calendar.DATE, 20);

                    dangerCheckLog.setReportTime(calendar.getTime());

                    dangerCheckLog.setId(task.getId());



                    int i = preventRiskDangerCheckLogService.updateSearchRectifyReportTask(dangerCheckLog);

                    if (i < 1){

                        logger.info("纠正出错");

                    }

                }

            }else {

                logger.info("无需纠正");

            }



        }else {

            logger.info("排查任务记录数据上报已关闭");

        }



    }

}

package com.ruoyi.doublePrevention.scheduls;


import com.ruoyi.doublePrevention.entity.CJReport.CJdto.Data;
import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportCheckRecordFromTask;
import com.ruoyi.doublePrevention.entity.PreventReportConfig;
import com.ruoyi.doublePrevention.entity.PreventRiskDangerCheckLog;
import com.ruoyi.doublePrevention.entity.PreventRiskJobAndMeasure;
import com.ruoyi.doublePrevention.entity.PreventTaskType;
import com.ruoyi.doublePrevention.enums.E;
import com.ruoyi.doublePrevention.enums.SyncEnum;
import com.ruoyi.doublePrevention.exception.AusinessException;
import com.ruoyi.doublePrevention.service.baseService.*;
import com.ruoyi.project.system.dept.service.IDeptService;
import com.ruoyi.project.system.user.domain.User;
import com.ruoyi.project.system.user.service.IUserService;
import com.ruoyi.project.tr.HiddenDangerCheckJob.domain.HiddenDangerCheckJob;
import com.ruoyi.project.tr.HiddenDangerCheckJob.service.IHiddenDangerCheckJobService;
import com.ruoyi.project.tr.hiddenDangerCheck.domain.HiddenDangerCheck;
import com.ruoyi.project.tr.hiddenDangerCheck.service.IHiddenDangerCheckService;
import com.ruoyi.project.tr.hiddenDangerCheckPoint.domain.HiddenDangerCheckPoint;
import com.ruoyi.project.tr.hiddenDangerCheckPoint.service.IHiddenDangerCheckPointService;
import com.ruoyi.project.tr.riskList.service.IRiskListService;
import org.apache.commons.lang3.ObjectUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;

import java.text.SimpleDateFormat;
import java.util.*;

@Component
public class SearchRectifyDateSchedule {

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

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

    public static SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

    @Autowired
    private PreventReportConfigService preventReportConfigService;

    @Autowired
    private PreventCJReportRiskAnaUnitService CJRiskAnaUnitService;
    @Autowired
    private PreventCJReportRiskEventService CJEventService;
    @Autowired
    private PreventCJReportRiskControlMeasureService CJMeasureService;
    @Autowired
    private PreventCJReportCheckTaskFromWorkService CJTaskFromWorkService;
    @Autowired
    private PreventCJReportCheckRecordFromTaskService CJTaskRecordService;
    @Autowired
    private PreventCJReportDangerInfoService CJDangerInfoService;
    @Autowired
    private PreventCJReportPointService CJPointService;


    @Autowired
    private IDeptService trDeptService; //部门服务
    @Autowired
    private IUserService trUserService; //用户服务

    @Autowired
    private IRiskListService trRiskAnaUnitService; //风险设备、分析单元
    @Autowired
    private PreventRiskUnitUuidService preventRiskUnitUuidService; //风险设备、分析单元附属表

    @Autowired
    private PreventRiskEventService preventRiskEventService;
    @Autowired
    private PreventRiskControlMeasureService preventRiskControlMeasureService;
    @Autowired
    private PreventRiskControlTemplateService preventRiskControlTemplateService;

    @Autowired
    private IHiddenDangerCheckJobService trHiddenDangerCheckJobService;//排查任务job
    @Autowired
    private PreventRiskJobAndMeasureService preventRiskJobAndMeasureService;//排查任务附属表

    @Autowired
    private IHiddenDangerCheckService trHiddenDangerCheckService;//排查任务记录
    @Autowired
    private PreventRiskDangerCheckLogService preventRiskDangerCheckLogService;//排查任务记录附属表

    @Autowired
    private IHiddenDangerCheckPointService trHiddenDangerCheckPointService;//隐患信息上报、整改、验收
    @Autowired
    private PreventRiskDangerInfoService preventRiskDangerInfoService;//隐患信息附属表

    @Autowired
    private PreventRiskCheckUnitService preventRiskCheckUnitService;//管控措施，任务清单对应关系。基础排查点附属表
    @Autowired
    private PreventRiskDangerCheckAndMeasureService riskDangerCheckAndMeasureService;//管控措施，任务清单对应关系。基础排查点附属表

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

    @Autowired
    private PreventOverhaulLogService overhaulLogService;
    @Autowired
    private PreventCJReportOverhaulLogService reportOverhaulLogService;


    @Transactional
//    @Scheduled(cron = "0/10 * * * * ?")  // 30秒
    @Scheduled(cron = "0 0 0/2 * * ? ")
    public void searchReportDate(){

        logger.info("【双重预防】纠正前置处理...");
        int step = 1;
        String companyCode = "652310082";


        /**
         *
         * */
        //读取安全风险管控措施数据上报主配置信息
        PreventReportConfig recordReportConfig = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG__CHECK_RECORD.getCode());
        //如果安全风险管控措施主配置开启上报
        if (recordReportConfig.getReportState().equals(SyncEnum.REPORT_ON.getCode())){

            List<PreventRiskDangerCheckLog> tasks = preventRiskDangerCheckLogService.listSearchRectifyReportTask();

            if (ObjectUtils.isNotEmpty(tasks)){
                for (PreventRiskDangerCheckLog task : tasks) {

                    PreventRiskDangerCheckLog dangerCheckLog = new PreventRiskDangerCheckLog();
                    Calendar calendar = Calendar.getInstance();
                    calendar.set(Calendar.YEAR, 2040);
                    calendar.set(Calendar.MONTH, 5); // 注意月份从0开始，即0对应1月
                    calendar.set(Calendar.DATE, 20);
                    dangerCheckLog.setReportTime(calendar.getTime());
                    dangerCheckLog.setId(task.getId());

                    int i = preventRiskDangerCheckLogService.updateSearchRectifyReportTask(dangerCheckLog);
                    if (i < 1){
                        logger.info("纠正出错");
                    }
                }
            }else {
                logger.info("无需纠正");
            }

        }else {
            logger.info("排查任务记录数据上报已关闭");
        }

    }
}

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

@@ -1,915 +1,915 @@
package com.ruoyi.doublePrevention.scheduls;





import com.ruoyi.doublePrevention.entity.*;

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

import com.ruoyi.doublePrevention.enums.E;

import com.ruoyi.doublePrevention.enums.SyncEnum;

import com.ruoyi.doublePrevention.exception.AusinessException;

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

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

import com.ruoyi.project.system.dept.domain.Dept;

import com.ruoyi.project.system.dept.service.IDeptService;

import com.ruoyi.project.system.user.domain.User;

import com.ruoyi.project.system.user.service.IUserService;

import com.ruoyi.project.tr.HiddenDangerCheckJob.domain.HiddenDangerCheckJob;

import com.ruoyi.project.tr.HiddenDangerCheckJob.service.IHiddenDangerCheckJobService;

import com.ruoyi.project.tr.hiddenDangerCheck.domain.HiddenDangerCheck;

import com.ruoyi.project.tr.hiddenDangerCheck.service.IHiddenDangerCheckService;

import com.ruoyi.project.tr.hiddenDangerCheckPoint.domain.HiddenDangerCheckPoint;

import com.ruoyi.project.tr.hiddenDangerCheckPoint.service.IHiddenDangerCheckPointService;

import com.ruoyi.project.tr.riskList.domain.RiskList;

import com.ruoyi.project.tr.riskList.service.IRiskListService;

import org.apache.commons.lang3.ObjectUtils;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;

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

import org.springframework.scheduling.annotation.Scheduled;

import org.springframework.stereotype.Component;

import org.springframework.transaction.annotation.Transactional;



import java.text.SimpleDateFormat;

import java.util.*;



@Component

public class SearchReportDateSchedule {



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



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

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



    public static SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");



    @Autowired

    private PreventReportConfigService preventReportConfigService;



    @Autowired

    private PreventCJReportRiskAnaUnitService CJRiskAnaUnitService;

    @Autowired

    private PreventCJReportRiskEventService CJEventService;

    @Autowired

    private PreventCJReportRiskControlMeasureService CJMeasureService;

    @Autowired

    private PreventCJReportCheckTaskFromWorkService CJTaskFromWorkService;

    @Autowired

    private PreventCJReportCheckRecordFromTaskService CJTaskRecordService;

    @Autowired

    private PreventCJReportDangerInfoService CJDangerInfoService;

    @Autowired

    private PreventCJReportPointService CJPointService;





    @Autowired

    private IDeptService trDeptService; //部门服务

    @Autowired

    private IUserService trUserService; //用户服务



    @Autowired

    private IRiskListService trRiskAnaUnitService; //风险设备、分析单元

    @Autowired

    private PreventRiskUnitUuidService preventRiskUnitUuidService; //风险设备、分析单元附属表



    @Autowired

    private PreventRiskEventService preventRiskEventService;

    @Autowired

    private PreventRiskControlMeasureService preventRiskControlMeasureService;

    @Autowired

    private PreventRiskControlTemplateService preventRiskControlTemplateService;



    @Autowired

    private IHiddenDangerCheckJobService trHiddenDangerCheckJobService;//排查任务job

    @Autowired

    private PreventRiskJobAndMeasureService preventRiskJobAndMeasureService;//排查任务附属表



    @Autowired

    private IHiddenDangerCheckService trHiddenDangerCheckService;//排查任务记录

    @Autowired

    private PreventRiskDangerCheckLogService preventRiskDangerCheckLogService;//排查任务记录附属表



    @Autowired

    private IHiddenDangerCheckPointService trHiddenDangerCheckPointService;//隐患信息上报、整改、验收

    @Autowired

    private PreventRiskDangerInfoService preventRiskDangerInfoService;//隐患信息附属表



    @Autowired

    private PreventRiskCheckUnitService preventRiskCheckUnitService;//管控措施，任务清单对应关系。基础排查点附属表

    @Autowired

    private PreventRiskDangerCheckAndMeasureService riskDangerCheckAndMeasureService;//管控措施，任务清单对应关系。基础排查点附属表



    @Autowired

    private PreventTaskTypeService taskTypeService;//管控措施，任务清单对应关系。基础排查点附属表



    @Autowired

    private PreventOverhaulLogService overhaulLogService;

    @Autowired

    private PreventCJReportOverhaulLogService reportOverhaulLogService;





    @Transactional

//    @Scheduled(cron = "0 0/1 * * * ? ")    // 分钟

//    @Scheduled(cron = "0/10 * * * * ?")  // 30秒

    @Scheduled(cron = "0 0/25 * * * ? ")    // 分钟

    public void searchReportDate(){



        logger.info("【双重预防】定时检索需要上报数据...");

        int step = 1;

        String companyCode = "652310082";



        /**

         * 1、检索风险分析单元

         * */

        //读取风险分析单元数据上报主配置信息

        PreventReportConfig unitReportConfig = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_RISK_ANA_UNIT.getCode());

        //如果主配置开启上报，开始

        if (unitReportConfig.getReportState().equals(SyncEnum.REPORT_ON.getCode())){



            logger.info("【##】1.检索风险分析单元...");



            //查询所有 选择上报的数据 && (reportTime == null 或者 reportTime < updateReportDataTime）

            List<PreventRiskUnitUuid> riskUnitUuidList = preventRiskUnitUuidService.listRiskAnaUnit();

            //获取上报数据list

//            List<PreventReportRiskAnaUnit> unitLists = new ArrayList<>();

            List<PreventCJReportRiskAnaUnit> CJUnitLists = new ArrayList<>();

            if (ObjectUtils.isNotEmpty(riskUnitUuidList)){

                HandlerReportParam handlerReportParam = new HandlerReportParam();

                //遍历，封装数据

                for (PreventRiskUnitUuid riskUnitUuid : riskUnitUuidList) {

                    //查询漯安表中对应数据

                    RiskList infoByRiskId = trRiskAnaUnitService.getInfoByRiskListId(riskUnitUuid.getRiskUnitId());

                    //获取上报数据对象

                    PreventCJReportRiskAnaUnit CJReportRiskAnaUnit = new PreventCJReportRiskAnaUnit();



                    //此类方法已经修改，实际使用username

                    User createUser = trUserService.getUserByLoginName(infoByRiskId.getCreateBy());

                    User updateUser = trUserService.getUserByLoginName(infoByRiskId.getUpdateBy());

                    User userById = trUserService.getUserById(infoByRiskId.getUserId());

                    Dept depById = trDeptService.getDepById(infoByRiskId.getDeptId());



                    //封装上报昌吉州的风险分析单元数据

                    CJReportRiskAnaUnit.setId(riskUnitUuid.getRiskUnitUuid());//此处封装附属表的uuid

                    CJReportRiskAnaUnit.setCompanyCode(companyCode);

                    CJReportRiskAnaUnit.setRiskUnitName(infoByRiskId.getRiskListName());

                    CJReportRiskAnaUnit.setHazardCode(infoByRiskId.getRiskListNum());

                    CJReportRiskAnaUnit.setHazardDep(depById.getDeptName());

                    CJReportRiskAnaUnit.setHazardLiablePerson(userById.getUserName());

                    CJReportRiskAnaUnit.setDeleted("0");

//                    if (riskUnitUuid.getReportStatus().equals(SyncEnum.SYNC_EXEC_SUCCESS.getCode())){

//                        CJReportRiskAnaUnit.setDeleted("2");//数据更新状态标识，目前仅昌吉州需要 2022-08-10

//                    }else {

//                        CJReportRiskAnaUnit.setDeleted(riskAnaUnit.getDeleteStatus().toString());

//                    }

                    CJReportRiskAnaUnit.setCreateBy(createUser.getUserName());

                    CJReportRiskAnaUnit.setCreateDate(infoByRiskId.getCreateTime());

                    if (ObjectUtils.isEmpty(updateUser)){

                        CJReportRiskAnaUnit.setUpdateBy(createUser.getUserName());

                        CJReportRiskAnaUnit.setUpdateDate(infoByRiskId.getUpdateTime());

                    }else {

                        CJReportRiskAnaUnit.setUpdateBy(updateUser.getUserName());

                        CJReportRiskAnaUnit.setUpdateDate(infoByRiskId.getCreateTime());

                    }

                    CJReportRiskAnaUnit.setDataSource((byte) 1);

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

                    CJReportRiskAnaUnit.setReportTime(null);

                    CJReportRiskAnaUnit.setRiskUnitId(infoByRiskId.getRiskListId());//此处封装主表的id

                    //封装数据

                    CJUnitLists.add(CJReportRiskAnaUnit);

                    //修改原始数据状态为待上传

                    handlerReportParam.setId(riskUnitUuid.getId());//此处修改的是附属表

                    handlerReportParam.setReportTime(new Date());

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

                    int result = preventRiskUnitUuidService.updateReportStatus(handlerReportParam);

                }

            }else {

                logger.info("【双重预防】当前无风险分析单元数据需要处理");

            }

            //写入昌吉州转换表

            for (PreventCJReportRiskAnaUnit CJUnit : CJUnitLists) {

                CJRiskAnaUnitService.insertUnitList(CJUnit);

                logger.info("【双重预防】1.风险分析单元CJ：数据处理...");

            }

            step = 2;

        }else {

            step = 2;

            logger.info("风险分析单元数据上报已关闭");

        }





        /**

         * 2、检索安全风险事件数据

         * */

        //读取风险分析单元数据上报主配置信息

        PreventReportConfig eventReportConfig = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_RISK_EVENT.getCode());

        //如果风险事件主配置开启上报

        if (eventReportConfig.getReportState().equals(SyncEnum.REPORT_ON.getCode())){



            //logger.info("【##】2.检索安全风险事件...");

            //查询所有 选择上报的数据 && (reportTime == null 或者 reportTime < updateReportDataTime）

            List<PreventRiskEvent> riskEvents = preventRiskEventService.listReportEvent();

            //获取上报数据对象与list

            List<PreventCJReportRiskEvent> CJEventLists = new ArrayList<>();

            if (ObjectUtils.isNotEmpty(riskEvents)){

                //遍历，封装数据

                for (PreventRiskEvent riskEvent : riskEvents) {

                    //String eventUuid = UUID.randomUUID().toString();

                    HandlerReportParam handlerReportParam = new HandlerReportParam();

                    PreventCJReportRiskEvent CJReportRiskEvent = new PreventCJReportRiskEvent();

                    //封装上报昌吉州风险事件数据

                    CJReportRiskEvent.setId(riskEvent.getUuid());

                    CJReportRiskEvent.setCompanyCode(companyCode);

                    if (riskEvent.getReportStatus().equals(SyncEnum.SYNC_EXEC_SUCCESS.getCode())){

                        CJReportRiskEvent.setDeleted("2");//数据更新状态标识，目前仅昌吉州需要 2022-08-10

                    }else {

                        CJReportRiskEvent.setDeleted("0");

                    }

                    CJReportRiskEvent.setCreateBy(riskEvent.getCreateByUserName());

                    CJReportRiskEvent.setCreateDate(riskEvent.getGmtCreate());

                    CJReportRiskEvent.setUpdateBy(riskEvent.getCreateByUserName());

                    CJReportRiskEvent.setUpdateDate(riskEvent.getGmtModitify());

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

                    CJReportRiskEvent.setReportTime(null);

                    CJReportRiskEvent.setDataSource((byte) 1);

                    PreventRiskUnitUuid riskUnitUuidByUnitId = preventRiskUnitUuidService.getRiskUnitUuidByUnitId(riskEvent.getRiskUnitId());

                    CJReportRiskEvent.setRiskUnitId(riskUnitUuidByUnitId.getRiskUnitUuid());

                    CJReportRiskEvent.setRiskEventName(riskEvent.getRiskEventName());

                    CJReportRiskEvent.setRiskEventId(riskEvent.getId());

                    //封装数据

                    CJEventLists.add(CJReportRiskEvent);

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

                    handlerReportParam.setId(riskEvent.getId());

                    handlerReportParam.setReportTime(new Date());

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

                    preventRiskEventService.updateEventReportStatus(handlerReportParam);

                }

            }else {

                logger.info("【双重预防】当前无安全风险事件数据需要处理");

            }

            //写入昌吉州转换表

            for (PreventCJReportRiskEvent CJEvent : CJEventLists) {

                CJEventService.insertEventLists(CJEvent);

                logger.info("【双重预防】2.风险分析事件CJ：数据处理...");

            }

            step = 3;

        }else {

            step = 3;

            logger.info("安全风险事件数据上报已关闭");

        }





        /**

         * 3、检索安全风险管控措施数据

         * */

        //读取安全风险管控措施数据上报主配置信息

        PreventReportConfig measureReportConfig = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_RISK_MEASURE.getCode());

        //如果安全风险管控措施主配置开启上报

        if (measureReportConfig.getReportState().equals(SyncEnum.REPORT_ON.getCode())){

            //logger.info("{【##】3.检索安全风险管控措施...");



            //查询所有 选择上报的数据 && (reportTime == null 或者 reportTime < updateReportDataTime）

            List<PreventRiskControlMeasure> measures = preventRiskControlMeasureService.listReportMeasure();

            //获取上报数据list

            List<PreventCJReportRiskControlMeasure> CJMeasureLists = new ArrayList<>();

            HandlerReportParam handlerReportParam = new HandlerReportParam();



            if (ObjectUtils.isNotEmpty(measures)){

                //遍历，封装数据

                for (PreventRiskControlMeasure measure : measures) {

                    String measureUuid = UUID.randomUUID().toString();

                    //获取上报数据对象

                    PreventCJReportRiskControlMeasure CJReportMeasure = new PreventCJReportRiskControlMeasure();

                    //转换数据

                    PreventRiskControlTemplate controlTemplateById = preventRiskControlTemplateService.getControlTemplateById(measure.getClassify2());

                    String classify2 = measure.getClassify1() + "-" + controlTemplateById.getOrderIndex();



                    //封装上报昌吉州管控措施数据

                    CJReportMeasure.setId(measure.getUuid());

                    CJReportMeasure.setCompanyCode(companyCode);

                    if (measure.getReportStatus().equals(SyncEnum.SYNC_EXEC_SUCCESS.getCode())){

                        CJReportMeasure.setDeleted("2");//数据更新状态标识，目前仅昌吉州需要 2022-08-10

                    }else {

                        CJReportMeasure.setDeleted("0");

                    }

                    CJReportMeasure.setCreateBy(measure.getCreateByUserName());

                    CJReportMeasure.setCreateDate(measure.getGmtCreate());

                    CJReportMeasure.setUpdateBy(measure.getCreateByUserName());

                    CJReportMeasure.setUpdateDate(measure.getGmtModitify());

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

                    CJReportMeasure.setReportTime(null);

                    CJReportMeasure.setDataSource((byte) 1);

                    CJReportMeasure.setRiskEventId(measure.getRiskEventUuid());

                    CJReportMeasure.setRiskMeasureDesc(measure.getMeasureDesc());

                    CJReportMeasure.setDataSrc(measure.getControlType().toString());

                    CJReportMeasure.setClassify1(measure.getClassify1().toString());

                    CJReportMeasure.setClassify2(classify2);

                    CJReportMeasure.setClassify3(measure.getClassify3());

                    CJReportMeasure.setRiskMeasureId(measure.getId());

                    CJReportMeasure.setTroubleshootContent(measure.getCheckContent());





                    //封装数据

                    CJMeasureLists.add(CJReportMeasure);

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

                    handlerReportParam.setId(measure.getId());

                    handlerReportParam.setReportTime(new Date());

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

                    preventRiskControlMeasureService.updateMeasureReportStatus(handlerReportParam);

                }

            }else {

                logger.info("【双重预防】当前无安全风险管控措施数据需要处理");

            }



            step = 4;



            //写入上报昌吉州转换表

            for (PreventCJReportRiskControlMeasure CJMeasure : CJMeasureLists) {

                CJMeasureService.insertMeasureList(CJMeasure);



                logger.info("【双重预防】3.安全风险管控措施CJ：数据处理...");

            }

        }else {

            step = 4;

            logger.info("安全风险管控措施数据上报已关闭");

        }



        /**

         * 4、检索 任务配置 数据 prevent_report_check_record_from_task

         * */

        //读取任务配置数据上报主配置信息

        PreventReportConfig workReportConfig = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_TASK_FROM_WORK.getCode());

        //如果任务配置主配置开启上报

        if (workReportConfig.getReportState().equals(SyncEnum.REPORT_ON.getCode())){

          //  logger.info("【##】4.检索任务配置...");

            //查询所有 选择上报的数据 && (reportTime == null 或者 reportTime < updateReportDataTime）

            List<PreventRiskJobAndMeasure> works = preventRiskJobAndMeasureService.listReportWork();

            //获取上报数据对象与list

            List<PreventCJReportCheckTaskFromWork> CJTaskFromWorkLists = new ArrayList<>();

            HandlerReportParam handlerReportParam = new HandlerReportParam();



            if (ObjectUtils.isNotEmpty(works)){

                //遍历，封装数据

                for (PreventRiskJobAndMeasure work : works) {

                    //通过work中的信息，查询主表数据

                    HiddenDangerCheckJob jobById = trHiddenDangerCheckJobService.getJobById(work.getJobId());

                    //获取数据对象

                    PreventCJReportCheckTaskFromWork CJTaskFromWork = new PreventCJReportCheckTaskFromWork();

                    //转换时间周期单位 (1小时,2日,3周,4月,5年)

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

                        CJTaskFromWork.setCheckCycle(Math.toIntExact(jobById.getTroubleshootTypeCycleNum()));

                        CJTaskFromWork.setCheckCycleUnit("小时");

                        CJTaskFromWork.setWorkStartTime("00:00:00");

                        CJTaskFromWork.setWorkEndTime("23:59:59");

                    }else if (jobById.getTroubleshootTypeCycleType() == 2){

                        CJTaskFromWork.setCheckCycle(Math.toIntExact(jobById.getTroubleshootTypeCycleNum()));

                        CJTaskFromWork.setCheckCycleUnit("天");

                    }else if (jobById.getTroubleshootTypeCycleType() == 3){

                        Long num = jobById.getTroubleshootTypeCycleNum() * 7;

                        CJTaskFromWork.setCheckCycle(Math.toIntExact(num));

                        CJTaskFromWork.setCheckCycleUnit("天");

                    }else if (jobById.getTroubleshootTypeCycleType() == 4){

                        CJTaskFromWork.setCheckCycle(Math.toIntExact(jobById.getTroubleshootTypeCycleNum()));

                        CJTaskFromWork.setCheckCycleUnit("月");

                    }else if (jobById.getTroubleshootTypeCycleType() == 5){

                        CJTaskFromWork.setCheckCycle(Math.toIntExact(jobById.getTroubleshootTypeCycleNum()));

                        CJTaskFromWork.setCheckCycleUnit("年");

                    }

                    //获取用户信息

                    User createUser = new User();

                    User updateUser = new User();

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

                    if(ObjectUtils.isEmpty(createUser)){

                        createUser = trUserService.getUserByName(jobById.getCreateBy());

                    }



                    updateUser = trUserService.getUserByLoginName(jobById.getUpdateBy());

                    if(ObjectUtils.isEmpty(updateUser)){

                        updateUser = trUserService.getUserByName(jobById.getUpdateBy());

                    }



                    //封装上报昌吉州任务配置数据

                    CJTaskFromWork.setId(work.getJobUuid());

                    CJTaskFromWork.setCompanyCode(companyCode);

                    if (work.getReportStatus().equals(SyncEnum.SYNC_EXEC_SUCCESS.getCode())){

                        CJTaskFromWork.setDeleted("2");//数据更新状态标识，目前仅昌吉州需要 2022-08-10

                    }else {

                        CJTaskFromWork.setDeleted("0");

                    }

                    CJTaskFromWork.setCreateBy(createUser.getUserName());

                    CJTaskFromWork.setCreateDate(jobById.getCreateTime());

                    if (ObjectUtils.isEmpty(updateUser)){

                        CJTaskFromWork.setUpdateBy(createUser.getUserName());

                        CJTaskFromWork.setUpdateDate(jobById.getCreateTime());

                    }else {

                        CJTaskFromWork.setUpdateBy(updateUser.getUserName());

                        CJTaskFromWork.setUpdateDate(jobById.getCreateTime());

                    }

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

                    CJTaskFromWork.setReportTime(null);

                    CJTaskFromWork.setDataSource((byte) 1);

                    CJTaskFromWork.setRiskMeasureId(work.getMeasureUuid());

                    CJTaskFromWork.setWorkId(jobById.getJobId());



                    //第二版标准新增

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

                    CJTaskFromWork.setTroubleshootContent(measureById.getCheckContent());

                    CJTaskFromWork.setTaskStartTime(jobById.getStartTime());



                    CJTaskFromWork.setWorkDayType("0");

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

                    int typeTag = 0;

                    for (PreventTaskType taskType : typeByJobId) {

                        typeTag = taskType.getType();

                    }

                    if (typeTag !=0){

                        CJTaskFromWork.setTaskNum("1");

                    }

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



                    //封装数据

                    CJTaskFromWorkLists.add(CJTaskFromWork);

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

                    handlerReportParam.setId(work.getId());

                    handlerReportParam.setReportTime(new Date());

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

                    preventRiskJobAndMeasureService.updateWorkReportStatus(handlerReportParam);

                }

            }else {

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

            }

            //写入上报昌吉州数据转换表

            for (PreventCJReportCheckTaskFromWork CJTaskFromWorks : CJTaskFromWorkLists) {

                CJTaskFromWorkService.insertTaskFromWorkList(CJTaskFromWorks);

                logger.info("【双重预防】任务配置CJ：数据处理...");

            }

        }else {

            step = 5;

            logger.info("任务配置数据上报已关闭");

        }





        /**

         * 5、排查任务记录数据  PreventReportCheckRecordFromTask

         * */

        //读取安全风险管控措施数据上报主配置信息

        PreventReportConfig recordReportConfig = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG__CHECK_RECORD.getCode());

        //如果安全风险管控措施主配置开启上报

        if (recordReportConfig.getReportState().equals(SyncEnum.REPORT_ON.getCode())){



            //logger.info("【##】5.检索排查任务记录数据...");

            System.out.println("【##】5.检索排查任务记录数据...");



            //查询所有 选择上报的数据 && (reportTime == null 或者 reportTime < updateReportDataTime）

            List<PreventRiskDangerCheckLog> tasks = preventRiskDangerCheckLogService.listReportTask();

            List<Long> taskIds = new ArrayList<>();

            //获取上报数据对象

            List<PreventCJReportCheckRecordFromTask> CJRecordFromTaskLists = new ArrayList<>();

            int tag = 0;

//            HandlerReportParam handlerReportParam = new HandlerReportParam();

//            List<HandlerReportParam> handlerReportParamList = new ArrayList<>();

            if (ObjectUtils.isNotEmpty(tasks)){

                //获取信息

                List<User> allUserList = trUserService.getAllUser();

                List<PreventRiskControlMeasure> allMeasureList = preventRiskControlMeasureService.getAllMeasureList();

                List<PreventTaskType> allTaskTypeList = taskTypeService.getAllTaskTypeList();

                //遍历，封装数据

                for (PreventRiskDangerCheckLog task : tasks) {

                    //获取任务记录主表信息

                    HiddenDangerCheck hiddenDangerCheckById = trHiddenDangerCheckService.getHiddenDangerCheckById(task.getCheckId());

                    //转换检查结果

                    //如果已经执行过，进入方法

                    if (Integer.valueOf(hiddenDangerCheckById.getScheduleCheckStatus()) == 1){



                        List<HiddenDangerCheckPoint> hiddenDangerCheckPointList = trHiddenDangerCheckPointService.getHiddenDangerCheckPointByCheckId(task.getCheckId());



                        //避免个别任务无检查点的情况

                        if (ObjectUtils.isEmpty(hiddenDangerCheckPointList)) {

                            logger.info("【双重预防】排查任务记录CJ：异常，无检查点...");

                        }else {

                            for (HiddenDangerCheckPoint hiddenDangerCheckPoint : hiddenDangerCheckPointList) {

                                //获取上报数据对象

                                PreventCJReportCheckRecordFromTask CJRecordFromTask = new PreventCJReportCheckRecordFromTask();

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

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

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

                                }



                                User createUser = new User();

                                User updateUser = new User();

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

//                                if(ObjectUtils.isEmpty(createUser)){

//                                    createUser = trUserService.getUserByName(hiddenDangerCheckById.getCreateBy());

//                                }

//                                updateUser = trUserService.getUserByLoginName(hiddenDangerCheckById.getUpdateBy());





                                // todo 取出所有用户信息，再循环在匹配

                                for (User user : allUserList) {

                                    if (hiddenDangerCheckById.getCreateBy().equals(user.getLoginName())){

                                        createUser = user;

                                    }

                                    if (hiddenDangerCheckById.getUpdateBy().equals(user.getLoginName())){

                                        updateUser = user;

                                    }

                                }

                                if(ObjectUtils.isEmpty(createUser)){

                                    for (User user : allUserList) {

                                        if (hiddenDangerCheckById.getCreateBy().equals(user.getUserName())){

                                            createUser = user;

                                        }

                                    }

                                }







                                //封装上报昌吉州的任务数据

//                                String taskUuid = UUID.randomUUID().toString();

                                CJRecordFromTask.setId(UUID.randomUUID().toString());

                                CJRecordFromTask.setCompanyCode(companyCode);

                                CJRecordFromTask.setCreateBy(createUser.getUserName());

                                CJRecordFromTask.setCreateDate(hiddenDangerCheckById.getCreateTime());

                                CJRecordFromTask.setCreateByMobile(createUser.getPhonenumber());

                                if (ObjectUtils.isEmpty(updateUser)){

                                    CJRecordFromTask.setUpdateBy(createUser.getUserName());

                                    CJRecordFromTask.setUpdateDate(hiddenDangerCheckById.getCreateTime());

                                    CJRecordFromTask.setUpdateByMobile(createUser.getPhonenumber());

                                }else {

                                    CJRecordFromTask.setUpdateBy(updateUser.getUserName());

                                    CJRecordFromTask.setUpdateDate(hiddenDangerCheckById.getUpdateTime());

                                    CJRecordFromTask.setUpdateByMobile(updateUser.getPhonenumber());

                                }



                                if (task.getReportStatus().equals(SyncEnum.SYNC_EXEC_SUCCESS.getCode())){

                                    CJRecordFromTask.setDeleted("2");//数据更新状态标识，目前仅昌吉州需要 2022-08-10

                                }else {

                                    CJRecordFromTask.setDeleted("0");

                                }

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

                                CJRecordFromTask.setReportTime(null);

                                CJRecordFromTask.setDataSource((byte) 1);

                                List<PreventRiskDangerCheckAndMeasure> baseCheckPointAndMeasure = riskDangerCheckAndMeasureService.getByBaseCheckPointId(hiddenDangerCheckPoint.getCheckPointId());

                                //获取该条记录对应的管控措施id，

                                Long controlMeasureId = 1L;

                                for (PreventRiskDangerCheckAndMeasure checkAndMeasure : baseCheckPointAndMeasure) {

                                    controlMeasureId = checkAndMeasure.getControlMeasureId();

                                }

//                                //获取该条记录对应的管控措施uuid

//                                PreventRiskControlMeasure preventRiskControlMeasureById = preventRiskControlMeasureService.getPreventRiskControlMeasureById(controlMeasureId);

//                                //通过管控措施uuid ，jobId(workId)，在任务上报表中，找到任务对应的uuid

//                                PreventCJReportCheckTaskFromWork preventCJReportCheckTaskFromWork = CJTaskFromWorkService.geByMeasureUUidAndJobId(preventRiskControlMeasureById.getUuid(), task.getJobId());

//                                CJRecordFromTask.setCheckTaskId(preventCJReportCheckTaskFromWork.getId());

                                // todo 取出所有措施，再循环在匹配

                                for (PreventRiskControlMeasure measure : allMeasureList) {

                                    if (controlMeasureId.equals(measure.getId())){

                                        //通过管控措施uuid ，jobId(workId)，在任务上报表中，找到任务对应的uuid

                                        PreventCJReportCheckTaskFromWork preventCJReportCheckTaskFromWork = CJTaskFromWorkService.geByMeasureUUidAndJobId(measure.getUuid(), task.getJobId());

                                        CJRecordFromTask.setCheckTaskId(preventCJReportCheckTaskFromWork.getId());

                                    }

                                }





                                CJRecordFromTask.setCheckTime(hiddenDangerCheckById.getCheckTime());

                                CJRecordFromTask.setTaskId(task.getCheckId());

                                //第二版标准新增

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



                                int typeTag = 0;

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

//                                for (PreventTaskType typeByJobId : typeByJobIds) {

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

//                                        typeTag = 1;

//                                    }

//                                }



                                // todo 取出所有任务信息表，再循环在匹配

                                for (PreventTaskType taskType : allTaskTypeList) {

                                    if (taskType.getJobId().equals(task.getJobId())){

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

                                            typeTag = 1;

                                        }

                                    }

                                }





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

                                //封装数据

                                CJRecordFromTaskLists.add(CJRecordFromTask);

                            }

                        }



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

//                            handlerReportParam.setId(task.getId());

//                            handlerReportParam.setReportTime(new Date());

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

//                            handlerReportParamList.add(handlerReportParam);

//                            preventRiskDangerCheckLogService.updateTaskReportStatus(handlerReportParam);

                            int i = 1;

                        taskIds.add(task.getId());

                        tag ++;

                    }

                    System.out.println("【##】5.数据封装完成...");



                }

            }else {

                logger.info("【双重预防】当前无排查任务记录需要处理");

            }



            if (CJRecordFromTaskLists.size() > 0){

                logger.info("【双重预防】排查任务记录CJ：数据处理...");

                //设置原始数据状态

                int taskUpdateResult = preventRiskDangerCheckLogService.updateTaskReportStatusByList(taskIds);

                if (taskUpdateResult < taskIds.size()){

                    throw new AusinessException(E.ADD_FAIL.getCode(), "排查任务记录原始数据更新失败, 取消操作");

                }

                int result = CJTaskRecordService.insertRecordList(CJRecordFromTaskLists);

                if (result < CJRecordFromTaskLists.size()){

                    throw new AusinessException(E.ADD_FAIL.getCode(), "排查任务记录插入失败, 取消操作");

                }

            }

            step = 6;

        }else {

            step = 6;

            logger.info("排查任务记录数据上报已关闭");

        }





        /**

         * 6、隐患信息数据

         * */

        //读取安全风险管控措施数据上报主配置信息

        PreventReportConfig dangerReportConfig = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_DANGER_INFO.getCode());

        //如果安全风险管控措施主配置开启上报

        if (dangerReportConfig.getReportState().equals(SyncEnum.REPORT_ON.getCode())){



            //logger.info("【##】6.检索隐患数据...");



            //查询所有 选择上报的数据 && (reportTime == null 或者 reportTime < updateReportDataTime）

            List<PreventRiskDangerInfo> dangerManages = preventRiskDangerInfoService.listReportDanger();

            //获取上报数据list

            List<PreventCJReportDangerInfo> CJDangerInfoLists = new ArrayList<>();



            if (ObjectUtils.isNotEmpty(dangerManages)){

                HandlerReportParam handlerReportParam = new HandlerReportParam();

                //遍历，封装数据

                for (PreventRiskDangerInfo dangerManage : dangerManages) {



                    //获取隐患信息主表信息

                    HiddenDangerCheckPoint hiddenDanger = trHiddenDangerCheckPointService.getHiddenDangerCheckPointById(dangerManage.getDangerCheckPointId());

                    //获取上报数据对象

                    PreventCJReportDangerInfo CJDangerInfo = new PreventCJReportDangerInfo();



                    //通过用户名，获取涉及到的各位用户的真实姓名

                    User createUser = new User();

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

//                    createUser = trUserService.getUserByLoginName("guotai");

                    if(ObjectUtils.isEmpty(createUser)){

                        createUser = trUserService.getUserByName(hiddenDanger.getCreateBy());

                    }

                    User updateUser = trUserService.getUserByLoginName(hiddenDanger.getUpdateBy());

//                    User updateUser = trUserService.getUserByLoginName("guotai");

                    if (ObjectUtils.isNotEmpty(hiddenDanger.getRegisterUserName())){

                        User registerUser = trUserService.getUserByLoginName(hiddenDanger.getRegisterUserName());

                        //登记人信息

                        CJDangerInfo.setRegistrant(registerUser.getUserName());//登记人

                        CJDangerInfo.setRegistTime(hiddenDanger.getRegisterCreateTime());//登记时间

                    }



                    CJDangerInfo.setCost(String.valueOf(0));//初始值给0

                    if (ObjectUtils.isNotEmpty(hiddenDanger.getRectifyUserName())){

                        User rectifyUser = trUserService.getUserByLoginName(hiddenDanger.getRectifyUserName());

                        //整改人信息

                        CJDangerInfo.setLiablePerson(rectifyUser.getUserName());//整改责任人

                        CJDangerInfo.setCost(hiddenDanger.getRectifyFund());//资金

                    }



                    if (ObjectUtils.isNotEmpty(hiddenDanger.getAcceptUserName())){

                        //验收人信息

                        CJDangerInfo.setCheckAcceptPerson(hiddenDanger.getAcceptUserName());//验收人

                        CJDangerInfo.setCheckAcceptComment(hiddenDanger.getAcceptOpinion());//验收情况

                        CJDangerInfo.setCheckAcceptTime(hiddenDanger.getAcceptCreateTime());//验收时间

                    }



                    //如果排查任务正常存在，封装任务相关数据

//                    if (Integer.parseInt(hiddenDanger.getDangerSources()) != 2){

//                        HiddenDangerCheck dangerCheckById = trHiddenDangerCheckService.getHiddenDangerCheckById(hiddenDanger.getCheckId());

//

//                        PreventRiskDangerCheckLog dangerCheckLogByCheckId = preventRiskDangerCheckLogService.getByDangerCheckByCheckId(hiddenDanger.getCheckId());

//                        CJDangerInfo.setCheckRecordId(dangerCheckLogByCheckId.getUuid());//隐患排查任务记录uuid

//                        //找排查点，然后查措施

//                        PreventRiskCheckUnit unit = preventRiskCheckUnitService.getUnitByBaseCheckPointId(hiddenDanger.getCheckPointId());

//                        //查管控措施

//                        PreventRiskControlMeasure controlMeasureById = preventRiskControlMeasureService.getPreventRiskControlMeasureById(unit.getControlMeasureId());

//                        CJDangerInfo.setRiskMeasureId(controlMeasureById.getUuid());//管控措施uuid

//                        CJDangerInfo.setControlMeasures(controlMeasureById.getCheckContent());//控制措施 ,整改措施

//                    }else {

//                        CJDangerInfo.setCheckRecordId(null);

//                        CJDangerInfo.setRiskMeasureId(null);

//                    }

                    CJDangerInfo.setCheckRecordId(null);

                    CJDangerInfo.setRiskMeasureId(null);//默认无任务

                    CJDangerInfo.setDeleted("0");

                    CJDangerInfo.setId(dangerManage.getUuid());

                    CJDangerInfo.setCompanyCode(companyCode);

                    CJDangerInfo.setHazardCode(dangerManage.getHazardCode());

                    CJDangerInfo.setCreateBy(createUser.getUserName());

                    CJDangerInfo.setCreateDate(hiddenDanger.getCreateTime());



                    if (ObjectUtils.isEmpty(updateUser)){

                        CJDangerInfo.setUpdateBy(createUser.getUserName());

                        CJDangerInfo.setUpdateDate(hiddenDanger.getCreateTime());

                    }else {

                        CJDangerInfo.setUpdateBy(updateUser.getUserName());

                        CJDangerInfo.setUpdateDate(hiddenDanger.getUpdateTime());

                    }

                    // todo 2024-07-01 需要检查

                    CJDangerInfo.setHazardCategory("0");

                    if (dangerManage.getId() <= 383){

                        PreventTaskType taskTypeInfo = taskTypeService.getInfoByTaskId(dangerManage.getId());

                        int i = 1;

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

                    }

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

                    CJDangerInfo.setReportTime(null);

                    CJDangerInfo.setDataSource((byte) 1);

                    CJDangerInfo.setDangerName(hiddenDanger.getDangerName());

                    CJDangerInfo.setDangerLevel(hiddenDanger.getDangerLevel());

                    CJDangerInfo.setDangerSrc(dangerManage.getDangerSrc().toString());

                    if (hiddenDanger.getRectifyType().equals("1")){

                        CJDangerInfo.setDangerManageType("0");

                    }else {

                        CJDangerInfo.setDangerManageType("1");

                    }

                    CJDangerInfo.setDangerDesc(hiddenDanger.getDangerDescription());

                    CJDangerInfo.setDangerReason(dangerManage.getDangerReason());

                    CJDangerInfo.setDangerManageDeadline(hiddenDanger.getRectifyDeadlineTime());

                    if (ObjectUtils.isNotEmpty(dangerManage.getDangerState())){

                        CJDangerInfo.setDangerState(dangerManage.getDangerState().toString());

                    }

                    CJDangerInfo.setHazardDangerType(dangerManage.getHazardDangerType().toString());

                    CJDangerInfo.setDangerManagerId(dangerManage.getId());



                    CJDangerInfoLists.add(CJDangerInfo);

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

                    handlerReportParam.setId(dangerManage.getId());

                    handlerReportParam.setReportTime(new Date());

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

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

                    preventRiskDangerInfoService.updateDangerInfoReportStatus(handlerReportParam);

                }

            }else {

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

            }



            //插入上报昌吉州转换表

            for (PreventCJReportDangerInfo CJDanger : CJDangerInfoLists) {

                logger.info("【双重预防】隐患信息插入...");

                int result = CJDangerInfoService.insert(CJDanger);

                if (result < 0){

                    throw new AusinessException(E.ADD_FAIL.getCode(), "隐患信息插入失败");

                }

                logger.info("【双重预防】隐患信息：数据处理...");

            }

        }else {

            logger.info("隐患信息数据上报已关闭");

        }









//        /**

//         * 7、检索检修记录数据

//         * */

//        //读取风险分析单元数据上报主配置信息

//        PreventReportConfig overhaulReportConfig = preventReportConfigService.getReportConfigById(SyncEnum.OVERHAUL_LOG_DANGER_INFO.getCode());

//        //如果风险事件主配置开启上报

//        if (overhaulReportConfig.getReportState().equals(SyncEnum.REPORT_ON.getCode())){

//

//            //logger.info("【##】2.检索检修记录...");

//            //查询所有 选择上报的数据 && (reportTime == null 或者 reportTime < updateReportDataTime）

//            List<PreventOverhaulLog> preventOverhaulLogList = overhaulLogService.listReportOverhaulLog();

//            //获取上报数据对象与list

//            List<PreventCJReportOverhaulLog> CJOverhaulLogLists = new ArrayList<>();

//            if (ObjectUtils.isNotEmpty(preventOverhaulLogList)){

//                //遍历，封装数据

//                for (PreventOverhaulLog preventOverhaulLog : preventOverhaulLogList) {

//                    HandlerReportParam handlerReportParam = new HandlerReportParam();

//                    PreventCJReportOverhaulLog CJOverhaulLog = new PreventCJReportOverhaulLog();

//

//                    //封装上报昌吉州检修记录数据

//                    CJOverhaulLog.setId(preventOverhaulLog.getUuid());

//                    if (preventOverhaulLog.getReportStatus().equals(SyncEnum.SYNC_EXEC_SUCCESS.getCode())){

//                        CJOverhaulLog.setDeleted("2");//数据更新状态标识，目前仅昌吉州需要 2022-08-10

//                    }else {

//                        CJOverhaulLog.setDeleted("0");

//                    }

//                    CJOverhaulLog.setCompanyCode(companyCode);

//                    CJOverhaulLog.setHazardCode(preventOverhaulLog.getHazardCode());

//                    CJOverhaulLog.setRiskUnitId(preventOverhaulLog.getRiskUnitUuid());

//                    CJOverhaulLog.setStopStartTime(preventOverhaulLog.getStopStartTime());

//                    CJOverhaulLog.setStopEndTime(preventOverhaulLog.getStopEndTime());

//                    CJOverhaulLog.setStopReason(preventOverhaulLog.getStopReason());

//                    CJOverhaulLog.setCreateBy(preventOverhaulLog.getCreateByUserName());

//                    CJOverhaulLog.setCreateDate(preventOverhaulLog.getGmtCreate());

//                    CJOverhaulLog.setUpdateBy(preventOverhaulLog.getCreateByUserName());

//                    CJOverhaulLog.setUpdateDate(preventOverhaulLog.getGmtModitify());

//                    CJOverhaulLog.setReportTime(null);

//                    CJOverhaulLog.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());

//                    CJOverhaulLog.setDataSource((byte) 1);

//

//                    //封装数据

//                    CJOverhaulLogLists.add(CJOverhaulLog);

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

//                    handlerReportParam.setId(preventOverhaulLog.getId());

//                    handlerReportParam.setReportTime(new Date());

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

//                    int result = overhaulLogService.updateOverhaulReportStatus(handlerReportParam);

//                    if (result < 1){

//                        throw new AusinessException(E.ADD_FAIL.getCode(), "检修记录数据状态修改失败");

//                    }

//                }

//            }else {

//                logger.info("【检修记录】当前无检修记录数据需要处理");

//            }

//            //写入昌吉州转换表

//            for (PreventCJReportOverhaulLog cjOverhaulLog : CJOverhaulLogLists) {

//                int result = reportOverhaulLogService.insertCJOverhaulLists(cjOverhaulLog);

//                if (result < 1){

//                    throw new AusinessException(E.ADD_FAIL.getCode(), "检修记录数据状态修改失败");

//                }

//                logger.info("【检修记录】2.检修记录CJ：数据处理...");

//            }

//            step = 3;

//        }else {

//            step = 3;

//            logger.info("检修记录数据上报已关闭");

//        }

//

















//         TODO 目前应急厅没有风险点概念，此处暂时不写。目前看，风险点概念，类似管控措施，对用某个具体的风险位置

//        /**

//         * 7、检索风险点-（可能对应风险管控措施?）数据

//         * */

//        //读取风险分析单元数据上报主配置信息

//        PreventReportConfig pointReportConfig = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_POINT_INFO.getCode());

//        //如果风险事件主配置开启上报

//        if (pointReportConfig.getReportState().equals(SyncEnum.REPORT_ON.getCode())){

//            //logger.info("【##】2.检索安全风险事件...");

//            //查询所有 选择上报的数据 && (reportTime == null 或者 reportTime < updateReportDataTime）

//            List<PreventRiskEvent> riskEvents = preventRiskEventService.listReportEvent();

//            //获取上报数据对象与list

//            List<PreventCJReportPoint> CJPointLists = new ArrayList<>();

//            if (ObjectUtils.isNotEmpty(riskEvents)){

//                //遍历，封装数据

//                for (PreventRiskEvent riskEvent : riskEvents) {

//                    String pointUuid = UUID.randomUUID().toString();

//                    HandlerReportParam handlerReportParam = new HandlerReportParam();

//                    PreventCJReportPoint CJReportPoint = new PreventCJReportPoint();

//                    //TODO 公司编码，暂时没有

//                    //封装上报昌吉州风险事件数据

//                    CJReportPoint.setId(pointUuid);

//                    CJReportPoint.setCompanyCode("test001");

//                    CJReportPoint.setDeleted(riskEvent.getDeleteStatus().toString());

//                    CJReportPoint.setCreateBy(riskEvent.getCreateByUserName());

//                    CJReportPoint.setCreateDate(riskEvent.getGmtCreate());

//                    CJReportPoint.setUpdateBy(riskEvent.getCreateByUserName());

//                    CJReportPoint.setUpdateDate(riskEvent.getGmtModitify());

//                    CJReportPoint.setRiskUnitIds();

//                    CJReportPoint.setRiskEventIds();

//                    CJReportPoint.setRiskMeasureIds();

//                    CJReportPoint.setHazardDep();

//                    CJReportPoint.setHazardLiablePerson();

//                    CJReportPoint.setHazardCode();

//                    CJReportPoint.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());

//                    CJReportPoint.setReportTime(null);

//                    CJReportPoint.setDataSource((byte) 1);

//                    CJReportPoint.setRiskEventId(riskEvent.getId());

//                    //封装数据

//                    CJPointLists.add(CJReportPoint);

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

//                    handlerReportParam.setId(riskEvent.getId());

//                    handlerReportParam.setReportTime(new Date());

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

//                    preventRiskEventService.updateEventReportStatus(handlerReportParam);

//                }

//            }else {

//                logger.info("【##】当前无安全风险事件数据需要处理");

//            }

//            //写入昌吉州转换表

//            for (PreventCJReportRiskEvent CJEvent : CJEventLists) {

//                CJEventService.insertEventLists(CJEvent);

//                logger.info("【##】2.风险分析事件CJ：数据处理...");

//            }

//            step = 3;

//        }else {

//            step = 3;

//            logger.info("安全风险事件数据上报已关闭");

//        }





    }

}

package com.ruoyi.doublePrevention.scheduls;


import com.ruoyi.doublePrevention.entity.*;
import com.ruoyi.doublePrevention.entity.CJReport.*;
import com.ruoyi.doublePrevention.enums.E;
import com.ruoyi.doublePrevention.enums.SyncEnum;
import com.ruoyi.doublePrevention.exception.AusinessException;
import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
import com.ruoyi.doublePrevention.service.baseService.*;
import com.ruoyi.project.system.dept.domain.Dept;
import com.ruoyi.project.system.dept.service.IDeptService;
import com.ruoyi.project.system.user.domain.User;
import com.ruoyi.project.system.user.service.IUserService;
import com.ruoyi.project.tr.HiddenDangerCheckJob.domain.HiddenDangerCheckJob;
import com.ruoyi.project.tr.HiddenDangerCheckJob.service.IHiddenDangerCheckJobService;
import com.ruoyi.project.tr.hiddenDangerCheck.domain.HiddenDangerCheck;
import com.ruoyi.project.tr.hiddenDangerCheck.service.IHiddenDangerCheckService;
import com.ruoyi.project.tr.hiddenDangerCheckPoint.domain.HiddenDangerCheckPoint;
import com.ruoyi.project.tr.hiddenDangerCheckPoint.service.IHiddenDangerCheckPointService;
import com.ruoyi.project.tr.riskList.domain.RiskList;
import com.ruoyi.project.tr.riskList.service.IRiskListService;
import org.apache.commons.lang3.ObjectUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;

import java.text.SimpleDateFormat;
import java.util.*;

@Component
public class SearchReportDateSchedule {

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

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

    public static SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

    @Autowired
    private PreventReportConfigService preventReportConfigService;

    @Autowired
    private PreventCJReportRiskAnaUnitService CJRiskAnaUnitService;
    @Autowired
    private PreventCJReportRiskEventService CJEventService;
    @Autowired
    private PreventCJReportRiskControlMeasureService CJMeasureService;
    @Autowired
    private PreventCJReportCheckTaskFromWorkService CJTaskFromWorkService;
    @Autowired
    private PreventCJReportCheckRecordFromTaskService CJTaskRecordService;
    @Autowired
    private PreventCJReportDangerInfoService CJDangerInfoService;
    @Autowired
    private PreventCJReportPointService CJPointService;


    @Autowired
    private IDeptService trDeptService; //部门服务
    @Autowired
    private IUserService trUserService; //用户服务

    @Autowired
    private IRiskListService trRiskAnaUnitService; //风险设备、分析单元
    @Autowired
    private PreventRiskUnitUuidService preventRiskUnitUuidService; //风险设备、分析单元附属表

    @Autowired
    private PreventRiskEventService preventRiskEventService;
    @Autowired
    private PreventRiskControlMeasureService preventRiskControlMeasureService;
    @Autowired
    private PreventRiskControlTemplateService preventRiskControlTemplateService;

    @Autowired
    private IHiddenDangerCheckJobService trHiddenDangerCheckJobService;//排查任务job
    @Autowired
    private PreventRiskJobAndMeasureService preventRiskJobAndMeasureService;//排查任务附属表

    @Autowired
    private IHiddenDangerCheckService trHiddenDangerCheckService;//排查任务记录
    @Autowired
    private PreventRiskDangerCheckLogService preventRiskDangerCheckLogService;//排查任务记录附属表

    @Autowired
    private IHiddenDangerCheckPointService trHiddenDangerCheckPointService;//隐患信息上报、整改、验收
    @Autowired
    private PreventRiskDangerInfoService preventRiskDangerInfoService;//隐患信息附属表

    @Autowired
    private PreventRiskCheckUnitService preventRiskCheckUnitService;//管控措施，任务清单对应关系。基础排查点附属表
    @Autowired
    private PreventRiskDangerCheckAndMeasureService riskDangerCheckAndMeasureService;//管控措施，任务清单对应关系。基础排查点附属表

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

    @Autowired
    private PreventOverhaulLogService overhaulLogService;
    @Autowired
    private PreventCJReportOverhaulLogService reportOverhaulLogService;


    @Transactional
    @Scheduled(cron = "0 0/10 * * * ? ")    // 分钟
//    @Scheduled(cron = "0/10 * * * * ?")  // 30秒
 //   @Scheduled(cron = "0 0/25 * * * ? ")    // 分钟
    public void searchReportDate(){

        logger.info("【双重预防】定时检索需要上报数据...");
        int step = 1;
        String companyCode = "652310082";

        /**
         * 1、检索风险分析单元
         * */
        //读取风险分析单元数据上报主配置信息
        PreventReportConfig unitReportConfig = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_RISK_ANA_UNIT.getCode());
        //如果主配置开启上报，开始
        if (unitReportConfig.getReportState().equals(SyncEnum.REPORT_ON.getCode())){

            logger.info("【##】1.检索风险分析单元...");

            //查询所有 选择上报的数据 && (reportTime == null 或者 reportTime < updateReportDataTime）
            List<PreventRiskUnitUuid> riskUnitUuidList = preventRiskUnitUuidService.listRiskAnaUnit();
            //获取上报数据list
//            List<PreventReportRiskAnaUnit> unitLists = new ArrayList<>();
            List<PreventCJReportRiskAnaUnit> CJUnitLists = new ArrayList<>();
            if (ObjectUtils.isNotEmpty(riskUnitUuidList)){
                HandlerReportParam handlerReportParam = new HandlerReportParam();
                //遍历，封装数据
                for (PreventRiskUnitUuid riskUnitUuid : riskUnitUuidList) {
                    //查询漯安表中对应数据
                    RiskList infoByRiskId = trRiskAnaUnitService.getInfoByRiskListId(riskUnitUuid.getRiskUnitId());
                    //获取上报数据对象
                    PreventCJReportRiskAnaUnit CJReportRiskAnaUnit = new PreventCJReportRiskAnaUnit();

                    //此类方法已经修改，实际使用username
                    User createUser = trUserService.getUserByLoginName(infoByRiskId.getCreateBy());
                    User updateUser = trUserService.getUserByLoginName(infoByRiskId.getUpdateBy());
                    User userById = trUserService.getUserById(infoByRiskId.getUserId());
                    Dept depById = trDeptService.getDepById(infoByRiskId.getDeptId());

                    //封装上报昌吉州的风险分析单元数据
                    CJReportRiskAnaUnit.setId(riskUnitUuid.getRiskUnitUuid());//此处封装附属表的uuid
                    CJReportRiskAnaUnit.setCompanyCode(companyCode);
                    CJReportRiskAnaUnit.setRiskUnitName(infoByRiskId.getRiskListName());
                    CJReportRiskAnaUnit.setHazardCode(infoByRiskId.getRiskListNum());
                    CJReportRiskAnaUnit.setHazardDep(depById.getDeptName());
                    CJReportRiskAnaUnit.setHazardLiablePerson(userById.getUserName());
                    CJReportRiskAnaUnit.setDeleted("0");
//                    if (riskUnitUuid.getReportStatus().equals(SyncEnum.SYNC_EXEC_SUCCESS.getCode())){
//                        CJReportRiskAnaUnit.setDeleted("2");//数据更新状态标识，目前仅昌吉州需要 2022-08-10
//                    }else {
//                        CJReportRiskAnaUnit.setDeleted(riskAnaUnit.getDeleteStatus().toString());
//                    }
                    CJReportRiskAnaUnit.setCreateBy(createUser.getUserName());
                    CJReportRiskAnaUnit.setCreateDate(infoByRiskId.getCreateTime());
                    if (ObjectUtils.isEmpty(updateUser)){
                        CJReportRiskAnaUnit.setUpdateBy(createUser.getUserName());
                        CJReportRiskAnaUnit.setUpdateDate(infoByRiskId.getUpdateTime());
                    }else {
                        CJReportRiskAnaUnit.setUpdateBy(updateUser.getUserName());
                        CJReportRiskAnaUnit.setUpdateDate(infoByRiskId.getCreateTime());
                    }
                    CJReportRiskAnaUnit.setDataSource((byte) 1);
                    CJReportRiskAnaUnit.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
                    CJReportRiskAnaUnit.setReportTime(null);
                    CJReportRiskAnaUnit.setRiskUnitId(infoByRiskId.getRiskListId());//此处封装主表的id
                    //封装数据
                    CJUnitLists.add(CJReportRiskAnaUnit);
                    //修改原始数据状态为待上传
                    handlerReportParam.setId(riskUnitUuid.getId());//此处修改的是附属表
                    handlerReportParam.setReportTime(new Date());
                    handlerReportParam.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
                    int result = preventRiskUnitUuidService.updateReportStatus(handlerReportParam);
                }
            }else {
                logger.info("【双重预防】当前无风险分析单元数据需要处理");
            }
            //写入昌吉州转换表
            for (PreventCJReportRiskAnaUnit CJUnit : CJUnitLists) {
                CJRiskAnaUnitService.insertUnitList(CJUnit);
                logger.info("【双重预防】1.风险分析单元CJ：数据处理...");
            }
            step = 2;
        }else {
            step = 2;
            logger.info("风险分析单元数据上报已关闭");
        }


        /**
         * 2、检索安全风险事件数据
         * */
        //读取风险分析单元数据上报主配置信息
        PreventReportConfig eventReportConfig = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_RISK_EVENT.getCode());
        //如果风险事件主配置开启上报
        if (eventReportConfig.getReportState().equals(SyncEnum.REPORT_ON.getCode())){

            //logger.info("【##】2.检索安全风险事件...");
            //查询所有 选择上报的数据 && (reportTime == null 或者 reportTime < updateReportDataTime）
            List<PreventRiskEvent> riskEvents = preventRiskEventService.listReportEvent();
            //获取上报数据对象与list
            List<PreventCJReportRiskEvent> CJEventLists = new ArrayList<>();
            if (ObjectUtils.isNotEmpty(riskEvents)){
                //遍历，封装数据
                for (PreventRiskEvent riskEvent : riskEvents) {
                    //String eventUuid = UUID.randomUUID().toString();
                    HandlerReportParam handlerReportParam = new HandlerReportParam();
                    PreventCJReportRiskEvent CJReportRiskEvent = new PreventCJReportRiskEvent();
                    //封装上报昌吉州风险事件数据
                    CJReportRiskEvent.setId(riskEvent.getUuid());
                    CJReportRiskEvent.setCompanyCode(companyCode);
                    if (riskEvent.getReportStatus().equals(SyncEnum.SYNC_EXEC_SUCCESS.getCode())){
                        CJReportRiskEvent.setDeleted("2");//数据更新状态标识，目前仅昌吉州需要 2022-08-10
                    }else {
                        CJReportRiskEvent.setDeleted("0");
                    }
                    CJReportRiskEvent.setCreateBy(riskEvent.getCreateByUserName());
                    CJReportRiskEvent.setCreateDate(riskEvent.getGmtCreate());
                    CJReportRiskEvent.setUpdateBy(riskEvent.getCreateByUserName());
                    CJReportRiskEvent.setUpdateDate(riskEvent.getGmtModitify());
                    CJReportRiskEvent.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
                    CJReportRiskEvent.setReportTime(null);
                    CJReportRiskEvent.setDataSource((byte) 1);
                    PreventRiskUnitUuid riskUnitUuidByUnitId = preventRiskUnitUuidService.getRiskUnitUuidByUnitId(riskEvent.getRiskUnitId());
                    CJReportRiskEvent.setRiskUnitId(riskUnitUuidByUnitId.getRiskUnitUuid());
                    CJReportRiskEvent.setRiskEventName(riskEvent.getRiskEventName());
                    CJReportRiskEvent.setRiskEventId(riskEvent.getId());
                    //封装数据
                    CJEventLists.add(CJReportRiskEvent);
                    //设置原始数据上报状态
                    handlerReportParam.setId(riskEvent.getId());
                    handlerReportParam.setReportTime(new Date());
                    handlerReportParam.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
                    preventRiskEventService.updateEventReportStatus(handlerReportParam);
                }
            }else {
                logger.info("【双重预防】当前无安全风险事件数据需要处理");
            }
            //写入昌吉州转换表
            for (PreventCJReportRiskEvent CJEvent : CJEventLists) {
                CJEventService.insertEventLists(CJEvent);
                logger.info("【双重预防】2.风险分析事件CJ：数据处理...");
            }
            step = 3;
        }else {
            step = 3;
            logger.info("安全风险事件数据上报已关闭");
        }


        /**
         * 3、检索安全风险管控措施数据
         * */
        //读取安全风险管控措施数据上报主配置信息
        PreventReportConfig measureReportConfig = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_RISK_MEASURE.getCode());
        //如果安全风险管控措施主配置开启上报
        if (measureReportConfig.getReportState().equals(SyncEnum.REPORT_ON.getCode())){
            //logger.info("{【##】3.检索安全风险管控措施...");

            //查询所有 选择上报的数据 && (reportTime == null 或者 reportTime < updateReportDataTime）
            List<PreventRiskControlMeasure> measures = preventRiskControlMeasureService.listReportMeasure();
            //获取上报数据list
            List<PreventCJReportRiskControlMeasure> CJMeasureLists = new ArrayList<>();
            HandlerReportParam handlerReportParam = new HandlerReportParam();

            if (ObjectUtils.isNotEmpty(measures)){
                //遍历，封装数据
                for (PreventRiskControlMeasure measure : measures) {
                    String measureUuid = UUID.randomUUID().toString();
                    //获取上报数据对象
                    PreventCJReportRiskControlMeasure CJReportMeasure = new PreventCJReportRiskControlMeasure();
                    //转换数据
                    PreventRiskControlTemplate controlTemplateById = preventRiskControlTemplateService.getControlTemplateById(measure.getClassify2());
                    String classify2 = measure.getClassify1() + "-" + controlTemplateById.getOrderIndex();

                    //封装上报昌吉州管控措施数据
                    CJReportMeasure.setId(measure.getUuid());
                    CJReportMeasure.setCompanyCode(companyCode);
                    if (measure.getReportStatus().equals(SyncEnum.SYNC_EXEC_SUCCESS.getCode())){
                        CJReportMeasure.setDeleted("2");//数据更新状态标识，目前仅昌吉州需要 2022-08-10
                    }else {
                        CJReportMeasure.setDeleted("0");
                    }
                    CJReportMeasure.setCreateBy(measure.getCreateByUserName());
                    CJReportMeasure.setCreateDate(measure.getGmtCreate());
                    CJReportMeasure.setUpdateBy(measure.getCreateByUserName());
                    CJReportMeasure.setUpdateDate(measure.getGmtModitify());
                    CJReportMeasure.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
                    CJReportMeasure.setReportTime(null);
                    CJReportMeasure.setDataSource((byte) 1);
                    CJReportMeasure.setRiskEventId(measure.getRiskEventUuid());
                    CJReportMeasure.setRiskMeasureDesc(measure.getMeasureDesc());
                    CJReportMeasure.setDataSrc(measure.getControlType().toString());
                    CJReportMeasure.setClassify1(measure.getClassify1().toString());
                    CJReportMeasure.setClassify2(classify2);
                    CJReportMeasure.setClassify3(measure.getClassify3());
                    CJReportMeasure.setRiskMeasureId(measure.getId());
                    CJReportMeasure.setTroubleshootContent(measure.getCheckContent());


                    //封装数据
                    CJMeasureLists.add(CJReportMeasure);
                    //设置原始数据上报状态
                    handlerReportParam.setId(measure.getId());
                    handlerReportParam.setReportTime(new Date());
                    handlerReportParam.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
                    preventRiskControlMeasureService.updateMeasureReportStatus(handlerReportParam);
                }
            }else {
                logger.info("【双重预防】当前无安全风险管控措施数据需要处理");
            }

            step = 4;

            //写入上报昌吉州转换表
            for (PreventCJReportRiskControlMeasure CJMeasure : CJMeasureLists) {
                CJMeasureService.insertMeasureList(CJMeasure);

                logger.info("【双重预防】3.安全风险管控措施CJ：数据处理...");
            }
        }else {
            step = 4;
            logger.info("安全风险管控措施数据上报已关闭");
        }

        /**
         * 4、检索 任务配置 数据 prevent_report_check_record_from_task
         * */
        //读取任务配置数据上报主配置信息
        PreventReportConfig workReportConfig = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_TASK_FROM_WORK.getCode());
        //如果任务配置主配置开启上报
        if (workReportConfig.getReportState().equals(SyncEnum.REPORT_ON.getCode())){
          //  logger.info("【##】4.检索任务配置...");
            //查询所有 选择上报的数据 && (reportTime == null 或者 reportTime < updateReportDataTime）
            List<PreventRiskJobAndMeasure> works = preventRiskJobAndMeasureService.listReportWork();
            //获取上报数据对象与list
            List<PreventCJReportCheckTaskFromWork> CJTaskFromWorkLists = new ArrayList<>();
            HandlerReportParam handlerReportParam = new HandlerReportParam();

            if (ObjectUtils.isNotEmpty(works)){
                //遍历，封装数据
                for (PreventRiskJobAndMeasure work : works) {
                    //通过work中的信息，查询主表数据
                    HiddenDangerCheckJob jobById = trHiddenDangerCheckJobService.getJobById(work.getJobId());
                    //获取数据对象
                    PreventCJReportCheckTaskFromWork CJTaskFromWork = new PreventCJReportCheckTaskFromWork();
                    //转换时间周期单位 (1小时,2日,3周,4月,5年)
                    if (jobById.getTroubleshootTypeCycleType() == 1){
                        CJTaskFromWork.setCheckCycle(Math.toIntExact(jobById.getTroubleshootTypeCycleNum()));
                        CJTaskFromWork.setCheckCycleUnit("小时");
                        CJTaskFromWork.setWorkStartTime("00:00:00");
                        CJTaskFromWork.setWorkEndTime("23:59:59");
                    }else if (jobById.getTroubleshootTypeCycleType() == 2){
                        CJTaskFromWork.setCheckCycle(Math.toIntExact(jobById.getTroubleshootTypeCycleNum()));
                        CJTaskFromWork.setCheckCycleUnit("天");
                    }else if (jobById.getTroubleshootTypeCycleType() == 3){
                        Long num = jobById.getTroubleshootTypeCycleNum() * 7;
                        CJTaskFromWork.setCheckCycle(Math.toIntExact(num));
                        CJTaskFromWork.setCheckCycleUnit("天");
                    }else if (jobById.getTroubleshootTypeCycleType() == 4){
                        CJTaskFromWork.setCheckCycle(Math.toIntExact(jobById.getTroubleshootTypeCycleNum()));
                        CJTaskFromWork.setCheckCycleUnit("月");
                    }else if (jobById.getTroubleshootTypeCycleType() == 5){
                        CJTaskFromWork.setCheckCycle(Math.toIntExact(jobById.getTroubleshootTypeCycleNum()));
                        CJTaskFromWork.setCheckCycleUnit("年");
                    }
                    //获取用户信息
                    User createUser = new User();
                    User updateUser = new User();
                    createUser = trUserService.getUserByLoginName(jobById.getCreateBy());
                    if(ObjectUtils.isEmpty(createUser)){
                        createUser = trUserService.getUserByName(jobById.getCreateBy());
                    }

                    updateUser = trUserService.getUserByLoginName(jobById.getUpdateBy());
                    if(ObjectUtils.isEmpty(updateUser)){
                        updateUser = trUserService.getUserByName(jobById.getUpdateBy());
                    }

                    //封装上报昌吉州任务配置数据
                    CJTaskFromWork.setId(work.getJobUuid());
                    CJTaskFromWork.setCompanyCode(companyCode);
                    if (work.getReportStatus().equals(SyncEnum.SYNC_EXEC_SUCCESS.getCode())){
                        CJTaskFromWork.setDeleted("2");//数据更新状态标识，目前仅昌吉州需要 2022-08-10
                    }else {
                        CJTaskFromWork.setDeleted("0");
                    }
                    CJTaskFromWork.setCreateBy(createUser.getUserName());
                    CJTaskFromWork.setCreateDate(jobById.getCreateTime());
                    if (ObjectUtils.isEmpty(updateUser)){
                        CJTaskFromWork.setUpdateBy(createUser.getUserName());
                        CJTaskFromWork.setUpdateDate(jobById.getCreateTime());
                    }else {
                        CJTaskFromWork.setUpdateBy(updateUser.getUserName());
                        CJTaskFromWork.setUpdateDate(jobById.getCreateTime());
                    }
                    CJTaskFromWork.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
                    CJTaskFromWork.setReportTime(null);
                    CJTaskFromWork.setDataSource((byte) 1);
                    CJTaskFromWork.setRiskMeasureId(work.getMeasureUuid());
                    CJTaskFromWork.setWorkId(jobById.getJobId());

                    //第二版标准新增
                    PreventRiskControlMeasure measureById = preventRiskControlMeasureService.getPreventRiskControlMeasureById(work.getMeasureId());
                    CJTaskFromWork.setTroubleshootContent(measureById.getCheckContent());
                    CJTaskFromWork.setTaskStartTime(jobById.getStartTime());

                    CJTaskFromWork.setWorkDayType("0");
                    List<PreventTaskType> typeByJobId = taskTypeService.getInfoByJobId(work.getJobId());
                    int typeTag = 0;
                    for (PreventTaskType taskType : typeByJobId) {
                        typeTag = taskType.getType();
                    }
                    if (typeTag !=0){
                        CJTaskFromWork.setTaskNum("1");
                    }
                    CJTaskFromWork.setWorkType(String.valueOf(typeTag));

                    //封装数据
                    CJTaskFromWorkLists.add(CJTaskFromWork);
                    //设置原始数据上报状态
                    handlerReportParam.setId(work.getId());
                    handlerReportParam.setReportTime(new Date());
                    handlerReportParam.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
                    preventRiskJobAndMeasureService.updateWorkReportStatus(handlerReportParam);
                }
            }else {
                logger.info("【双重预防】当前无任务配置数据需要处理");
            }
            //写入上报昌吉州数据转换表
            for (PreventCJReportCheckTaskFromWork CJTaskFromWorks : CJTaskFromWorkLists) {
                CJTaskFromWorkService.insertTaskFromWorkList(CJTaskFromWorks);
                logger.info("【双重预防】任务配置CJ：数据处理...");
            }
        }else {
            step = 5;
            logger.info("任务配置数据上报已关闭");
        }


        /**
         * 5、排查任务记录数据  PreventReportCheckRecordFromTask
         * */
        //读取安全风险管控措施数据上报主配置信息
        PreventReportConfig recordReportConfig = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG__CHECK_RECORD.getCode());
        //如果安全风险管控措施主配置开启上报
        if (recordReportConfig.getReportState().equals(SyncEnum.REPORT_ON.getCode())){

            //logger.info("【##】5.检索排查任务记录数据...");
            System.out.println("【##】5.检索排查任务记录数据...");

            //查询所有 选择上报的数据 && (reportTime == null 或者 reportTime < updateReportDataTime）
            List<PreventRiskDangerCheckLog> tasks = preventRiskDangerCheckLogService.listReportTask();
            List<Long> taskIds = new ArrayList<>();
            //获取上报数据对象
            List<PreventCJReportCheckRecordFromTask> CJRecordFromTaskLists = new ArrayList<>();
            int tag = 0;
//            HandlerReportParam handlerReportParam = new HandlerReportParam();
//            List<HandlerReportParam> handlerReportParamList = new ArrayList<>();
            if (ObjectUtils.isNotEmpty(tasks)){
                //获取信息
                List<User> allUserList = trUserService.getAllUser();
                List<PreventRiskControlMeasure> allMeasureList = preventRiskControlMeasureService.getAllMeasureList();
                List<PreventTaskType> allTaskTypeList = taskTypeService.getAllTaskTypeList();
                //遍历，封装数据
                for (PreventRiskDangerCheckLog task : tasks) {
                    //获取任务记录主表信息
                    HiddenDangerCheck hiddenDangerCheckById = trHiddenDangerCheckService.getHiddenDangerCheckById(task.getCheckId());
                    //转换检查结果
                    //如果已经执行过，进入方法
                    if (Integer.valueOf(hiddenDangerCheckById.getScheduleCheckStatus()) == 1){

                        List<HiddenDangerCheckPoint> hiddenDangerCheckPointList = trHiddenDangerCheckPointService.getHiddenDangerCheckPointByCheckId(task.getCheckId());

                        //避免个别任务无检查点的情况
                        if (ObjectUtils.isEmpty(hiddenDangerCheckPointList)) {
                            logger.info("【双重预防】排查任务记录CJ：异常，无检查点...");
                        }else {
                            for (HiddenDangerCheckPoint hiddenDangerCheckPoint : hiddenDangerCheckPointList) {
                                //获取上报数据对象
                                PreventCJReportCheckRecordFromTask CJRecordFromTask = new PreventCJReportCheckRecordFromTask();
                                CJRecordFromTask.setCheckStatus("0");// 0-正常；1-存在隐患；2-未处理；3-其他
                                if (Integer.valueOf(hiddenDangerCheckPoint.getWhetherDanger()) == 1){
                                    CJRecordFromTask.setCheckStatus("1");// 0-正常；1-存在隐患；2-未处理；3-其他
                                }

                                User createUser = new User();
                                User updateUser = new User();
//                                createUser = trUserService.getUserByLoginName(hiddenDangerCheckById.getCreateBy());
//                                if(ObjectUtils.isEmpty(createUser)){
//                                    createUser = trUserService.getUserByName(hiddenDangerCheckById.getCreateBy());
//                                }
//                                updateUser = trUserService.getUserByLoginName(hiddenDangerCheckById.getUpdateBy());


                                // todo 取出所有用户信息，再循环在匹配
                                for (User user : allUserList) {
                                    if (hiddenDangerCheckById.getCreateBy().equals(user.getLoginName())){
                                        createUser = user;
                                    }
                                    if (hiddenDangerCheckById.getUpdateBy().equals(user.getLoginName())){
                                        updateUser = user;
                                    }
                                }
                                if(ObjectUtils.isEmpty(createUser)){
                                    for (User user : allUserList) {
                                        if (hiddenDangerCheckById.getCreateBy().equals(user.getUserName())){
                                            createUser = user;
                                        }
                                    }
                                }



                                //封装上报昌吉州的任务数据
//                                String taskUuid = UUID.randomUUID().toString();
                                CJRecordFromTask.setId(UUID.randomUUID().toString());
                                CJRecordFromTask.setCompanyCode(companyCode);
                                CJRecordFromTask.setCreateBy(createUser.getUserName());
                                CJRecordFromTask.setCreateDate(hiddenDangerCheckById.getCreateTime());
                                CJRecordFromTask.setCreateByMobile(createUser.getPhonenumber());
                                if (ObjectUtils.isEmpty(updateUser)){
                                    CJRecordFromTask.setUpdateBy(createUser.getUserName());
                                    CJRecordFromTask.setUpdateDate(hiddenDangerCheckById.getCreateTime());
                                    CJRecordFromTask.setUpdateByMobile(createUser.getPhonenumber());
                                }else {
                                    CJRecordFromTask.setUpdateBy(updateUser.getUserName());
                                    CJRecordFromTask.setUpdateDate(hiddenDangerCheckById.getUpdateTime());
                                    CJRecordFromTask.setUpdateByMobile(updateUser.getPhonenumber());
                                }

                                if (task.getReportStatus().equals(SyncEnum.SYNC_EXEC_SUCCESS.getCode())){
                                    CJRecordFromTask.setDeleted("2");//数据更新状态标识，目前仅昌吉州需要 2022-08-10
                                }else {
                                    CJRecordFromTask.setDeleted("0");
                                }
                                CJRecordFromTask.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
                                CJRecordFromTask.setReportTime(null);
                                CJRecordFromTask.setDataSource((byte) 1);
                                List<PreventRiskDangerCheckAndMeasure> baseCheckPointAndMeasure = riskDangerCheckAndMeasureService.getByBaseCheckPointId(hiddenDangerCheckPoint.getCheckPointId());
                                //获取该条记录对应的管控措施id，
                                Long controlMeasureId = 1L;
                                for (PreventRiskDangerCheckAndMeasure checkAndMeasure : baseCheckPointAndMeasure) {
                                    controlMeasureId = checkAndMeasure.getControlMeasureId();
                                }
//                                //获取该条记录对应的管控措施uuid
//                                PreventRiskControlMeasure preventRiskControlMeasureById = preventRiskControlMeasureService.getPreventRiskControlMeasureById(controlMeasureId);
//                                //通过管控措施uuid ，jobId(workId)，在任务上报表中，找到任务对应的uuid
//                                PreventCJReportCheckTaskFromWork preventCJReportCheckTaskFromWork = CJTaskFromWorkService.geByMeasureUUidAndJobId(preventRiskControlMeasureById.getUuid(), task.getJobId());
//                                CJRecordFromTask.setCheckTaskId(preventCJReportCheckTaskFromWork.getId());
                                // todo 取出所有措施，再循环在匹配
                                for (PreventRiskControlMeasure measure : allMeasureList) {
                                    if (controlMeasureId.equals(measure.getId())){
                                        //通过管控措施uuid ，jobId(workId)，在任务上报表中，找到任务对应的uuid
                                        PreventCJReportCheckTaskFromWork preventCJReportCheckTaskFromWork = CJTaskFromWorkService.geByMeasureUUidAndJobId(measure.getUuid(), task.getJobId());
                                        CJRecordFromTask.setCheckTaskId(preventCJReportCheckTaskFromWork.getId());
                                    }
                                }


                                CJRecordFromTask.setCheckTime(hiddenDangerCheckById.getCheckTime());
                                CJRecordFromTask.setTaskId(task.getCheckId());
                                //第二版标准新增
                                CJRecordFromTask.setMobileCode(task.getMobileCode().toString());

                                int typeTag = 0;
//                                List<PreventTaskType> typeByJobIds = taskTypeService.getInfoByJobId(task.getJobId());
//                                for (PreventTaskType typeByJobId : typeByJobIds) {
//                                    if (typeByJobId.getType()!= 0) {
//                                        typeTag = 1;
//                                    }
//                                }

                                // todo 取出所有任务信息表，再循环在匹配
                                for (PreventTaskType taskType : allTaskTypeList) {
                                    if (taskType.getJobId().equals(task.getJobId())){
                                        if (taskType.getType()!= 0) {
                                            typeTag = 1;
                                        }
                                    }
                                }


                                CJRecordFromTask.setDefend(String.valueOf(typeTag));
                                //封装数据
                                CJRecordFromTaskLists.add(CJRecordFromTask);
                            }
                        }

                            //设置原始数据上报状态
//                            handlerReportParam.setId(task.getId());
//                            handlerReportParam.setReportTime(new Date());
//                            handlerReportParam.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
//                            handlerReportParamList.add(handlerReportParam);
//                            preventRiskDangerCheckLogService.updateTaskReportStatus(handlerReportParam);
                            int i = 1;
                        taskIds.add(task.getId());
                        tag ++;
                    }
                    System.out.println("【##】5.数据封装完成...");

                }
            }else {
                logger.info("【双重预防】当前无排查任务记录需要处理");
            }

            if (CJRecordFromTaskLists.size() > 0){
                logger.info("【双重预防】排查任务记录CJ：数据处理...");
                //设置原始数据状态
                int taskUpdateResult = preventRiskDangerCheckLogService.updateTaskReportStatusByList(taskIds);
                if (taskUpdateResult < taskIds.size()){
                    throw new AusinessException(E.ADD_FAIL.getCode(), "排查任务记录原始数据更新失败, 取消操作");
                }
                int result = CJTaskRecordService.insertRecordList(CJRecordFromTaskLists);
                if (result < CJRecordFromTaskLists.size()){
                    throw new AusinessException(E.ADD_FAIL.getCode(), "排查任务记录插入失败, 取消操作");
                }
            }
            step = 6;
        }else {
            step = 6;
            logger.info("排查任务记录数据上报已关闭");
        }


        /**
         * 6、隐患信息数据
         * */
        //读取安全风险管控措施数据上报主配置信息
        PreventReportConfig dangerReportConfig = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_DANGER_INFO.getCode());
        //如果安全风险管控措施主配置开启上报
        if (dangerReportConfig.getReportState().equals(SyncEnum.REPORT_ON.getCode())){

            //logger.info("【##】6.检索隐患数据...");

            //查询所有 选择上报的数据 && (reportTime == null 或者 reportTime < updateReportDataTime）
            List<PreventRiskDangerInfo> dangerManages = preventRiskDangerInfoService.listReportDanger();
            //获取上报数据list
            List<PreventCJReportDangerInfo> CJDangerInfoLists = new ArrayList<>();

            if (ObjectUtils.isNotEmpty(dangerManages)){
                HandlerReportParam handlerReportParam = new HandlerReportParam();
                //遍历，封装数据
                for (PreventRiskDangerInfo dangerManage : dangerManages) {

                    //获取隐患信息主表信息
                    HiddenDangerCheckPoint hiddenDanger = trHiddenDangerCheckPointService.getHiddenDangerCheckPointById(dangerManage.getDangerCheckPointId());
                    //获取上报数据对象
                    PreventCJReportDangerInfo CJDangerInfo = new PreventCJReportDangerInfo();

                    //通过用户名，获取涉及到的各位用户的真实姓名
                    User createUser = new User();
                    createUser = trUserService.getUserByLoginName(hiddenDanger.getCreateBy());
//                    createUser = trUserService.getUserByLoginName("guotai");
                    if(ObjectUtils.isEmpty(createUser)){
                        createUser = trUserService.getUserByName(hiddenDanger.getCreateBy());
                    }
                    User updateUser = trUserService.getUserByLoginName(hiddenDanger.getUpdateBy());
//                    User updateUser = trUserService.getUserByLoginName("guotai");
                    if (ObjectUtils.isNotEmpty(hiddenDanger.getRegisterUserName())){
                        User registerUser = trUserService.getUserByLoginName(hiddenDanger.getRegisterUserName());
                        //登记人信息
                        CJDangerInfo.setRegistrant(registerUser.getUserName());//登记人
                        CJDangerInfo.setRegistTime(hiddenDanger.getRegisterCreateTime());//登记时间
                    }

                    CJDangerInfo.setCost(String.valueOf(0));//初始值给0
                    if (ObjectUtils.isNotEmpty(hiddenDanger.getRectifyUserName())){
                        User rectifyUser = trUserService.getUserByLoginName(hiddenDanger.getRectifyUserName());
                        //整改人信息
                        CJDangerInfo.setLiablePerson(rectifyUser.getUserName());//整改责任人
                        CJDangerInfo.setCost(hiddenDanger.getRectifyFund());//资金
                    }

                    if (ObjectUtils.isNotEmpty(hiddenDanger.getAcceptUserName())){
                        //验收人信息
                        CJDangerInfo.setCheckAcceptPerson(hiddenDanger.getAcceptUserName());//验收人
                        CJDangerInfo.setCheckAcceptComment(hiddenDanger.getAcceptOpinion());//验收情况
                        CJDangerInfo.setCheckAcceptTime(hiddenDanger.getAcceptCreateTime());//验收时间
                    }

                    //如果排查任务正常存在，封装任务相关数据
//                    if (Integer.parseInt(hiddenDanger.getDangerSources()) != 2){
//                        HiddenDangerCheck dangerCheckById = trHiddenDangerCheckService.getHiddenDangerCheckById(hiddenDanger.getCheckId());
//
//                        PreventRiskDangerCheckLog dangerCheckLogByCheckId = preventRiskDangerCheckLogService.getByDangerCheckByCheckId(hiddenDanger.getCheckId());
//                        CJDangerInfo.setCheckRecordId(dangerCheckLogByCheckId.getUuid());//隐患排查任务记录uuid
//                        //找排查点，然后查措施
//                        PreventRiskCheckUnit unit = preventRiskCheckUnitService.getUnitByBaseCheckPointId(hiddenDanger.getCheckPointId());
//                        //查管控措施
//                        PreventRiskControlMeasure controlMeasureById = preventRiskControlMeasureService.getPreventRiskControlMeasureById(unit.getControlMeasureId());
//                        CJDangerInfo.setRiskMeasureId(controlMeasureById.getUuid());//管控措施uuid
//                        CJDangerInfo.setControlMeasures(controlMeasureById.getCheckContent());//控制措施 ,整改措施
//                    }else {
//                        CJDangerInfo.setCheckRecordId(null);
//                        CJDangerInfo.setRiskMeasureId(null);
//                    }
                    CJDangerInfo.setCheckRecordId(null);
                    CJDangerInfo.setRiskMeasureId(null);//默认无任务
                    CJDangerInfo.setDeleted("0");
                    CJDangerInfo.setId(dangerManage.getUuid());
                    CJDangerInfo.setCompanyCode(companyCode);
                    CJDangerInfo.setHazardCode(dangerManage.getHazardCode());
                    CJDangerInfo.setCreateBy(createUser.getUserName());
                    CJDangerInfo.setCreateDate(hiddenDanger.getCreateTime());

                    if (ObjectUtils.isEmpty(updateUser)){
                        CJDangerInfo.setUpdateBy(createUser.getUserName());
                        CJDangerInfo.setUpdateDate(hiddenDanger.getCreateTime());
                    }else {
                        CJDangerInfo.setUpdateBy(updateUser.getUserName());
                        CJDangerInfo.setUpdateDate(hiddenDanger.getUpdateTime());
                    }
                    // todo 2024-07-01 需要检查
                    CJDangerInfo.setHazardCategory("0");
                    if (dangerManage.getId() <= 383){
                        PreventTaskType taskTypeInfo = taskTypeService.getInfoByTaskId(dangerManage.getId());
                        int i = 1;
                        CJDangerInfo.setHazardCategory(taskTypeInfo.getType().toString());
                    }
                    CJDangerInfo.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
                    CJDangerInfo.setReportTime(null);
                    CJDangerInfo.setDataSource((byte) 1);
                    CJDangerInfo.setDangerName(hiddenDanger.getDangerName());
                    CJDangerInfo.setDangerLevel(hiddenDanger.getDangerLevel());
                    CJDangerInfo.setDangerSrc(dangerManage.getDangerSrc().toString());
                    if (hiddenDanger.getRectifyType().equals("1")){
                        CJDangerInfo.setDangerManageType("0");
                    }else {
                        CJDangerInfo.setDangerManageType("1");
                    }
                    CJDangerInfo.setDangerDesc(hiddenDanger.getDangerDescription());
                    CJDangerInfo.setDangerReason(dangerManage.getDangerReason());
                    CJDangerInfo.setDangerManageDeadline(hiddenDanger.getRectifyDeadlineTime());
                    if (ObjectUtils.isNotEmpty(dangerManage.getDangerState())){
                        CJDangerInfo.setDangerState(dangerManage.getDangerState().toString());
                    }
                    CJDangerInfo.setHazardDangerType(dangerManage.getHazardDangerType().toString());
                    CJDangerInfo.setDangerManagerId(dangerManage.getId());

                    CJDangerInfoLists.add(CJDangerInfo);
                    //设置原始数据上报状态
                    handlerReportParam.setId(dangerManage.getId());
                    handlerReportParam.setReportTime(new Date());
                    handlerReportParam.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
                    //修改隐患信息附属表状态
                    preventRiskDangerInfoService.updateDangerInfoReportStatus(handlerReportParam);
                }
            }else {
                logger.info("【双重预防】当前无隐患信息需要处理");
            }

            //插入上报昌吉州转换表
            for (PreventCJReportDangerInfo CJDanger : CJDangerInfoLists) {
                logger.info("【双重预防】隐患信息插入...");
                int result = CJDangerInfoService.insert(CJDanger);
                if (result < 0){
                    throw new AusinessException(E.ADD_FAIL.getCode(), "隐患信息插入失败");
                }
                logger.info("【双重预防】隐患信息：数据处理...");
            }
        }else {
            logger.info("隐患信息数据上报已关闭");
        }




//        /**
//         * 7、检索检修记录数据
//         * */
//        //读取风险分析单元数据上报主配置信息
//        PreventReportConfig overhaulReportConfig = preventReportConfigService.getReportConfigById(SyncEnum.OVERHAUL_LOG_DANGER_INFO.getCode());
//        //如果风险事件主配置开启上报
//        if (overhaulReportConfig.getReportState().equals(SyncEnum.REPORT_ON.getCode())){
//
//            //logger.info("【##】2.检索检修记录...");
//            //查询所有 选择上报的数据 && (reportTime == null 或者 reportTime < updateReportDataTime）
//            List<PreventOverhaulLog> preventOverhaulLogList = overhaulLogService.listReportOverhaulLog();
//            //获取上报数据对象与list
//            List<PreventCJReportOverhaulLog> CJOverhaulLogLists = new ArrayList<>();
//            if (ObjectUtils.isNotEmpty(preventOverhaulLogList)){
//                //遍历，封装数据
//                for (PreventOverhaulLog preventOverhaulLog : preventOverhaulLogList) {
//                    HandlerReportParam handlerReportParam = new HandlerReportParam();
//                    PreventCJReportOverhaulLog CJOverhaulLog = new PreventCJReportOverhaulLog();
//
//                    //封装上报昌吉州检修记录数据
//                    CJOverhaulLog.setId(preventOverhaulLog.getUuid());
//                    if (preventOverhaulLog.getReportStatus().equals(SyncEnum.SYNC_EXEC_SUCCESS.getCode())){
//                        CJOverhaulLog.setDeleted("2");//数据更新状态标识，目前仅昌吉州需要 2022-08-10
//                    }else {
//                        CJOverhaulLog.setDeleted("0");
//                    }
//                    CJOverhaulLog.setCompanyCode(companyCode);
//                    CJOverhaulLog.setHazardCode(preventOverhaulLog.getHazardCode());
//                    CJOverhaulLog.setRiskUnitId(preventOverhaulLog.getRiskUnitUuid());
//                    CJOverhaulLog.setStopStartTime(preventOverhaulLog.getStopStartTime());
//                    CJOverhaulLog.setStopEndTime(preventOverhaulLog.getStopEndTime());
//                    CJOverhaulLog.setStopReason(preventOverhaulLog.getStopReason());
//                    CJOverhaulLog.setCreateBy(preventOverhaulLog.getCreateByUserName());
//                    CJOverhaulLog.setCreateDate(preventOverhaulLog.getGmtCreate());
//                    CJOverhaulLog.setUpdateBy(preventOverhaulLog.getCreateByUserName());
//                    CJOverhaulLog.setUpdateDate(preventOverhaulLog.getGmtModitify());
//                    CJOverhaulLog.setReportTime(null);
//                    CJOverhaulLog.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
//                    CJOverhaulLog.setDataSource((byte) 1);
//
//                    //封装数据
//                    CJOverhaulLogLists.add(CJOverhaulLog);
//                    //设置原始数据上报状态
//                    handlerReportParam.setId(preventOverhaulLog.getId());
//                    handlerReportParam.setReportTime(new Date());
//                    handlerReportParam.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
//                    int result = overhaulLogService.updateOverhaulReportStatus(handlerReportParam);
//                    if (result < 1){
//                        throw new AusinessException(E.ADD_FAIL.getCode(), "检修记录数据状态修改失败");
//                    }
//                }
//            }else {
//                logger.info("【检修记录】当前无检修记录数据需要处理");
//            }
//            //写入昌吉州转换表
//            for (PreventCJReportOverhaulLog cjOverhaulLog : CJOverhaulLogLists) {
//                int result = reportOverhaulLogService.insertCJOverhaulLists(cjOverhaulLog);
//                if (result < 1){
//                    throw new AusinessException(E.ADD_FAIL.getCode(), "检修记录数据状态修改失败");
//                }
//                logger.info("【检修记录】2.检修记录CJ：数据处理...");
//            }
//            step = 3;
//        }else {
//            step = 3;
//            logger.info("检修记录数据上报已关闭");
//        }
//








//         TODO 目前应急厅没有风险点概念，此处暂时不写。目前看，风险点概念，类似管控措施，对用某个具体的风险位置
//        /**
//         * 7、检索风险点-（可能对应风险管控措施?）数据
//         * */
//        //读取风险分析单元数据上报主配置信息
//        PreventReportConfig pointReportConfig = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_POINT_INFO.getCode());
//        //如果风险事件主配置开启上报
//        if (pointReportConfig.getReportState().equals(SyncEnum.REPORT_ON.getCode())){
//            //logger.info("【##】2.检索安全风险事件...");
//            //查询所有 选择上报的数据 && (reportTime == null 或者 reportTime < updateReportDataTime）
//            List<PreventRiskEvent> riskEvents = preventRiskEventService.listReportEvent();
//            //获取上报数据对象与list
//            List<PreventCJReportPoint> CJPointLists = new ArrayList<>();
//            if (ObjectUtils.isNotEmpty(riskEvents)){
//                //遍历，封装数据
//                for (PreventRiskEvent riskEvent : riskEvents) {
//                    String pointUuid = UUID.randomUUID().toString();
//                    HandlerReportParam handlerReportParam = new HandlerReportParam();
//                    PreventCJReportPoint CJReportPoint = new PreventCJReportPoint();
//                    //TODO 公司编码，暂时没有
//                    //封装上报昌吉州风险事件数据
//                    CJReportPoint.setId(pointUuid);
//                    CJReportPoint.setCompanyCode("test001");
//                    CJReportPoint.setDeleted(riskEvent.getDeleteStatus().toString());
//                    CJReportPoint.setCreateBy(riskEvent.getCreateByUserName());
//                    CJReportPoint.setCreateDate(riskEvent.getGmtCreate());
//                    CJReportPoint.setUpdateBy(riskEvent.getCreateByUserName());
//                    CJReportPoint.setUpdateDate(riskEvent.getGmtModitify());
//                    CJReportPoint.setRiskUnitIds();
//                    CJReportPoint.setRiskEventIds();
//                    CJReportPoint.setRiskMeasureIds();
//                    CJReportPoint.setHazardDep();
//                    CJReportPoint.setHazardLiablePerson();
//                    CJReportPoint.setHazardCode();
//                    CJReportPoint.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
//                    CJReportPoint.setReportTime(null);
//                    CJReportPoint.setDataSource((byte) 1);
//                    CJReportPoint.setRiskEventId(riskEvent.getId());
//                    //封装数据
//                    CJPointLists.add(CJReportPoint);
//                    //设置原始数据上报状态
//                    handlerReportParam.setId(riskEvent.getId());
//                    handlerReportParam.setReportTime(new Date());
//                    handlerReportParam.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
//                    preventRiskEventService.updateEventReportStatus(handlerReportParam);
//                }
//            }else {
//                logger.info("【##】当前无安全风险事件数据需要处理");
//            }
//            //写入昌吉州转换表
//            for (PreventCJReportRiskEvent CJEvent : CJEventLists) {
//                CJEventService.insertEventLists(CJEvent);
//                logger.info("【##】2.风险分析事件CJ：数据处理...");
//            }
//            step = 3;
//        }else {
//            step = 3;
//            logger.info("安全风险事件数据上报已关闭");
//        }


    }
}

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

@@ -1,184 +1,184 @@
package com.ruoyi.doublePrevention.service;



import com.ruoyi.doublePrevention.entity.*;

import com.ruoyi.doublePrevention.entity.dto.req.*;

import com.ruoyi.doublePrevention.entity.dto.resp.*;

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

import com.ruoyi.doublePrevention.vo.ResultVO;

import com.ruoyi.project.tr.HiddenDangerCheckJob.domain.HiddenDangerCheckJob;

import com.ruoyi.project.tr.hiddenDangerCheck.domain.HiddenDangerCheck;

import com.ruoyi.project.tr.hiddenDangerCheckPoint.domain.HiddenDangerCheckPoint;



import java.util.List;



public interface RiskService {

    /**

     * 为设施设备清单附属表添加uuid

     * */

    int insertRiskUnitUuid(Long id);

    /**

     * 修改风险清单附属表

     */

    int updateRiskUnit(Long riskListId);

    /**

     * 删除附属表信息

     */

    int deleteRiskUnit(String ids);

    /**

     * 风险事件-新增

     */

    ResultVO<PreventRiskEvent> saveRiskEvent(PreventRiskEventSaveReqDTO riskEventSaveReqDTO);



    /**

     * @description 风险事件-删除

     */

    ResultVO<PreventRiskEvent> deleteRiskEvent(PreventRiskEventDeleteReqDTO riskEventDeleteReqDTO);



    /**

     * 风险事件-修改

     */

    ResultVO<PreventRiskEvent> updateRiskEvent(PreventRiskEventUpdateReqDTO riskEventUpdateReqDTO);



    /**

     * @description 根据风险事件的id查询风险事件

     */

    ResultVO<PreventRiskEventRespDTO> getRiskEventById(PreventRiskEventGetReqDTO riskEventGetReqDTO);



    /**

     * 风险事件-分页查询

     */

    ResultVO<List<PreventRiskEventPageQueryRespDTO>> listRiskEventPage(PreventRiskEventPageQueryReqDTO riskEventQueryReqDTO);



    /**

     * @description 获取所有风险事件不分页

     */

    ResultVO<List<PreventRiskEventListQueryRespDTO>> listRiskEvent();



    /**

     * @description 新增管控措施

     */

    ResultVO<PreventRiskControlMeasure> saveRiskControlMeasure(PreventRiskControlMeasureSaveReqDTO measureSaveReqDTO);



    /**

     * 管控措施- 获取管控措施模板

     */

    ResultVO<List<PreventRiskMeasureTemplatesListQueryRespDTO>> listMeasureTemplates();



    /**

     * 管控措施-删除

     */

    ResultVO<PreventRiskControlMeasure> deleteRiskControlMeasure(PreventRiskControlMeasureDeleteReqDTO measureDeleteReqDTO);



    /**

     * @description 根据风险措施id查询风险措施

     */

    ResultVO<PreventRiskControlMeasureRespDTO> getRiskControlMeasure(PreventRiskControlMeasureGetReqDTO riskControlMeasureGetReqDTO);



    /**

     * 管控措施-修改

     */

    ResultVO<PreventRiskControlMeasure> updateRiskControlMeasure(PreventRiskControlMeasureUpdateReqDTO measureUpdateReqDTO);



    /**

     * 管控措施-分页查询

     */

    ResultVO<List<PreventRiskControlMeasurePageQueryRespDTO>> getRiskControlMeasurePage(PreventRiskControlMeasureQueryReqDTO measureQueryReqDTO);

    /**

     * 查询管控措施 by 基础排查清单ID

     */

    List<PreventRiskControlMeasure> getRiskControlMeasureByRiskId(Long riskListId);

    /**

     * 保存原检查点与管控措施的对应关系

     */

    int insertPointAndMeasure(PreventPointAndMeasureParams pointAndMeasureParams);

    /**

     * 删除原检查点与管控措施的对应关系

     */

    int deletePointAndMeasure(String ids);

    /**

     * 保存job管控措施的附属表

     */

    int insertJobAndMeasure(Long jobId, HiddenDangerCheckJob hiddenDangerCheckJob);

    /**

     * 修改job管控措施的附属表

     */

    int updateJobAndMeasure(HiddenDangerCheckJob hiddenDangerCheckJob);

    /**

     * 删除job管控措施的附属表

     */

    int deleteJobAndMeasure(String ids);

    /**

     * 查询Job与措施

     */

    PreventRiskJobAndMeasure getJobAndMeasure(Long jobId);

    /**

     * 定时生成排查任务记录时，

     * 插入排查记录附属表

     */

    int insertDangerCheckLog(Long checkId, HiddenDangerCheck hdc);

    /**

     * 定时生成排查任务记录时，

     * 插入检查点附属表

     */

    int insertCheckAndMeasure(Long id, HiddenDangerCheckPoint hdcp);

    /**

     * 删除定时核查任务

     * */

    int deleteDangerCheck(String ids);



    /**

     * 新增隐患上报

     * */

    int insertDangerInfo(Long id, HiddenDangerCheckPoint hdcp);

    /**

     * 修改隐患上报

     * */

    int updateDangerInfo(HiddenDangerCheckPoint hiddenDangerCheckPoint);

    /**

     * 删除隐患上报

     */

    int deleteDangerInfo(Long id);



    /**

     * 隐患判定，如果是隐患，修改为整改中

     */

    int updateDangerInfoJudge(HiddenDangerCheckPoint hiddenDangerCheckPoint);

    /**

     * 隐患整改信息 - 修改

     */

    int updateDangerInfoRectify(HiddenDangerCheckPoint hiddenDangerCheckPoint);

    /**

     * 隐患验收 - 保存验收信息

     */

    int updateDangerInfoAccept(HiddenDangerCheckPoint hiddenDangerCheckPoint);

//    /**

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

//     * */

//    int insertAllDangerInfo(Long id, HiddenDangerCheckPoint hdcp);



    /**

     * @description 获取所有的风险分析单元的编码和姓名

     */

    List<PreventRiskUnitCodeAndNameListQueryRespDTO> listRiskUnitCodeAndName();



    /**

     * 管控措施-不分页查询

     */

    ResultVO<List<PreventRiskControlMeasureListQueryRespDTO>> listRiskControlMeasure();

    /**

     * 通过排查点，查找管控措施id

     */

    PreventRiskCheckUnit getRiskControlMeasureByCheckPointId(Long checkPointId);

    /**

     * 查询管控措施信息

     */

    PreventRiskControlMeasure getRiskControlMeasureInfo(Long checkPointId);

    /**

     * 查询隐患附属表信息

     */

    PreventRiskDangerInfo getDangerInfoById(Long id);



    int updateCheckLog(Long checkId, HiddenDangerCheckPoint hdcp);



    PreventRiskDangerInfo getDangerInfoByDangerCheckPointId(Long checkId);

}

package com.ruoyi.doublePrevention.service;

import com.ruoyi.doublePrevention.entity.*;
import com.ruoyi.doublePrevention.entity.dto.req.*;
import com.ruoyi.doublePrevention.entity.dto.resp.*;
import com.ruoyi.doublePrevention.repository.param.PreventPointAndMeasureParams;
import com.ruoyi.doublePrevention.vo.ResultVO;
import com.ruoyi.project.tr.HiddenDangerCheckJob.domain.HiddenDangerCheckJob;
import com.ruoyi.project.tr.hiddenDangerCheck.domain.HiddenDangerCheck;
import com.ruoyi.project.tr.hiddenDangerCheckPoint.domain.HiddenDangerCheckPoint;

import java.util.List;

public interface RiskService {
    /**
     * 为设施设备清单附属表添加uuid
     * */
    int insertRiskUnitUuid(Long id);
    /**
     * 修改风险清单附属表
     */
    int updateRiskUnit(Long riskListId);
    /**
     * 删除附属表信息
     */
    int deleteRiskUnit(String ids);
    /**
     * 风险事件-新增
     */
    ResultVO<PreventRiskEvent> saveRiskEvent(PreventRiskEventSaveReqDTO riskEventSaveReqDTO);

    /**
     * @description 风险事件-删除
     */
    ResultVO<PreventRiskEvent> deleteRiskEvent(PreventRiskEventDeleteReqDTO riskEventDeleteReqDTO);

    /**
     * 风险事件-修改
     */
    ResultVO<PreventRiskEvent> updateRiskEvent(PreventRiskEventUpdateReqDTO riskEventUpdateReqDTO);

    /**
     * @description 根据风险事件的id查询风险事件
     */
    ResultVO<PreventRiskEventRespDTO> getRiskEventById(PreventRiskEventGetReqDTO riskEventGetReqDTO);

    /**
     * 风险事件-分页查询
     */
    ResultVO<List<PreventRiskEventPageQueryRespDTO>> listRiskEventPage(PreventRiskEventPageQueryReqDTO riskEventQueryReqDTO);

    /**
     * @description 获取所有风险事件不分页
     */
    ResultVO<List<PreventRiskEventListQueryRespDTO>> listRiskEvent();

    /**
     * @description 新增管控措施
     */
    ResultVO<PreventRiskControlMeasure> saveRiskControlMeasure(PreventRiskControlMeasureSaveReqDTO measureSaveReqDTO);

    /**
     * 管控措施- 获取管控措施模板
     */
    ResultVO<List<PreventRiskMeasureTemplatesListQueryRespDTO>> listMeasureTemplates();

    /**
     * 管控措施-删除
     */
    ResultVO<PreventRiskControlMeasure> deleteRiskControlMeasure(PreventRiskControlMeasureDeleteReqDTO measureDeleteReqDTO);

    /**
     * @description 根据风险措施id查询风险措施
     */
    ResultVO<PreventRiskControlMeasureRespDTO> getRiskControlMeasure(PreventRiskControlMeasureGetReqDTO riskControlMeasureGetReqDTO);

    /**
     * 管控措施-修改
     */
    ResultVO<PreventRiskControlMeasure> updateRiskControlMeasure(PreventRiskControlMeasureUpdateReqDTO measureUpdateReqDTO);

    /**
     * 管控措施-分页查询
     */
    ResultVO<List<PreventRiskControlMeasurePageQueryRespDTO>> getRiskControlMeasurePage(PreventRiskControlMeasureQueryReqDTO measureQueryReqDTO);
    /**
     * 查询管控措施 by 基础排查清单ID
     */
    List<PreventRiskControlMeasure> getRiskControlMeasureByRiskId(Long riskListId);
    /**
     * 保存原检查点与管控措施的对应关系
     */
    int insertPointAndMeasure(PreventPointAndMeasureParams pointAndMeasureParams);
    /**
     * 删除原检查点与管控措施的对应关系
     */
    int deletePointAndMeasure(String ids);
    /**
     * 保存job管控措施的附属表
     */
    int insertJobAndMeasure(Long jobId, HiddenDangerCheckJob hiddenDangerCheckJob);
    /**
     * 修改job管控措施的附属表
     */
    int updateJobAndMeasure(HiddenDangerCheckJob hiddenDangerCheckJob);
    /**
     * 删除job管控措施的附属表
     */
    int deleteJobAndMeasure(String ids);
    /**
     * 查询Job与措施
     */
    PreventRiskJobAndMeasure getJobAndMeasure(Long jobId);
    /**
     * 定时生成排查任务记录时，
     * 插入排查记录附属表
     */
    int insertDangerCheckLog(Long checkId, HiddenDangerCheck hdc);
    /**
     * 定时生成排查任务记录时，
     * 插入检查点附属表
     */
    int insertCheckAndMeasure(Long id, HiddenDangerCheckPoint hdcp);
    /**
     * 删除定时核查任务
     * */
    int deleteDangerCheck(String ids);

    /**
     * 新增隐患上报
     * */
    int insertDangerInfo(Long id, HiddenDangerCheckPoint hdcp);
    /**
     * 修改隐患上报
     * */
    int updateDangerInfo(HiddenDangerCheckPoint hiddenDangerCheckPoint);
    /**
     * 删除隐患上报
     */
    int deleteDangerInfo(Long id);

    /**
     * 隐患判定，如果是隐患，修改为整改中
     */
    int updateDangerInfoJudge(HiddenDangerCheckPoint hiddenDangerCheckPoint);
    /**
     * 隐患整改信息 - 修改
     */
    int updateDangerInfoRectify(HiddenDangerCheckPoint hiddenDangerCheckPoint);
    /**
     * 隐患验收 - 保存验收信息
     */
    int updateDangerInfoAccept(HiddenDangerCheckPoint hiddenDangerCheckPoint);
//    /**
//     * 全流程隐患上报-附属表信息插入
//     * */
//    int insertAllDangerInfo(Long id, HiddenDangerCheckPoint hdcp);

    /**
     * @description 获取所有的风险分析单元的编码和姓名
     */
    List<PreventRiskUnitCodeAndNameListQueryRespDTO> listRiskUnitCodeAndName();

    /**
     * 管控措施-不分页查询
     */
    ResultVO<List<PreventRiskControlMeasureListQueryRespDTO>> listRiskControlMeasure();
    /**
     * 通过排查点，查找管控措施id
     */
    PreventRiskCheckUnit getRiskControlMeasureByCheckPointId(Long checkPointId);
    /**
     * 查询管控措施信息
     */
    PreventRiskControlMeasure getRiskControlMeasureInfo(Long checkPointId);
    /**
     * 查询隐患附属表信息
     */
    PreventRiskDangerInfo getDangerInfoById(Long id);

    int updateCheckLog(Long checkId, HiddenDangerCheckPoint hdcp);

    PreventRiskDangerInfo getDangerInfoByDangerCheckPointId(Long checkId);
}

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

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



import com.baomidou.mybatisplus.extension.service.IService;

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

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

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

import io.lettuce.core.dynamic.annotation.Param;



import java.util.List;



public interface PreventCJReportCheckRecordFromTaskService extends IService<PreventCJReportCheckRecordFromTask> {

    /**

     * 插入任务记录

     * */

    int insert(PreventCJReportCheckRecordFromTask recordFromTasks);

    /**

     * 插入任务记录

     * */

    int insertRecordList(@Param(value="list") List<PreventCJReportCheckRecordFromTask> recordFromTaskList);

//    /**

//     * 任务记录-分页查询

//     * */

//    IPage<PreventCJReportCheckRecordFromTask> getReportTaskFromWorkPage(Page<Object> objectPage, PreventReportCheckRecordFromTaskReqDTO queryReqDTO);

    /**

     * 任务-查询待上报

     * */

    List<PreventCJReportCheckRecordFromTask> listReportTaskRecordDate();

    /**PreventReportBatchService

     * 任务-待上报状态变更

     * */

    void updateTaskReportStatus(HandlerReportParam handlerReportParam);

    /**

     * 任务-待上报状态变更 - 通过id

     * */

    void updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);



    void updateCJReportStatusBatchById(List<PreventCJReportCheckRecordFromTask> cjRecordFromTasks);

}

package com.ruoyi.doublePrevention.service.baseService;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportCheckRecordFromTask;
import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam;
import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
import io.lettuce.core.dynamic.annotation.Param;

import java.util.List;

public interface PreventCJReportCheckRecordFromTaskService extends IService<PreventCJReportCheckRecordFromTask> {
    /**
     * 插入任务记录
     * */
    int insert(PreventCJReportCheckRecordFromTask recordFromTasks);
    /**
     * 插入任务记录
     * */
    int insertRecordList(@Param(value="list") List<PreventCJReportCheckRecordFromTask> recordFromTaskList);
//    /**
//     * 任务记录-分页查询
//     * */
//    IPage<PreventCJReportCheckRecordFromTask> getReportTaskFromWorkPage(Page<Object> objectPage, PreventReportCheckRecordFromTaskReqDTO queryReqDTO);
    /**
     * 任务-查询待上报
     * */
    List<PreventCJReportCheckRecordFromTask> listReportTaskRecordDate();
    /**PreventReportBatchService
     * 任务-待上报状态变更
     * */
    void updateTaskReportStatus(HandlerReportParam handlerReportParam);
    /**
     * 任务-待上报状态变更 - 通过id
     * */
    void updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);

    void updateCJReportStatusBatchById(List<PreventCJReportCheckRecordFromTask> cjRecordFromTasks);
}

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

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



import com.baomidou.mybatisplus.extension.service.IService;

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

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

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



import java.util.List;



public interface PreventCJReportCheckTaskFromWorkService extends IService<PreventCJReportCheckTaskFromWork> {



//    /**

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

//     */

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

    /**

     * 插入数据

     * */

    int insertTaskFromWorkList(PreventCJReportCheckTaskFromWork taskFromWorkList);

    /**

     * 任务配置 -查询待上报

     * */

    List<PreventCJReportCheckTaskFromWork> listReportTaskFromWorkDate();

    /**

     * 任务配置 -待上报状态变更

     * */

    void updateWorkReportStatus(HandlerReportParam handlerReportParam);

    /**

     * 任务配置 -待上报状态变更 -通过id

     * */

    void updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);



    PreventCJReportCheckTaskFromWork geByMeasureUUidAndJobId(String uuid, Long jobId);



    List<PreventCJReportCheckTaskFromWork>  listWork();



    int updateInfo(PreventCJReportCheckTaskFromWork work);



    List<PreventCJReportCheckTaskFromWork> listWork1();



    int updateInfo1(PreventCJReportCheckTaskFromWork work);

}

package com.ruoyi.doublePrevention.service.baseService;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportCheckTaskFromWork;
import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam;
import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;

import java.util.List;

public interface PreventCJReportCheckTaskFromWorkService extends IService<PreventCJReportCheckTaskFromWork> {

//    /**
//     * 上报数据-任务配置-分页查询
//     */
//    IPage<PreventCJReportCheckTaskFromWork> getReportTaskFromWorkPage(Page<Object> objectPage, PreventReportCheckTaskFromWorkReqDTO queryReqDTO);
    /**
     * 插入数据
     * */
    int insertTaskFromWorkList(PreventCJReportCheckTaskFromWork taskFromWorkList);
    /**
     * 任务配置 -查询待上报
     * */
    List<PreventCJReportCheckTaskFromWork> listReportTaskFromWorkDate();
    /**
     * 任务配置 -待上报状态变更
     * */
    void updateWorkReportStatus(HandlerReportParam handlerReportParam);
    /**
     * 任务配置 -待上报状态变更 -通过id
     * */
    void updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);

    PreventCJReportCheckTaskFromWork geByMeasureUUidAndJobId(String uuid, Long jobId);

    List<PreventCJReportCheckTaskFromWork>  listWork();

    int updateInfo(PreventCJReportCheckTaskFromWork work);

    List<PreventCJReportCheckTaskFromWork> listWork1();

    int updateInfo1(PreventCJReportCheckTaskFromWork work);
}

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

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



import com.baomidou.mybatisplus.extension.service.IService;

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



public interface PreventCJReportConfigLogService extends IService<PreventCJReportConfigLog> {

//    /**

//     * 保存修改记录

//     * */

//    int insertOldReportConfig(PreventReportConfigLog preventReportConfigLog);

//

//    /**

//     * 数据上报配置历史记录-查询

//     */

//    IPage<PreventCJReportConfigLog> getReportConfigLogPage(Page<Object> objectPage, PreventReportConfigLogQueryReqDTO queryReqDTO);

}

package com.ruoyi.doublePrevention.service.baseService;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportConfigLog;

public interface PreventCJReportConfigLogService extends IService<PreventCJReportConfigLog> {
//    /**
//     * 保存修改记录
//     * */
//    int insertOldReportConfig(PreventReportConfigLog preventReportConfigLog);
//
//    /**
//     * 数据上报配置历史记录-查询
//     */
//    IPage<PreventCJReportConfigLog> getReportConfigLogPage(Page<Object> objectPage, PreventReportConfigLogQueryReqDTO queryReqDTO);
}

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

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



import com.baomidou.mybatisplus.extension.service.IService;

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

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



import java.util.List;



public interface PreventCJReportConfigService extends IService<PreventCJReportConfig> {



//    /**

//     * 数据上报配置-查询

//     */

//    List<PreventCJReportConfig> ListReportConfigs();

    /**

     * 数据上报配置-修改

     */

    int updateReportConfig(PreventReportConfigUpdateParams updateParams);

    /**

     * 数据上报配置-按照id查询

     */

    PreventCJReportConfig getReportConfigById(int Id);

}

package com.ruoyi.doublePrevention.service.baseService;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportConfig;
import com.ruoyi.doublePrevention.repository.param.PreventReportConfigUpdateParams;

import java.util.List;

public interface PreventCJReportConfigService extends IService<PreventCJReportConfig> {

//    /**
//     * 数据上报配置-查询
//     */
//    List<PreventCJReportConfig> ListReportConfigs();
    /**
     * 数据上报配置-修改
     */
    int updateReportConfig(PreventReportConfigUpdateParams updateParams);
    /**
     * 数据上报配置-按照id查询
     */
    PreventCJReportConfig getReportConfigById(int Id);
}

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

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



import com.baomidou.mybatisplus.extension.service.IService;

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

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

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



import java.util.List;



public interface PreventCJReportDangerInfoService extends IService<PreventCJReportDangerInfo> {

    /**

     * 插入隐患信息

     * */

    int insert(PreventCJReportDangerInfo danger);

//    /**

//     * 上报数据-隐患信息-分页查询

//     */

//    IPage<PreventCJReportDangerInfo> getReportDangerInfoPage(Page<Object> objectPage, PreventReportDangerInfoReqDTO queryReqDTO);

    /**

     * 上报数据-待上报数据查询

     */

    List<PreventCJReportDangerInfo> listReportDangerDate();

    /**

     * 上报数据-待上报状态变更

     */

    void updateTaskReportStatus(HandlerReportParam handlerReportParam);

    /**

     * 上报数据-待上报状态变更-通过id

     */

    void updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);



    List<PreventCJReportDangerInfo> getDangerListForCheckTask();

}

package com.ruoyi.doublePrevention.service.baseService;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportDangerInfo;
import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam;
import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;

import java.util.List;

public interface PreventCJReportDangerInfoService extends IService<PreventCJReportDangerInfo> {
    /**
     * 插入隐患信息
     * */
    int insert(PreventCJReportDangerInfo danger);
//    /**
//     * 上报数据-隐患信息-分页查询
//     */
//    IPage<PreventCJReportDangerInfo> getReportDangerInfoPage(Page<Object> objectPage, PreventReportDangerInfoReqDTO queryReqDTO);
    /**
     * 上报数据-待上报数据查询
     */
    List<PreventCJReportDangerInfo> listReportDangerDate();
    /**
     * 上报数据-待上报状态变更
     */
    void updateTaskReportStatus(HandlerReportParam handlerReportParam);
    /**
     * 上报数据-待上报状态变更-通过id
     */
    void updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);

    List<PreventCJReportDangerInfo> getDangerListForCheckTask();
}

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

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



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

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



import java.util.List;



public interface PreventCJReportOverhaulLogService {



    int insertCJOverhaulLists(PreventCJReportOverhaulLog cjOverhaulLog);



    List<PreventCJReportOverhaulLog> listReportOverhaulDate();



    int updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);

}

package com.ruoyi.doublePrevention.service.baseService;

import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportOverhaulLog;
import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam;

import java.util.List;

public interface PreventCJReportOverhaulLogService {

    int insertCJOverhaulLists(PreventCJReportOverhaulLog cjOverhaulLog);

    List<PreventCJReportOverhaulLog> listReportOverhaulDate();

    int updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);
}

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

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



import com.baomidou.mybatisplus.extension.service.IService;

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



public interface PreventCJReportPointService  extends IService<PreventCJReportPoint> {

}

package com.ruoyi.doublePrevention.service.baseService;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportPoint;

public interface PreventCJReportPointService  extends IService<PreventCJReportPoint> {
}

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

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



import com.baomidou.mybatisplus.extension.service.IService;

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



public interface PreventCJReportResultDataService extends IService<PreventCJReportResultData> {

}

package com.ruoyi.doublePrevention.service.baseService;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportResultData;

public interface PreventCJReportResultDataService extends IService<PreventCJReportResultData> {
}

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

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



import com.baomidou.mybatisplus.extension.service.IService;

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

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

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



import java.util.List;



public interface PreventCJReportRiskAnaUnitService extends IService<PreventCJReportRiskAnaUnit> {



//    /**

//     * 上报数据-风险分析单元-分页查询

//     */

//    IPage<PreventCJReportRiskAnaUnit> getReportRiskUnitPage(Page<Object> objectPage, PreReportRiskUnitQueryReqDTO queryReqDTO);

    /**

     * 上报数据-插入

     */

    int insertUnitList(PreventCJReportRiskAnaUnit unitList);

    /**

     * 上报数据-查询待上报数据

     */

    List<PreventCJReportRiskAnaUnit> listReportUnitDate();

    /**

     * 上报数据-修改待上报

     */

    void updateReportStatus(HandlerReportParam handlerReportParam);

    /**

     * 上报数据-修改待上报-通过id

     */

    void updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);

}

package com.ruoyi.doublePrevention.service.baseService;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportRiskAnaUnit;
import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam;
import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;

import java.util.List;

public interface PreventCJReportRiskAnaUnitService extends IService<PreventCJReportRiskAnaUnit> {

//    /**
//     * 上报数据-风险分析单元-分页查询
//     */
//    IPage<PreventCJReportRiskAnaUnit> getReportRiskUnitPage(Page<Object> objectPage, PreReportRiskUnitQueryReqDTO queryReqDTO);
    /**
     * 上报数据-插入
     */
    int insertUnitList(PreventCJReportRiskAnaUnit unitList);
    /**
     * 上报数据-查询待上报数据
     */
    List<PreventCJReportRiskAnaUnit> listReportUnitDate();
    /**
     * 上报数据-修改待上报
     */
    void updateReportStatus(HandlerReportParam handlerReportParam);
    /**
     * 上报数据-修改待上报-通过id
     */
    void updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);
}

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

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



import com.baomidou.mybatisplus.extension.service.IService;

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

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

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



import java.util.List;



public interface PreventCJReportRiskControlMeasureService extends IService<PreventCJReportRiskControlMeasure> {



//    /**

//     * 上报数据-管控措施-分页查询

//     */

//    IPage<PreventCJReportRiskControlMeasure> getReportMeasurePage(Page<Object> objectPage, PreventReportRiskControlMeasureReqDTO queryReqDTO);

    /**

     * 插入

     * */

    int insertMeasureList(PreventCJReportRiskControlMeasure CJMeasure);

    /**

     * 管控措施-上报数据

     * */

    List<PreventCJReportRiskControlMeasure> listReportMeasureDate();

    /**

     * 管控措施-修改上报状态

     * */

    void updateMeasureReportStatus(HandlerReportParam handlerReportParam);

    /**

     * 管控措施-修改上报状态-通过id

     * */

    void updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);

}

package com.ruoyi.doublePrevention.service.baseService;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportRiskControlMeasure;
import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam;
import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;

import java.util.List;

public interface PreventCJReportRiskControlMeasureService extends IService<PreventCJReportRiskControlMeasure> {

//    /**
//     * 上报数据-管控措施-分页查询
//     */
//    IPage<PreventCJReportRiskControlMeasure> getReportMeasurePage(Page<Object> objectPage, PreventReportRiskControlMeasureReqDTO queryReqDTO);
    /**
     * 插入
     * */
    int insertMeasureList(PreventCJReportRiskControlMeasure CJMeasure);
    /**
     * 管控措施-上报数据
     * */
    List<PreventCJReportRiskControlMeasure> listReportMeasureDate();
    /**
     * 管控措施-修改上报状态
     * */
    void updateMeasureReportStatus(HandlerReportParam handlerReportParam);
    /**
     * 管控措施-修改上报状态-通过id
     * */
    void updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);
}

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

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



import com.baomidou.mybatisplus.extension.service.IService;

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

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

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



import java.util.List;



public interface PreventCJReportRiskEventService extends IService<PreventCJReportRiskEvent> {



//    /**

//     * 分页查询

//     * */

//    IPage<PreventCJReportRiskEvent> getReportRiskEventPage(Page<Object> objectPage, PreReportRiskEventQueryReqDTO queryReqDTO);

    /**

     * 插入

     * */

    int insertEventLists(PreventCJReportRiskEvent eventList);

    /**

     * 上报数据-查询待上报数据

     * */

    List<PreventCJReportRiskEvent> listReportEventDate();

    /**

     * 修改上报状态

     * */

    int updateEventReportStatus(HandlerReportParam handlerReportParam);

    /**

     * 修改上报状态-通过id

     * */

    void updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);

}

package com.ruoyi.doublePrevention.service.baseService;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportRiskEvent;
import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam;
import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;

import java.util.List;

public interface PreventCJReportRiskEventService extends IService<PreventCJReportRiskEvent> {

//    /**
//     * 分页查询
//     * */
//    IPage<PreventCJReportRiskEvent> getReportRiskEventPage(Page<Object> objectPage, PreReportRiskEventQueryReqDTO queryReqDTO);
    /**
     * 插入
     * */
    int insertEventLists(PreventCJReportRiskEvent eventList);
    /**
     * 上报数据-查询待上报数据
     * */
    List<PreventCJReportRiskEvent> listReportEventDate();
    /**
     * 修改上报状态
     * */
    int updateEventReportStatus(HandlerReportParam handlerReportParam);
    /**
     * 修改上报状态-通过id
     * */
    void updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);
}

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

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



import com.ruoyi.doublePrevention.entity.PreventOverhaulLog;

import com.ruoyi.doublePrevention.entity.dto.req.PreventOverhaulLogInsertReqBO;

import com.ruoyi.doublePrevention.entity.dto.req.PreventOverhaulLogReqBO;

import com.ruoyi.doublePrevention.entity.dto.req.PreventOverhaulLogUpdateReqBO;

import com.ruoyi.doublePrevention.entity.dto.resp.PreventOverhaulLogRespDTO;

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

import com.ruoyi.doublePrevention.vo.ResultVO;



import java.util.List;



public interface PreventOverhaulLogService {



    ResultVO<PreventOverhaulLogRespDTO> selectOverhaulLogPage(PreventOverhaulLogReqBO overhaulLogReqBO);



    ResultVO<PreventOverhaulLog> savePreventOverhaulLog(PreventOverhaulLogInsertReqBO insertReqBO);



    PreventOverhaulLog getOverhaulLogById(Long id);



    ResultVO<PreventOverhaulLog> updateOverhaulLog(PreventOverhaulLogUpdateReqBO updateReqBO);



    int deleteOverhaulLogByIds(String ids);



    List<PreventOverhaulLog> listReportOverhaulLog();



    int updateOverhaulReportStatus(HandlerReportParam handlerReportParam);

}

package com.ruoyi.doublePrevention.service.baseService;

import com.ruoyi.doublePrevention.entity.PreventOverhaulLog;
import com.ruoyi.doublePrevention.entity.dto.req.PreventOverhaulLogInsertReqBO;
import com.ruoyi.doublePrevention.entity.dto.req.PreventOverhaulLogReqBO;
import com.ruoyi.doublePrevention.entity.dto.req.PreventOverhaulLogUpdateReqBO;
import com.ruoyi.doublePrevention.entity.dto.resp.PreventOverhaulLogRespDTO;
import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
import com.ruoyi.doublePrevention.vo.ResultVO;

import java.util.List;

public interface PreventOverhaulLogService {

    ResultVO<PreventOverhaulLogRespDTO> selectOverhaulLogPage(PreventOverhaulLogReqBO overhaulLogReqBO);

    ResultVO<PreventOverhaulLog> savePreventOverhaulLog(PreventOverhaulLogInsertReqBO insertReqBO);

    PreventOverhaulLog getOverhaulLogById(Long id);

    ResultVO<PreventOverhaulLog> updateOverhaulLog(PreventOverhaulLogUpdateReqBO updateReqBO);

    int deleteOverhaulLogByIds(String ids);

    List<PreventOverhaulLog> listReportOverhaulLog();

    int updateOverhaulReportStatus(HandlerReportParam handlerReportParam);
}

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

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



import com.ruoyi.doublePrevention.entity.PreventRiskCheckUnit;

import com.ruoyi.project.tr.baseCheckPoint.domain.BaseCheckPoint;

import org.springframework.stereotype.Repository;



import java.util.List;



@Repository

public interface PreventRiskCheckUnitService {



    /**

     * 保存原检查点与管控措施的对应关系

     */

    int insertPointAndMeasure(PreventRiskCheckUnit checkUnit);

    /**

     * 通过riskId 查询管控措施列表

     */

    List<PreventRiskCheckUnit> getUnitByRiskId(String riskId);





    /**

     * 删除原检查点与管控措施的对应关系

     */

    int deletePointAndMeasure(String id);

    /**

     * 通过baseCheckPointId 查询管控措施列表

     */

    PreventRiskCheckUnit getUnitByBaseCheckPointId(Long baseCheckPointId);



}

package com.ruoyi.doublePrevention.service.baseService;

import com.ruoyi.doublePrevention.entity.PreventRiskCheckUnit;
import com.ruoyi.project.tr.baseCheckPoint.domain.BaseCheckPoint;
import org.springframework.stereotype.Repository;

import java.util.List;

@Repository
public interface PreventRiskCheckUnitService {

    /**
     * 保存原检查点与管控措施的对应关系
     */
    int insertPointAndMeasure(PreventRiskCheckUnit checkUnit);
    /**
     * 通过riskId 查询管控措施列表
     */
    List<PreventRiskCheckUnit> getUnitByRiskId(String riskId);


    /**
     * 删除原检查点与管控措施的对应关系
     */
    int deletePointAndMeasure(String id);
    /**
     * 通过baseCheckPointId 查询管控措施列表
     */
    PreventRiskCheckUnit getUnitByBaseCheckPointId(Long baseCheckPointId);

}

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

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



import com.ruoyi.doublePrevention.entity.PreventRiskDangerCheckAndMeasure;

import com.ruoyi.project.tr.hiddenDangerCheckPoint.domain.HiddenDangerCheckPoint;



import java.util.List;



public interface PreventRiskDangerCheckAndMeasureService {



    /**

     * 写入核查任务检查点与管控措施信息

     * */

    int insertCheckAndMeasure(PreventRiskDangerCheckAndMeasure checkAndMeasure);



    List<PreventRiskDangerCheckAndMeasure> getByBaseCheckPointId(Long checkPointId);



    PreventRiskDangerCheckAndMeasure getByDangerCheckPointId(Long dangerCheckPointId);



    int updateCheckDesc(HiddenDangerCheckPoint hdcp);



    List<PreventRiskDangerCheckAndMeasure> getByCheckId(Long checkId);

}

package com.ruoyi.doublePrevention.service.baseService;

import com.ruoyi.doublePrevention.entity.PreventRiskDangerCheckAndMeasure;
import com.ruoyi.project.tr.hiddenDangerCheckPoint.domain.HiddenDangerCheckPoint;

import java.util.List;

public interface PreventRiskDangerCheckAndMeasureService {

    /**
     * 写入核查任务检查点与管控措施信息
     * */
    int insertCheckAndMeasure(PreventRiskDangerCheckAndMeasure checkAndMeasure);

    List<PreventRiskDangerCheckAndMeasure> getByBaseCheckPointId(Long checkPointId);

    PreventRiskDangerCheckAndMeasure getByDangerCheckPointId(Long dangerCheckPointId);

    int updateCheckDesc(HiddenDangerCheckPoint hdcp);

    List<PreventRiskDangerCheckAndMeasure> getByCheckId(Long checkId);
}

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

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



import com.ruoyi.doublePrevention.entity.PreventRiskDangerCheckLog;

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



import java.util.List;



public interface PreventRiskDangerCheckLogService {

    /**

     * 定时生成排查任务记录时，

     * 插入排查记录附属表

     */

    int insertDangerCheckLog(PreventRiskDangerCheckLog dangerCheck);

    /**

     * 删除定时核查任务

     * */

    int deleteDangerCheck(Long checkId);





    /**

     * 检索需要上报的任务记录

     * */

    List<PreventRiskDangerCheckLog> listReportTask();

    /**

     * 修改上报的数据状态

     * */

    int updateTaskReportStatus(HandlerReportParam handlerReportParam);

    /**

     * 查询by checkId

     * */

    PreventRiskDangerCheckLog getByDangerCheckByCheckId(Long checkId);



    PreventRiskDangerCheckLog getByDangerCheckByJobId(Long jobId);



    int updateCheckLog(Long checkId, Long mobileCode);



    int updateTaskReportStatusByList(List<Long> taskIds);



    List<PreventRiskDangerCheckLog> listRectifyReportTask();



    List<PreventRiskDangerCheckLog> listSearchRectifyReportTask();



    int updateSearchRectifyReportTask(PreventRiskDangerCheckLog dangerCheckLog);

}

package com.ruoyi.doublePrevention.service.baseService;

import com.ruoyi.doublePrevention.entity.PreventRiskDangerCheckLog;
import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;

import java.util.List;

public interface PreventRiskDangerCheckLogService {
    /**
     * 定时生成排查任务记录时，
     * 插入排查记录附属表
     */
    int insertDangerCheckLog(PreventRiskDangerCheckLog dangerCheck);
    /**
     * 删除定时核查任务
     * */
    int deleteDangerCheck(Long checkId);


    /**
     * 检索需要上报的任务记录
     * */
    List<PreventRiskDangerCheckLog> listReportTask();
    /**
     * 修改上报的数据状态
     * */
    int updateTaskReportStatus(HandlerReportParam handlerReportParam);
    /**
     * 查询by checkId
     * */
    PreventRiskDangerCheckLog getByDangerCheckByCheckId(Long checkId);

    PreventRiskDangerCheckLog getByDangerCheckByJobId(Long jobId);

    int updateCheckLog(Long checkId, Long mobileCode);

    int updateTaskReportStatusByList(List<Long> taskIds);

    List<PreventRiskDangerCheckLog> listRectifyReportTask();

    List<PreventRiskDangerCheckLog> listSearchRectifyReportTask();

    int updateSearchRectifyReportTask(PreventRiskDangerCheckLog dangerCheckLog);
}

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

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





import com.ruoyi.doublePrevention.entity.PreventRiskDangerConfirmLog;

import com.ruoyi.project.tr.hiddenDangerCheckPoint.domain.HiddenDangerCheckPoint;



import java.util.List;



public interface PreventRiskDangerConfirmLogService {





    int saveConfirmLog(HiddenDangerCheckPoint hdcp);



    List<PreventRiskDangerConfirmLog> getLogsByDangerCheckPointId(Long dangerCheckPointId);

}

package com.ruoyi.doublePrevention.service.baseService;


import com.ruoyi.doublePrevention.entity.PreventRiskDangerConfirmLog;
import com.ruoyi.project.tr.hiddenDangerCheckPoint.domain.HiddenDangerCheckPoint;

import java.util.List;

public interface PreventRiskDangerConfirmLogService {


    int saveConfirmLog(HiddenDangerCheckPoint hdcp);

    List<PreventRiskDangerConfirmLog> getLogsByDangerCheckPointId(Long dangerCheckPointId);
}

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

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



import com.ruoyi.doublePrevention.entity.PreventRiskDangerInfo;

import com.ruoyi.doublePrevention.entity.dto.DataCountDangerResultRespDO;

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

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



import java.util.Date;

import java.util.List;



public interface PreventRiskDangerInfoService {



    /**

     * 新增隐患上报

     * */

    int insertDangerInfo(PreventRiskDangerInfo dangerInfo);

    /**

     * 修改隐患上报

     * */

    int updateDangerInfo(PreventRiskDangerInfo dangerInfo);



    /**

     * 删除隐患上报

     */

    int deleteDangerInfo(Long id);

    /**

     * 修改隐患整改状态

     */

    int updateDangerInfoState(PreventRiskDangerInfo dangerInfo);



    /**

     * @description 统计时间段内所有、死亡、重伤、轻伤的隐患数量

     */

    DataCountDangerResultRespDO listDangerResultCountByTime(Date startTime, Date endTime, List<Long> depIds);







    /**

     * 搜索需要上报的隐患

     */

    List<PreventRiskDangerInfo> listReportDanger();

    /**

     * 修改上报的数据的姿态

     */

    PreventRiskDangerInfo updateDangerInfoReportStatus(HandlerReportParam handlerReportParam);

    /**

     * 查询隐患附属表信息

     */

    PreventRiskDangerInfo getByHiddenDangerId(Long id);



    PreventRiskDangerInfo getDangerInfoByDangerCheckPointId(Long checkId);

}

package com.ruoyi.doublePrevention.service.baseService;

import com.ruoyi.doublePrevention.entity.PreventRiskDangerInfo;
import com.ruoyi.doublePrevention.entity.dto.DataCountDangerResultRespDO;
import com.ruoyi.doublePrevention.repository.param.DataCountStartAndEndTimeParams;
import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;

import java.util.Date;
import java.util.List;

public interface PreventRiskDangerInfoService {

    /**
     * 新增隐患上报
     * */
    int insertDangerInfo(PreventRiskDangerInfo dangerInfo);
    /**
     * 修改隐患上报
     * */
    int updateDangerInfo(PreventRiskDangerInfo dangerInfo);

    /**
     * 删除隐患上报
     */
    int deleteDangerInfo(Long id);
    /**
     * 修改隐患整改状态
     */
    int updateDangerInfoState(PreventRiskDangerInfo dangerInfo);

    /**
     * @description 统计时间段内所有、死亡、重伤、轻伤的隐患数量
     */
    DataCountDangerResultRespDO listDangerResultCountByTime(Date startTime, Date endTime, List<Long> depIds);



    /**
     * 搜索需要上报的隐患
     */
    List<PreventRiskDangerInfo> listReportDanger();
    /**
     * 修改上报的数据的姿态
     */
    PreventRiskDangerInfo updateDangerInfoReportStatus(HandlerReportParam handlerReportParam);
    /**
     * 查询隐患附属表信息
     */
    PreventRiskDangerInfo getByHiddenDangerId(Long id);

    PreventRiskDangerInfo getDangerInfoByDangerCheckPointId(Long checkId);
}

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

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



import com.ruoyi.doublePrevention.entity.PreventRiskJobAndMeasure;

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



import java.util.List;



public interface PreventRiskJobAndMeasureService {

    /**

     * 插入管控措施与job的对应关系

     * */

    int insertJobAndMeasure(PreventRiskJobAndMeasure jobAndMeasure);

    /**

     * 查询JobAndMeasure - By JobId

     */

    PreventRiskJobAndMeasure getJobAndMeasureByJobId(Long jobId);



    List<PreventRiskJobAndMeasure> getJobAndMeasureListByJobId(Long jobId);

    /**

     * 删除job管控措施的附属表关联信息

     */

    int deleteJobAndMeasure(Long jobId);







    /**

     * 检索需要上报的隐患排查任务

     */

    List<PreventRiskJobAndMeasure> listReportWork();

    /**

     * 根据jobId查询对应的管控措施

     */

    List<PreventRiskJobAndMeasure> getMeasureListByJobId(Long jobId);

    /**

     * 修改上报状态

     */

    int updateWorkReportStatus(HandlerReportParam handlerReportParam);



    List<PreventRiskJobAndMeasure> listReportWorkTest();



    List<PreventRiskJobAndMeasure> getRectifyJobData(Long jobId);

}

package com.ruoyi.doublePrevention.service.baseService;

import com.ruoyi.doublePrevention.entity.PreventRiskJobAndMeasure;
import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;

import java.util.List;

public interface PreventRiskJobAndMeasureService {
    /**
     * 插入管控措施与job的对应关系
     * */
    int insertJobAndMeasure(PreventRiskJobAndMeasure jobAndMeasure);
    /**
     * 查询JobAndMeasure - By JobId
     */
    PreventRiskJobAndMeasure getJobAndMeasureByJobId(Long jobId);

    List<PreventRiskJobAndMeasure> getJobAndMeasureListByJobId(Long jobId);
    /**
     * 删除job管控措施的附属表关联信息
     */
    int deleteJobAndMeasure(Long jobId);



    /**
     * 检索需要上报的隐患排查任务
     */
    List<PreventRiskJobAndMeasure> listReportWork();
    /**
     * 根据jobId查询对应的管控措施
     */
    List<PreventRiskJobAndMeasure> getMeasureListByJobId(Long jobId);
    /**
     * 修改上报状态
     */
    int updateWorkReportStatus(HandlerReportParam handlerReportParam);

    List<PreventRiskJobAndMeasure> listReportWorkTest();

    List<PreventRiskJobAndMeasure> getRectifyJobData(Long jobId);
}

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

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



import com.baomidou.mybatisplus.extension.service.IService;

import com.ruoyi.doublePrevention.entity.PreventRiskUnitUuid;

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



import java.util.List;



public interface PreventRiskUnitUuidService {

    /**

     * 为设施设备清单附属表添加uuid

     * */

    int insertRiskUnitUuid(PreventRiskUnitUuid riskUnitUuid);

    /**

     * 通过id获取uuid

     * */

    PreventRiskUnitUuid getRiskUnitUuidById(Long id);

    /**

     * 修改

     * */

    int updateRiskUnitUuid(PreventRiskUnitUuid riskUnitUuid);

    /**

     * 删除附属表信息

     */

    int deleteRiskUnit(String[] riskListIds);





    /**

     * 检索需要上报的数据

     */

    List<PreventRiskUnitUuid> listRiskAnaUnit();

    /**

     * 修改已经被检索读取完成数据的状态

     */

    int updateReportStatus(HandlerReportParam handlerReportParam);



    PreventRiskUnitUuid getRiskUnitUuidByUnitId(Long riskUnitId);

}

package com.ruoyi.doublePrevention.service.baseService;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.doublePrevention.entity.PreventRiskUnitUuid;
import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;

import java.util.List;

public interface PreventRiskUnitUuidService {
    /**
     * 为设施设备清单附属表添加uuid
     * */
    int insertRiskUnitUuid(PreventRiskUnitUuid riskUnitUuid);
    /**
     * 通过id获取uuid
     * */
    PreventRiskUnitUuid getRiskUnitUuidById(Long id);
    /**
     * 修改
     * */
    int updateRiskUnitUuid(PreventRiskUnitUuid riskUnitUuid);
    /**
     * 删除附属表信息
     */
    int deleteRiskUnit(String[] riskListIds);


    /**
     * 检索需要上报的数据
     */
    List<PreventRiskUnitUuid> listRiskAnaUnit();
    /**
     * 修改已经被检索读取完成数据的状态
     */
    int updateReportStatus(HandlerReportParam handlerReportParam);

    PreventRiskUnitUuid getRiskUnitUuidByUnitId(Long riskUnitId);
}

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

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



import com.ruoyi.doublePrevention.entity.PreventTaskType;



import java.util.List;



public interface PreventTaskTypeService {



    PreventTaskType getInfoByTaskId(Long id);



    List<PreventTaskType> getInfoByJobId(Long jobId);



    List<PreventTaskType> getAllTaskTypeList();

}

package com.ruoyi.doublePrevention.service.baseService;

import com.ruoyi.doublePrevention.entity.PreventTaskType;

import java.util.List;

public interface PreventTaskTypeService {

    PreventTaskType getInfoByTaskId(Long id);

    List<PreventTaskType> getInfoByJobId(Long jobId);

    List<PreventTaskType> getAllTaskTypeList();
}

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

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





public interface PreventTaskUnitAndMeasureService {



}

package com.ruoyi.doublePrevention.service.baseService;


public interface PreventTaskUnitAndMeasureService {

}

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

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



import com.baomidou.mybatisplus.extension.service.IService;

import com.ruoyi.doublePrevention.entity.RiskAndPeopleInfo;

import com.ruoyi.doublePrevention.entity.dto.req.RiskAndPeopleInfoReqBO;

import com.ruoyi.doublePrevention.entity.dto.resp.RiskAndPeopleInfoRespDTO;

import com.ruoyi.doublePrevention.vo.ResultVO;



public interface RiskAndPeopleInfoService extends IService<RiskAndPeopleInfo> {



    ResultVO<RiskAndPeopleInfoRespDTO> listRiskAndPeoplePage(RiskAndPeopleInfoReqBO reqBO);



    RiskAndPeopleInfo selectRiskAndPeopleInfoById(Long id);

}

package com.ruoyi.doublePrevention.service.baseService;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.doublePrevention.entity.RiskAndPeopleInfo;
import com.ruoyi.doublePrevention.entity.dto.req.RiskAndPeopleInfoReqBO;
import com.ruoyi.doublePrevention.entity.dto.resp.RiskAndPeopleInfoRespDTO;
import com.ruoyi.doublePrevention.vo.ResultVO;

public interface RiskAndPeopleInfoService extends IService<RiskAndPeopleInfo> {

    ResultVO<RiskAndPeopleInfoRespDTO> listRiskAndPeoplePage(RiskAndPeopleInfoReqBO reqBO);

    RiskAndPeopleInfo selectRiskAndPeopleInfoById(Long id);
}

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

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





import com.ruoyi.doublePrevention.entity.dto.req.RiskOldInfoQueryReqDTO;

import com.ruoyi.doublePrevention.entity.dto.resp.RiskOldInfoQueryRespDTO;

import com.ruoyi.doublePrevention.vo.ResultVO;



import java.util.List;



public interface RiskOldInfoService {



    ResultVO<RiskOldInfoQueryRespDTO> selectOldRiskInfoPage(RiskOldInfoQueryReqDTO queryReqDTO);



}

package com.ruoyi.doublePrevention.service.baseService;


import com.ruoyi.doublePrevention.entity.dto.req.RiskOldInfoQueryReqDTO;
import com.ruoyi.doublePrevention.entity.dto.resp.RiskOldInfoQueryRespDTO;
import com.ruoyi.doublePrevention.vo.ResultVO;

import java.util.List;

public interface RiskOldInfoService {

    ResultVO<RiskOldInfoQueryRespDTO> selectOldRiskInfoPage(RiskOldInfoQueryReqDTO queryReqDTO);

}

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

@@ -1,81 +1,81 @@
package com.ruoyi.doublePrevention.service.baseService.impl;



import com.baomidou.mybatisplus.core.metadata.IPage;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

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

import com.ruoyi.doublePrevention.enums.E;

import com.ruoyi.doublePrevention.exception.AusinessException;

import com.ruoyi.doublePrevention.repository.PreventCJReportCheckRecordFromTaskRepository;

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

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

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

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

import org.springframework.stereotype.Service;



import java.util.List;



@Service("PreventCJReportCheckRecordFromTaskService")

public class PreventCJReportCheckRecordFromTaskServiceImpl

    extends ServiceImpl<PreventCJReportCheckRecordFromTaskRepository, PreventCJReportCheckRecordFromTask> implements PreventCJReportCheckRecordFromTaskService {



    @Autowired

    private PreventCJReportCheckRecordFromTaskRepository preventCJReportCheckRecordFromTaskRepository;



    /**

     * 批量插入任务记录

     * */

    @Override

    public int insert(PreventCJReportCheckRecordFromTask recordFromTasks) {

        return preventCJReportCheckRecordFromTaskRepository.insertRecord(recordFromTasks);

    }



    @Override

    public int insertRecordList(List<PreventCJReportCheckRecordFromTask> recordFromTaskList) {

        return preventCJReportCheckRecordFromTaskRepository.insertRecordList(recordFromTaskList);

    }



//    /**

//     * 任务记录-分页查询

//     * */

//    @Override

//    public IPage<PreventCJReportCheckRecordFromTask> getReportTaskFromWorkPage(Page<Object> objectPage, PreventReportCheckRecordFromTaskReqDTO queryReqDTO) {

//        return preventCJReportCheckRecordFromTaskRepository.getReportTaskFromWorkPage(objectPage, queryReqDTO);

//    }



    /**

     * 任务-查询待上报

     * */

    @Override

    public List<PreventCJReportCheckRecordFromTask> listReportTaskRecordDate() {

        return preventCJReportCheckRecordFromTaskRepository.listReportTaskRecordDate();

    }

    /**

     * 任务-待上报状态变更

     * */

    @Override

    public void updateTaskReportStatus(HandlerReportParam handlerReportParam) {

        int result = preventCJReportCheckRecordFromTaskRepository.updateTaskReportStatus(handlerReportParam);

        if (result < 1){

            throw new AusinessException(E.UPDATE_FAIL.getCode(), "修改任务配置数据上报状态失败");

        }

    }

    /**

     * 任务-待上报状态变更 - 通过id

     * */

    @Override

    public void updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam) {

        int result = preventCJReportCheckRecordFromTaskRepository.updateCJReportStatusById(handlerCJReportParam);

        if (result < 1){

            throw new AusinessException(E.UPDATE_FAIL.getCode(), "修改任务配置数据上报状态失败");

        }

    }



    @Override

    public void updateCJReportStatusBatchById(List<PreventCJReportCheckRecordFromTask> cjRecordFromTasks) {

        int result = preventCJReportCheckRecordFromTaskRepository.updateCJReportStatusBatchById(cjRecordFromTasks);

        if (result < 1){

            throw new AusinessException(E.UPDATE_FAIL.getCode(), "修改任务配置数据上报状态失败");

        }

    }

}

package com.ruoyi.doublePrevention.service.baseService.impl;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportCheckRecordFromTask;
import com.ruoyi.doublePrevention.enums.E;
import com.ruoyi.doublePrevention.exception.AusinessException;
import com.ruoyi.doublePrevention.repository.PreventCJReportCheckRecordFromTaskRepository;
import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam;
import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
import com.ruoyi.doublePrevention.service.baseService.PreventCJReportCheckRecordFromTaskService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.List;

@Service("PreventCJReportCheckRecordFromTaskService")
public class PreventCJReportCheckRecordFromTaskServiceImpl
    extends ServiceImpl<PreventCJReportCheckRecordFromTaskRepository, PreventCJReportCheckRecordFromTask> implements PreventCJReportCheckRecordFromTaskService {

    @Autowired
    private PreventCJReportCheckRecordFromTaskRepository preventCJReportCheckRecordFromTaskRepository;

    /**
     * 批量插入任务记录
     * */
    @Override
    public int insert(PreventCJReportCheckRecordFromTask recordFromTasks) {
        return preventCJReportCheckRecordFromTaskRepository.insertRecord(recordFromTasks);
    }

    @Override
    public int insertRecordList(List<PreventCJReportCheckRecordFromTask> recordFromTaskList) {
        return preventCJReportCheckRecordFromTaskRepository.insertRecordList(recordFromTaskList);
    }

//    /**
//     * 任务记录-分页查询
//     * */
//    @Override
//    public IPage<PreventCJReportCheckRecordFromTask> getReportTaskFromWorkPage(Page<Object> objectPage, PreventReportCheckRecordFromTaskReqDTO queryReqDTO) {
//        return preventCJReportCheckRecordFromTaskRepository.getReportTaskFromWorkPage(objectPage, queryReqDTO);
//    }

    /**
     * 任务-查询待上报
     * */
    @Override
    public List<PreventCJReportCheckRecordFromTask> listReportTaskRecordDate() {
        return preventCJReportCheckRecordFromTaskRepository.listReportTaskRecordDate();
    }
    /**
     * 任务-待上报状态变更
     * */
    @Override
    public void updateTaskReportStatus(HandlerReportParam handlerReportParam) {
        int result = preventCJReportCheckRecordFromTaskRepository.updateTaskReportStatus(handlerReportParam);
        if (result < 1){
            throw new AusinessException(E.UPDATE_FAIL.getCode(), "修改任务配置数据上报状态失败");
        }
    }
    /**
     * 任务-待上报状态变更 - 通过id
     * */
    @Override
    public void updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam) {
        int result = preventCJReportCheckRecordFromTaskRepository.updateCJReportStatusById(handlerCJReportParam);
        if (result < 1){
            throw new AusinessException(E.UPDATE_FAIL.getCode(), "修改任务配置数据上报状态失败");
        }
    }

    @Override
    public void updateCJReportStatusBatchById(List<PreventCJReportCheckRecordFromTask> cjRecordFromTasks) {
        int result = preventCJReportCheckRecordFromTaskRepository.updateCJReportStatusBatchById(cjRecordFromTasks);
        if (result < 1){
            throw new AusinessException(E.UPDATE_FAIL.getCode(), "修改任务配置数据上报状态失败");
        }
    }
}

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

@@ -1,99 +1,99 @@
package com.ruoyi.doublePrevention.service.baseService.impl;



import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

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

import com.ruoyi.doublePrevention.enums.E;

import com.ruoyi.doublePrevention.exception.AusinessException;

import com.ruoyi.doublePrevention.repository.PreventCJReportCheckTaskFromWorkRepository;

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

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

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

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

import org.springframework.stereotype.Service;



import java.util.List;





@Service("PreventCJReportCheckTaskFromWorkService")

public class PreventCJReportCheckTaskFromWorkServiceImpl

        extends ServiceImpl<PreventCJReportCheckTaskFromWorkRepository, PreventCJReportCheckTaskFromWork> implements PreventCJReportCheckTaskFromWorkService {



    @Autowired

    private PreventCJReportCheckTaskFromWorkRepository preventCJReportCheckTaskFromWorkRepository;



//    /**

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

//     */

//    @Override

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

//        return preventCJReportCheckTaskFromWorkRepository.getReportTaskFromWorkPage(objectPage,queryReqDTO);

//    }

    /**

     * 插入数据

     * */

    @Override

    public int insertTaskFromWorkList(PreventCJReportCheckTaskFromWork CJTaskFromWork) {

        int result = preventCJReportCheckTaskFromWorkRepository.insertTaskFromWorkList(CJTaskFromWork);

        if (result < 1){

            throw new AusinessException(E.ADD_FAIL.getCode(), "CJ保存风险单元失败");

        }

        return result;

    }



    /**

     * 任务配置 -查询待上报

     * */

    @Override

    public List<PreventCJReportCheckTaskFromWork> listReportTaskFromWorkDate() {

        return preventCJReportCheckTaskFromWorkRepository.listReportTaskFromWorkDate();

    }

    /**

     * 任务配置 -待上报状态变更

     * */

    @Override

    public void updateWorkReportStatus(HandlerReportParam handlerReportParam) {

        int result = preventCJReportCheckTaskFromWorkRepository.updateWorkReportStatus(handlerReportParam);

        if (result < 1){

            throw new AusinessException(E.ADD_FAIL.getCode(), "任务-配置 状态变更失败");

        }

    }



    /**

     * 任务配置 -待上报状态变更 -通过id

     * */

    @Override

    public void updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam) {

        int result = preventCJReportCheckTaskFromWorkRepository.updateCJReportStatusById(handlerCJReportParam);

        if (result < 1){

            throw new AusinessException(E.ADD_FAIL.getCode(), "任务-配置 状态变更失败");

        }

    }



    @Override

    public PreventCJReportCheckTaskFromWork geByMeasureUUidAndJobId(String measureUuid, Long jobId) {

        return preventCJReportCheckTaskFromWorkRepository.geByMeasureUUidAndJobId(measureUuid, jobId);

    }



    @Override

    public List<PreventCJReportCheckTaskFromWork> listWork() {

        return preventCJReportCheckTaskFromWorkRepository.listWork();

    }



    @Override

    public List<PreventCJReportCheckTaskFromWork> listWork1() {

        return preventCJReportCheckTaskFromWorkRepository.listWork1();

    }







    @Override

    public int updateInfo1(PreventCJReportCheckTaskFromWork work) {

        return preventCJReportCheckTaskFromWorkRepository.updateInfo1(work);

    }



    @Override

    public int updateInfo(PreventCJReportCheckTaskFromWork work) {

        return preventCJReportCheckTaskFromWorkRepository.updateInfo(work);

    }



}

package com.ruoyi.doublePrevention.service.baseService.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportCheckTaskFromWork;
import com.ruoyi.doublePrevention.enums.E;
import com.ruoyi.doublePrevention.exception.AusinessException;
import com.ruoyi.doublePrevention.repository.PreventCJReportCheckTaskFromWorkRepository;
import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam;
import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
import com.ruoyi.doublePrevention.service.baseService.PreventCJReportCheckTaskFromWorkService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.List;


@Service("PreventCJReportCheckTaskFromWorkService")
public class PreventCJReportCheckTaskFromWorkServiceImpl
        extends ServiceImpl<PreventCJReportCheckTaskFromWorkRepository, PreventCJReportCheckTaskFromWork> implements PreventCJReportCheckTaskFromWorkService {

    @Autowired
    private PreventCJReportCheckTaskFromWorkRepository preventCJReportCheckTaskFromWorkRepository;

//    /**
//     * 上报数据-任务配置-分页查询
//     */
//    @Override
//    public IPage<PreventCJReportCheckTaskFromWork> getReportTaskFromWorkPage(Page<Object> objectPage, PreventReportCheckTaskFromWorkReqDTO queryReqDTO) {
//        return preventCJReportCheckTaskFromWorkRepository.getReportTaskFromWorkPage(objectPage,queryReqDTO);
//    }
    /**
     * 插入数据
     * */
    @Override
    public int insertTaskFromWorkList(PreventCJReportCheckTaskFromWork CJTaskFromWork) {
        int result = preventCJReportCheckTaskFromWorkRepository.insertTaskFromWorkList(CJTaskFromWork);
        if (result < 1){
            throw new AusinessException(E.ADD_FAIL.getCode(), "CJ保存风险单元失败");
        }
        return result;
    }

    /**
     * 任务配置 -查询待上报
     * */
    @Override
    public List<PreventCJReportCheckTaskFromWork> listReportTaskFromWorkDate() {
        return preventCJReportCheckTaskFromWorkRepository.listReportTaskFromWorkDate();
    }
    /**
     * 任务配置 -待上报状态变更
     * */
    @Override
    public void updateWorkReportStatus(HandlerReportParam handlerReportParam) {
        int result = preventCJReportCheckTaskFromWorkRepository.updateWorkReportStatus(handlerReportParam);
        if (result < 1){
            throw new AusinessException(E.ADD_FAIL.getCode(), "任务-配置 状态变更失败");
        }
    }

    /**
     * 任务配置 -待上报状态变更 -通过id
     * */
    @Override
    public void updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam) {
        int result = preventCJReportCheckTaskFromWorkRepository.updateCJReportStatusById(handlerCJReportParam);
        if (result < 1){
            throw new AusinessException(E.ADD_FAIL.getCode(), "任务-配置 状态变更失败");
        }
    }

    @Override
    public PreventCJReportCheckTaskFromWork geByMeasureUUidAndJobId(String measureUuid, Long jobId) {
        return preventCJReportCheckTaskFromWorkRepository.geByMeasureUUidAndJobId(measureUuid, jobId);
    }

    @Override
    public List<PreventCJReportCheckTaskFromWork> listWork() {
        return preventCJReportCheckTaskFromWorkRepository.listWork();
    }

    @Override
    public List<PreventCJReportCheckTaskFromWork> listWork1() {
        return preventCJReportCheckTaskFromWorkRepository.listWork1();
    }



    @Override
    public int updateInfo1(PreventCJReportCheckTaskFromWork work) {
        return preventCJReportCheckTaskFromWorkRepository.updateInfo1(work);
    }

    @Override
    public int updateInfo(PreventCJReportCheckTaskFromWork work) {
        return preventCJReportCheckTaskFromWorkRepository.updateInfo(work);
    }

}

在上述文件截断后对比
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportConfigLogServiceImpl.java
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportConfigServiceImpl.java
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportDangerInfoServiceImpl.java
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportOverhaulLogServiceImpl.java
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportPointServiceImpl.java
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportResultDataServiceImpl.java
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportRiskAnaUnitServiceImpl.java
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportRiskControlMeasureServiceImpl.java
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportRiskEventServiceImpl.java
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventOverhaulLogServiceImpl.java
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventReportConfigServiceImpl.java
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskCheckUnitServiceImpl.java
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskDangerCheckAndMeasureServiceImpl.java
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskDangerCheckLogServiceImpl.java
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskDangerConfirmLogServiceImpl.java
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskDangerInfoServiceImpl.java
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskJobAndMeasureServiceImpl.java
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskUnitUuidServiceImpl.java
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventTaskTypeServiceImpl.java
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventTaskUnitAndMeasureServiceImpl.java
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/RiskAndPeopleInfoServiceImpl.java
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/RiskOldInfoServiceImpl.java
src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java
src/main/java/com/ruoyi/doublePrevention/utilsCJ/AesGcm256Util.java
src/main/java/com/ruoyi/project/system/user/test.java
src/main/java/com/ruoyi/project/tr/HiddenDangerCheckJob/util/AbstractQuartzJob.java
src/main/java/com/ruoyi/project/tr/OverhaulLog/controller/OverhaulLogController.java
src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/service/impl/HiddenDangerCheckServiceImpl.java
src/main/java/com/ruoyi/project/tr/specialCheck/Test/ItemDangerReportScheduleTest.java
src/main/java/com/ruoyi/project/tr/specialCheck/Test/SpecialCheckTaskDownload.java
src/main/java/com/ruoyi/project/tr/specialCheck/Test/TaskReportScheduleTest.java
src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/HandlerSpecialCheckReportParam.java
src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbBaseCheckItemBO.java
src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbBaseCheckScoreBO.java
src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbBaseCheckTaskBO.java
src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbSpecialCheckItemDangerLogBO.java
src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbSpecialCheckItemDangerLogUpdateBO.java
src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbSpecialCheckItemLogEditBO.java
src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbSpecialCheckScoreAndDangerLogEditBO.java
src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbSpecialCheckScoreAndDangerLogQueryBO.java
src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbSpecialCheckTaskLogBO.java
src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbSpecialCheckTaskLogEditBO.java
src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbSpecialCheckTaskLogUpdateBO.java
src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/SpecialCheckItemDangerLogReportDTO.java
src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/SpecialCheckTaskLogReportDTO.java
src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbBaseCheckItemDTO.java
src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbBaseCheckScoreDTO.java
src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbBaseCheckTaskDTO.java
src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbSpecialCheckItemDangerLogDTO.java
src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbSpecialCheckItemLogDTO.java
src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbSpecialCheckItemLogQueryDTO.java
src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbSpecialCheckScoreAndDangerLogDTO.java
src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbSpecialCheckScoreAndDangerLogQueryDTO.java
src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbSpecialCheckScoreAndDangerLogRespDTO.java
src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbSpecialCheckTaskLogDTO.java
src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbSpecialCheckTaskLogDateDTO.java
src/main/java/com/ruoyi/project/tr/specialCheck/domin/DownloadDTO/CheckItemData.java
src/main/java/com/ruoyi/project/tr/specialCheck/domin/DownloadDTO/CheckScoreData.java
src/main/java/com/ruoyi/project/tr/specialCheck/domin/DownloadDTO/CheckTaskData.java
src/main/java/com/ruoyi/project/tr/specialCheck/domin/DownloadDTO/ItemDownloadRespBO.java
src/main/java/com/ruoyi/project/tr/specialCheck/domin/DownloadDTO/ItemDownloadRespDTO.java
src/main/java/com/ruoyi/project/tr/specialCheck/domin/DownloadDTO/Page.java
src/main/java/com/ruoyi/project/tr/specialCheck/domin/DownloadDTO/ScoreDownloadRespBO.java
src/main/java/com/ruoyi/project/tr/specialCheck/domin/DownloadDTO/ScoreDownloadRespDTO.java
src/main/java/com/ruoyi/project/tr/specialCheck/domin/DownloadDTO/TbBaseCheckTaskDownloadBO.java
src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbBaseCheckCompany.java
src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbBaseCheckItem.java
src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbBaseCheckScore.java
src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbBaseCheckTask.java
src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbCheckConfig.java
src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbSpecialCheckItemDangerLog.java
src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbSpecialCheckItemLog.java
src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbSpecialCheckScoreAndDangerLog.java
src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbSpecialCheckTaskLog.java
src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbBaseCheckCompanyMapper.java
src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbBaseCheckItemMapper.java
src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbBaseCheckScoreMapper.java
src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbBaseCheckTaskMapper.java
src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbCheckConfigMapper.java
src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbSpecialCheckItemDangerLogMapper.java
src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbSpecialCheckItemLogMapper.java
src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbSpecialCheckScoreAndDangerLogMapper.java
src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbSpecialCheckTaskLogMapper.java
src/main/java/com/ruoyi/project/tr/specialCheck/service/SpecialCheckItemDangerLogService.java
src/main/java/com/ruoyi/project/tr/specialCheck/service/SpecialCheckScoreAndDangerDangerLogService.java
src/main/java/com/ruoyi/project/tr/specialCheck/service/SpecialCheckTaskService.java
src/main/java/com/ruoyi/project/tr/specialCheck/service/TbBaseCheckService.java
src/main/java/com/ruoyi/project/tr/specialCheck/service/impl/SpecialCheckItemDangerLogServiceImpl.java
src/main/java/com/ruoyi/project/tr/specialCheck/service/impl/SpecialCheckScoreAndDangerLogServiceImpl.java
src/main/java/com/ruoyi/project/tr/specialCheck/service/impl/SpecialCheckTaskServiceImpl.java
src/main/java/com/ruoyi/project/tr/specialCheck/service/impl/TbBaseCheckServiceImpl.java
src/main/resources/application-dev.yml
src/main/resources/application-guotai-prod.yml
src/main/resources/application.yml
src/main/resources/logback.xml
src/main/resources/mybatis/doublePrevention/PreventCJReportCheckRecordFromTaskMapper.xml
src/main/resources/mybatis/doublePrevention/PreventCJReportCheckTaskFromWorkMapper.xml
src/main/resources/mybatis/doublePrevention/PreventCJReportConfigLogMapper.xml
src/main/resources/mybatis/doublePrevention/PreventCJReportConfigMapper.xml
src/main/resources/mybatis/doublePrevention/PreventCJReportDangerInfoMapper.xml
src/main/resources/mybatis/doublePrevention/PreventCJReportOverhaulMapper.xml
src/main/resources/mybatis/doublePrevention/PreventCJReportPointMapper.xml
src/main/resources/mybatis/doublePrevention/PreventCJReportResultDataRepository.xml
src/main/resources/mybatis/doublePrevention/PreventCJReportRiskAnaUnitMapper.xml
src/main/resources/mybatis/doublePrevention/PreventCJReportRiskControlMeasureMapper.xml
src/main/resources/mybatis/doublePrevention/PreventCJReportRiskEventMapper.xml
src/main/resources/mybatis/doublePrevention/PreventOverhaulMapper.xml
src/main/resources/mybatis/doublePrevention/PreventRiskCheckUnitMapper.xml
src/main/resources/mybatis/doublePrevention/PreventRiskDangerCheckLogMapper.xml
src/main/resources/mybatis/doublePrevention/PreventRiskDangerConfirmLogMapper.xml
src/main/resources/mybatis/doublePrevention/PreventTaskTypeMapper.xml
src/main/resources/mybatis/doublePrevention/RiskAndPeopleMapper.xml
src/test/ReportTest.java