From 5334a4a5d54f2d826bbf248fc05c8fc8e612b677 Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期一, 31 十月 2022 09:21:32 +0800
Subject: [PATCH] 隐患数据上报功能测试成功
---
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskDangerCheckLogServiceImpl.java | 32
src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/Data.java | 18
src/main/resources/mybatis/doublePrevention/PreventCJReportResultDataRepository.xml | 13
src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportCheckRecordFromTaskRepository.java | 37
src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportPointRepository.java | 9
src/main/resources/mybatis/system/UserMapper.xml | 9
src/main/resources/mybatis/doublePrevention/PreventRiskJobAndMeasureMapper.xml | 21
src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportConfigRepository.java | 23
src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskControlTemplateRepository.java | 5
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportResultDataServiceImpl.java | 16
src/main/java/com/ruoyi/project/tr/riskList/service/IRiskListService.java | 6
src/main/resources/mybatis/doublePrevention/PreventRiskDangerCheckLogMapper.xml | 22
src/main/java/com/ruoyi/project/tr/riskList/service/impl/RiskListServiceImpl.java | 8
src/main/resources/mybatis/tr/HiddenDangerCheckPointMapper.xml | 5
src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskControlMeasureRepository.java | 14
src/main/java/com/ruoyi/project/mobile/service/ApiDangerScheduleService.java | 22
src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportRiskAnaUnitService.java | 32
src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportConfig.java | 94
src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportCheckTaskFromWork.java | 194 +
src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskDangerCheckLogRepository.java | 18
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportCheckRecordFromTaskServiceImpl.java | 68
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportRiskControlMeasureServiceImpl.java | 70
src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportResultData.java | 67
src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/CJReportResultData.java | 45
src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportRiskEvent.java | 183 +
src/main/resources/mybatis/doublePrevention/PreventRiskControlTemplateMapper.xml | 5
src/main/resources/mybatis/doublePrevention/PreventRiskEventMapper.xml | 12
src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportCheckRecordFromTask.java | 218 +
src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportConfigLogService.java | 16
src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskJobAndMeasureService.java | 17
src/main/java/com/ruoyi/doublePrevention/scheduls/ExecCJReportDateSchedule.java | 764 +++++
pom.xml | 618 ++--
src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskUnitUuidRepository.java | 15
src/main/java/com/ruoyi/project/system/dept/service/IDeptService.java | 4
src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java | 6
src/main/resources/mybatis/doublePrevention/PreventCJReportConfigMapper.xml | 31
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskJobAndMeasureServiceImpl.java | 32
src/main/resources/mybatis/doublePrevention/PreventCJReportConfigLogMapper.xml | 30
src/main/resources/mybatis/doublePrevention/PreventCJReportRiskEventMapper.xml | 99
src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskDangerInfoService.java | 12
src/main/java/com/ruoyi/doublePrevention/exception/BusinessException.java | 40
src/main/java/com/ruoyi/doublePrevention/utilsCJ/AesGcm256Util.java | 149 +
src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportPoint.java | 230 +
src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportCheckRecordFromTaskService.java | 31
src/main/java/com/ruoyi/project/tr/riskList/mapper/RiskListMapper.java | 7
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportConfigLogServiceImpl.java | 28
src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/ErrorMsgDetails.java | 31
src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportResultDataRepository.java | 9
src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportResultDataService.java | 7
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskDangerInfoServiceImpl.java | 16
src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/service/IHiddenDangerCheckService.java | 5
src/main/java/com/ruoyi/project/system/user/mapper/UserMapper.java | 11
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskControlTemplateServiceImpl.java | 8
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskControlMeasureServiceImpl.java | 25
src/main/resources/mybatis/tr/RiskListMapper.xml | 9
src/main/resources/mybatis/doublePrevention/PreventCJReportCheckRecordFromTaskMapper.xml | 63
src/main/java/com/ruoyi/doublePrevention/repository/param/HandlerReportParam.java | 42
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskEventServiceImpl.java | 21
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportPointServiceImpl.java | 11
src/main/java/com/ruoyi/doublePrevention/exception/AusinessException.java | 40
src/main/java/com/ruoyi/doublePrevention/enums/SyncEnum.java | 6
src/main/java/com/ruoyi/project/tr/hiddenDangerCheckPoint/service/impl/HiddenDangerCheckPointServiceImpl.java | 8
src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportCheckTaskFromWorkRepository.java | 40
src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/service/impl/HiddenDangerCheckServiceImpl.java | 14
src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportCheckRecordFromTaskDTO.java | 157 +
src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportRiskEventRepository.java | 41
src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskDangerCheckLogService.java | 17
src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportConfigLog.java | 97
src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportRiskEventService.java | 32
src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskEventService.java | 11
src/main/resources/mybatis/doublePrevention/PreventCJReportRiskControlMeasureMapper.xml | 112
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportRiskEventServiceImpl.java | 74
src/main/java/com/ruoyi/project/tr/hiddenDangerCheckPoint/service/IHiddenDangerCheckPointService.java | 6
src/main/resources/mybatis/doublePrevention/PreventCJReportRiskAnaUnitMapper.xml | 73
src/main/java/com/ruoyi/doublePrevention/enums/E.java | 36
src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportCheckTaskFromWorkDTO.java | 132
src/main/java/com/ruoyi/project/tr/hiddenDangerCheckPoint/mapper/HiddenDangerCheckPointMapper.java | 4
src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportRiskAnaUnit.java | 209 +
src/main/resources/mybatis/doublePrevention/PreventRiskDangerInfoMapper.xml | 14
src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportRiskAnaUnitRepository.java | 33
src/main/resources/mybatis/system/DeptMapper.xml | 5
src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportRiskControlMeasure.java | 244 +
src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskJobAndMeasureRepository.java | 17
src/main/java/com/ruoyi/project/system/user/service/IUserService.java | 9
src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportConfigService.java | 23
src/main/java/com/ruoyi/doublePrevention/enums/CJReportEnum.java | 29
src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportRiskControlMeasureRepository.java | 39
src/main/resources/mybatis/doublePrevention/PreventCJReportDangerInfoMapper.xml | 79
src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskUnitUuidService.java | 13
src/main/resources/mybatis/doublePrevention/PreventCJReportPointMapper.xml | 81
src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportRiskAnaUnitDTO.java | 145 +
src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/mapper/HiddenDangerCheckMapper.java | 8
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportConfigServiceImpl.java | 43
src/main/java/com/ruoyi/doublePrevention/repository/param/HandlerCJReportParam.java | 42
src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java | 705 +++++
src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskControlTemplateService.java | 4
src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskControlMeasureService.java | 13
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportDangerInfoServiceImpl.java | 65
src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportRiskEventDTO.java | 118
src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportDangerInfoRepository.java | 36
src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportPointDTO.java | 168 +
src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportCheckTaskFromWorkService.java | 32
src/main/resources/mybatis/doublePrevention/PreventRiskControlMeasureMapper.xml | 15
src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportRiskControlMeasureDTO.java | 179 +
src/main/resources/mybatis/doublePrevention/PreventCJReportCheckTaskFromWorkMapper.xml | 105
src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportConfigLogRepository.java | 14
src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportDangerInfo.java | 398 ++
src/main/java/com/ruoyi/project/system/dept/mapper/DeptMapper.java | 4
src/main/java/com/ruoyi/project/system/user/service/UserServiceImpl.java | 15
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportCheckTaskFromWorkServiceImpl.java | 71
src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportDangerInfoService.java | 31
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskUnitUuidServiceImpl.java | 25
src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportRiskControlMeasureService.java | 32
src/main/resources/mybatis/tr/HiddenDangerCheckMapper.xml | 7
src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportDangerInfoDTO.java | 334 ++
src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskEventRepository.java | 11
src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskDangerInfoRepository.java | 12
src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportPointService.java | 7
src/main/java/com/ruoyi/project/system/dept/service/DeptServiceImpl.java | 7
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportRiskAnaUnitServiceImpl.java | 72
src/main/resources/mybatis/doublePrevention/PreventRiskUnitUuidMapper.xml | 17
121 files changed, 7,757 insertions(+), 326 deletions(-)
diff --git a/pom.xml b/pom.xml
index 519dd04..df5cfa6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,322 +1,334 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
- <groupId>com.ruoyi</groupId>
- <artifactId>TR</artifactId>
- <version>1.0.0</version>
- <packaging>jar</packaging>
+ <groupId>com.ruoyi</groupId>
+ <artifactId>TR</artifactId>
+ <version>1.0.0</version>
+ <packaging>jar</packaging>
- <name>RuoYi</name>
- <url>http://www.ruoyi.vip</url>
- <description>国科鸿宇管理系统</description>
+ <name>RuoYi</name>
+ <url>http://www.ruoyi.vip</url>
+ <description>国科鸿宇管理系统</description>
- <parent>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-parent</artifactId>
- <version>2.1.1.RELEASE</version>
- <relativePath />
- </parent>
+ <parent>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-parent</artifactId>
+ <version>2.1.1.RELEASE</version>
+ <relativePath />
+ </parent>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <java.version>1.8</java.version>
- <shiro.version>1.7.0</shiro.version>
- <thymeleaf.extras.shiro.version>2.0.0</thymeleaf.extras.shiro.version>
- <mybatis.spring.boot.starter.version>1.3.2</mybatis.spring.boot.starter.version>
- <pagehelper.spring.boot.starter.version>1.2.5</pagehelper.spring.boot.starter.version>
- <fastjson.version>1.2.68</fastjson.version>
- <druid.version>1.1.14</druid.version>
- <commons.io.version>2.5</commons.io.version>
- <commons.fileupload.version>1.3.3</commons.fileupload.version>
- <bitwalker.version>1.19</bitwalker.version>
- <lombok.version>1.16.18</lombok.version>
- <velocity.version>1.7</velocity.version>
- <kaptcha.version>2.3.2</kaptcha.version>
- <swagger.version>2.9.2</swagger.version>
- <poi.version>3.17</poi.version>
- <oshi.version>3.9.1</oshi.version>
- </properties>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ <java.version>1.8</java.version>
+ <shiro.version>1.7.0</shiro.version>
+ <thymeleaf.extras.shiro.version>2.0.0</thymeleaf.extras.shiro.version>
+ <mybatis.spring.boot.starter.version>1.3.2</mybatis.spring.boot.starter.version>
+ <pagehelper.spring.boot.starter.version>1.2.5</pagehelper.spring.boot.starter.version>
+ <fastjson.version>1.2.68</fastjson.version>
+ <druid.version>1.1.14</druid.version>
+ <commons.io.version>2.5</commons.io.version>
+ <commons.fileupload.version>1.3.3</commons.fileupload.version>
+ <bitwalker.version>1.19</bitwalker.version>
+ <lombok.version>1.16.18</lombok.version>
+ <velocity.version>1.7</velocity.version>
+ <kaptcha.version>2.3.2</kaptcha.version>
+ <swagger.version>2.9.2</swagger.version>
+ <poi.version>3.17</poi.version>
+ <oshi.version>3.9.1</oshi.version>
+ </properties>
- <dependencies>
+ <dependencies>
- <!-- SpringBoot 核心包 -->
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15to18</artifactId>
+ <version>1.69</version>
+ </dependency>
- <!-- SpringBoot 测试 -->
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-test</artifactId>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.11</version>
+ </dependency>
- <!-- SpringBoot 拦截器 -->
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-aop</artifactId>
- </dependency>
+ <!-- SpringBoot 核心包 -->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter</artifactId>
+ </dependency>
- <!-- SpringBoot Web容器 -->
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- </dependency>
+ <!-- SpringBoot 测试 -->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-test</artifactId>
+ <scope>test</scope>
+ </dependency>
- <!-- SpringBoot集成thymeleaf模板 -->
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-thymeleaf</artifactId>
- </dependency>
+ <!-- SpringBoot 拦截器 -->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-aop</artifactId>
+ </dependency>
- <!-- spring-boot-devtools -->
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-devtools</artifactId>
- <optional>true</optional> <!-- 表示依赖不会传递 -->
- </dependency>
+ <!-- SpringBoot Web容器 -->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-web</artifactId>
+ </dependency>
- <!-- Mysql驱动包 -->
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- </dependency>
+ <!-- SpringBoot集成thymeleaf模板 -->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-thymeleaf</artifactId>
+ </dependency>
- <!-- SpringBoot集成mybatis框架 -->
- <dependency>
- <groupId>org.mybatis.spring.boot</groupId>
- <artifactId>mybatis-spring-boot-starter</artifactId>
- <version>${mybatis.spring.boot.starter.version}</version>
- </dependency>
+ <!-- spring-boot-devtools -->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-devtools</artifactId>
+ <optional>true</optional> <!-- 表示依赖不会传递 -->
+ </dependency>
- <!-- pagehelper 分页插件 -->
- <dependency>
- <groupId>com.github.pagehelper</groupId>
- <artifactId>pagehelper-spring-boot-starter</artifactId>
- <version>${pagehelper.spring.boot.starter.version}</version>
- </dependency>
+ <!-- Mysql驱动包 -->
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ </dependency>
- <!--阿里数据库连接池 -->
- <dependency>
+ <!-- SpringBoot集成mybatis框架 -->
+ <dependency>
+ <groupId>org.mybatis.spring.boot</groupId>
+ <artifactId>mybatis-spring-boot-starter</artifactId>
+ <version>${mybatis.spring.boot.starter.version}</version>
+ </dependency>
+
+ <!-- pagehelper 分页插件 -->
+ <dependency>
+ <groupId>com.github.pagehelper</groupId>
+ <artifactId>pagehelper-spring-boot-starter</artifactId>
+ <version>${pagehelper.spring.boot.starter.version}</version>
+ </dependency>
+
+ <!--阿里数据库连接池 -->
+ <dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid-spring-boot-starter</artifactId>
<version>${druid.version}</version>
</dependency>
- <!--常用工具类 -->
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- </dependency>
+ <!--常用工具类 -->
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </dependency>
- <!--io常用工具类 -->
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>${commons.io.version}</version>
- </dependency>
+ <!--io常用工具类 -->
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>${commons.io.version}</version>
+ </dependency>
- <!--文件上传工具类 -->
- <dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- <version>${commons.fileupload.version}</version>
- </dependency>
+ <!--文件上传工具类 -->
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ <version>${commons.fileupload.version}</version>
+ </dependency>
- <!--Shiro核心框架 -->
- <dependency>
- <groupId>org.apache.shiro</groupId>
- <artifactId>shiro-core</artifactId>
- <version>${shiro.version}</version>
- </dependency>
+ <!--Shiro核心框架 -->
+ <dependency>
+ <groupId>org.apache.shiro</groupId>
+ <artifactId>shiro-core</artifactId>
+ <version>${shiro.version}</version>
+ </dependency>
- <!-- Shiro使用Spring框架 -->
- <dependency>
- <groupId>org.apache.shiro</groupId>
- <artifactId>shiro-spring</artifactId>
- <version>${shiro.version}</version>
- </dependency>
+ <!-- Shiro使用Spring框架 -->
+ <dependency>
+ <groupId>org.apache.shiro</groupId>
+ <artifactId>shiro-spring</artifactId>
+ <version>${shiro.version}</version>
+ </dependency>
- <!-- Shiro使用EhCache缓存框架 -->
- <dependency>
- <groupId>org.apache.shiro</groupId>
- <artifactId>shiro-ehcache</artifactId>
- <version>${shiro.version}</version>
- </dependency>
+ <!-- Shiro使用EhCache缓存框架 -->
+ <dependency>
+ <groupId>org.apache.shiro</groupId>
+ <artifactId>shiro-ehcache</artifactId>
+ <version>${shiro.version}</version>
+ </dependency>
- <!-- thymeleaf模板引擎和shiro框架的整合 -->
- <dependency>
- <groupId>com.github.theborakompanioni</groupId>
- <artifactId>thymeleaf-extras-shiro</artifactId>
- <version>${thymeleaf.extras.shiro.version}</version>
- </dependency>
+ <!-- thymeleaf模板引擎和shiro框架的整合 -->
+ <dependency>
+ <groupId>com.github.theborakompanioni</groupId>
+ <artifactId>thymeleaf-extras-shiro</artifactId>
+ <version>${thymeleaf.extras.shiro.version}</version>
+ </dependency>
- <!-- 阿里JSON解析器 -->
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>fastjson</artifactId>
- <version>${fastjson.version}</version>
- </dependency>
+ <!-- 阿里JSON解析器 -->
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>fastjson</artifactId>
+ <version>${fastjson.version}</version>
+ </dependency>
- <!-- 解析客户端操作系统、浏览器等 -->
- <dependency>
- <groupId>eu.bitwalker</groupId>
- <artifactId>UserAgentUtils</artifactId>
- <version>${bitwalker.version}</version>
- </dependency>
+ <!-- 解析客户端操作系统、浏览器等 -->
+ <dependency>
+ <groupId>eu.bitwalker</groupId>
+ <artifactId>UserAgentUtils</artifactId>
+ <version>${bitwalker.version}</version>
+ </dependency>
- <!--Spring框架基本的核心工具-->
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context-support</artifactId>
- </dependency>
+ <!--Spring框架基本的核心工具-->
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context-support</artifactId>
+ </dependency>
- <!-- 定时任务 -->
- <dependency>
- <groupId>org.quartz-scheduler</groupId>
- <artifactId>quartz</artifactId>
- <exclusions>
- <exclusion>
- <groupId>com.mchange</groupId>
- <artifactId>c3p0</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
+ <!-- 定时任务 -->
+ <dependency>
+ <groupId>org.quartz-scheduler</groupId>
+ <artifactId>quartz</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.mchange</groupId>
+ <artifactId>c3p0</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
- <!--velocity代码生成使用模板 -->
- <dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
- <version>${velocity.version}</version>
- </dependency>
+ <!--velocity代码生成使用模板 -->
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity</artifactId>
+ <version>${velocity.version}</version>
+ </dependency>
- <!--验证码 -->
- <dependency>
- <groupId>com.github.penggle</groupId>
- <artifactId>kaptcha</artifactId>
- <version>${kaptcha.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>javax.servlet-api</artifactId>
- <groupId>javax.servlet</groupId>
- </exclusion>
- </exclusions>
- </dependency>
+ <!--验证码 -->
+ <dependency>
+ <groupId>com.github.penggle</groupId>
+ <artifactId>kaptcha</artifactId>
+ <version>${kaptcha.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>javax.servlet-api</artifactId>
+ <groupId>javax.servlet</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
- <!-- swagger2-->
- <dependency>
- <groupId>io.springfox</groupId>
- <artifactId>springfox-swagger2</artifactId>
- <version>${swagger.version}</version>
- <exclusions>
- <exclusion>
- <groupId>io.swagger</groupId>
- <artifactId>swagger-annotations</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.swagger</groupId>
- <artifactId>swagger-models</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <!--防止进入swagger页面报类型转换错误，排除2.9.2中的引用，手动增加1.5.21版本-->
+ <!-- swagger2-->
+ <dependency>
+ <groupId>io.springfox</groupId>
+ <artifactId>springfox-swagger2</artifactId>
+ <version>${swagger.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>io.swagger</groupId>
+ <artifactId>swagger-annotations</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>io.swagger</groupId>
+ <artifactId>swagger-models</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <!--防止进入swagger页面报类型转换错误，排除2.9.2中的引用，手动增加1.5.21版本-->
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
<version>1.5.21</version>
</dependency>
-
+
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-models</artifactId>
<version>1.5.21</version>
</dependency>
+
+ <!-- swagger2-UI-->
+ <dependency>
+ <groupId>io.springfox</groupId>
+ <artifactId>springfox-swagger-ui</artifactId>
+ <version>${swagger.version}</version>
+ </dependency>
+
+ <!-- 获取系统信息 -->
+ <dependency>
+ <groupId>com.github.oshi</groupId>
+ <artifactId>oshi-core</artifactId>
+ <version>${oshi.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>net.java.dev.jna</groupId>
+ <artifactId>jna</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>net.java.dev.jna</groupId>
+ <artifactId>jna-platform</artifactId>
+ </dependency>
- <!-- swagger2-UI-->
- <dependency>
- <groupId>io.springfox</groupId>
- <artifactId>springfox-swagger-ui</artifactId>
- <version>${swagger.version}</version>
- </dependency>
+ <!-- excel工具 -->
+ <dependency>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi-ooxml</artifactId>
+ <version>${poi.version}</version>
+ </dependency>
- <!-- 获取系统信息 -->
- <dependency>
- <groupId>com.github.oshi</groupId>
- <artifactId>oshi-core</artifactId>
- <version>${oshi.version}</version>
- </dependency>
-
- <dependency>
- <groupId>net.java.dev.jna</groupId>
- <artifactId>jna</artifactId>
- </dependency>
-
- <dependency>
- <groupId>net.java.dev.jna</groupId>
- <artifactId>jna-platform</artifactId>
- </dependency>
-
- <!-- excel工具 -->
- <dependency>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi-ooxml</artifactId>
- <version>${poi.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- <version>1.18.8</version>
- </dependency>
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <version>1.18.8</version>
+ </dependency>
- <!--极光推送-->
- <dependency>
- <groupId>cn.jpush.api</groupId>
- <artifactId>jpush-client</artifactId>
- <version>3.3.10</version>
- </dependency>
+ <!--极光推送-->
+ <dependency>
+ <groupId>cn.jpush.api</groupId>
+ <artifactId>jpush-client</artifactId>
+ <version>3.3.10</version>
+ </dependency>
- <dependency>
- <groupId>cn.jpush.api</groupId>
- <artifactId>jiguang-common</artifactId>
- <version>1.1.4</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-all</artifactId>
- <version>4.1.6.Final</version>
- <scope>compile</scope>
- </dependency>
+ <dependency>
+ <groupId>cn.jpush.api</groupId>
+ <artifactId>jiguang-common</artifactId>
+ <version>1.1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-all</artifactId>
+ <version>4.1.6.Final</version>
+ <scope>compile</scope>
+ </dependency>
- <!--开启 cache 缓存 -->
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-cache</artifactId>
- </dependency>
- <!-- ehcache 缓存 -->
- <dependency>
- <groupId>org.ehcache</groupId>
- <artifactId>ehcache</artifactId>
- <version>3.8.1</version>
- </dependency>
- <dependency>
- <groupId>javax.cache</groupId>
- <artifactId>cache-api</artifactId>
- <version>1.1.1</version>
- </dependency>
+ <!--开启 cache 缓存 -->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-cache</artifactId>
+ </dependency>
+ <!-- ehcache 缓存 -->
+ <dependency>
+ <groupId>org.ehcache</groupId>
+ <artifactId>ehcache</artifactId>
+ <version>3.8.1</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.cache</groupId>
+ <artifactId>cache-api</artifactId>
+ <version>1.1.1</version>
+ </dependency>
- <!--二维码生成配置-->
- <dependency>
- <groupId>com.google.zxing</groupId>
- <artifactId>core</artifactId>
- <version>3.2.1</version>
- </dependency>
+ <!--二维码生成配置-->
+ <dependency>
+ <groupId>com.google.zxing</groupId>
+ <artifactId>core</artifactId>
+ <version>3.2.1</version>
+ </dependency>
<!--后面是新增的依赖-->
<dependency>
@@ -348,44 +360,44 @@
<version>3.5.2</version>
</dependency>
- </dependencies>
+ </dependencies>
- <build>
- <finalName>${project.artifactId}</finalName>
- <plugins>
- <plugin>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
- <configuration>
- <fork>true</fork> <!-- 如果没有该配置，devtools不会生效 -->
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <build>
+ <finalName>${project.artifactId}</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ <configuration>
+ <fork>true</fork> <!-- 如果没有该配置，devtools不会生效 -->
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
- <repositories>
- <repository>
- <id>public</id>
- <name>aliyun nexus</name>
- <url>http://maven.aliyun.com/nexus/content/groups/public/</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- </repositories>
+ <repositories>
+ <repository>
+ <id>public</id>
+ <name>aliyun nexus</name>
+ <url>http://maven.aliyun.com/nexus/content/groups/public/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ </repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>public</id>
- <name>aliyun nexus</name>
- <url>http://maven.aliyun.com/nexus/content/groups/public/</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>public</id>
+ <name>aliyun nexus</name>
+ <url>http://maven.aliyun.com/nexus/content/groups/public/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
</project>
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/CJReportResultData.java b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/CJReportResultData.java
new file mode 100644
index 0000000..3639da3
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/CJReportResultData.java
@@ -0,0 +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;
+ }
+
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/Data.java b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/Data.java
new file mode 100644
index 0000000..cb0a34b
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/Data.java
@@ -0,0 +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;
+ }
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/ErrorMsgDetails.java b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/ErrorMsgDetails.java
new file mode 100644
index 0000000..6880584
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/ErrorMsgDetails.java
@@ -0,0 +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;
+ }
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportCheckRecordFromTaskDTO.java b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportCheckRecordFromTaskDTO.java
new file mode 100644
index 0000000..c4138a7
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportCheckRecordFromTaskDTO.java
@@ -0,0 +1,157 @@
+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_check_record_from_task")
+public class CJReportCheckRecordFromTaskDTO {
+ /**
+ * 主键
+ */
+ private String id;
+ /**
+ * 公司编码
+ */
+ private String companyCode;
+ /**
+ * 删除标志：0-有效，1-删除
+ */
+ private String deleted;
+ /**
+ * 创建时间
+ */
+ private String createDate;
+ /**
+ * 创建人
+ */
+ private String createBy;
+ /**
+ * 最后修改时间
+ */
+ private String updateDate;
+ /**
+ * 修改人
+ */
+ private String updateBy;
+ /**
+ * 隐患排查作业UUID
+ */
+ private String checkTaskId;
+ /**
+ * 排 查 结 果
+ */
+ private String checkStatus;
+ /**
+ * 排查时间
+ */
+ private String checkTime;
+ /**
+ * 修改人手机号
+ */
+ private String updateByMobile;
+ /**
+ * 创建人手机号
+ */
+ private String createByMobile;
+
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getCompanyCode() {
+ return companyCode;
+ }
+
+ public void setCompanyCode(String companyCode) {
+ this.companyCode = companyCode;
+ }
+
+ public String getDeleted() {
+ return deleted;
+ }
+
+ public void setDeleted(String deleted) {
+ this.deleted = deleted;
+ }
+
+ public String getCreateDate() {
+ return createDate;
+ }
+
+ public void setCreateDate(String createDate) {
+ this.createDate = createDate;
+ }
+
+ public String getCreateBy() {
+ return createBy;
+ }
+
+ public void setCreateBy(String createBy) {
+ this.createBy = createBy;
+ }
+
+ public String getUpdateDate() {
+ return updateDate;
+ }
+
+ public void setUpdateDate(String updateDate) {
+ this.updateDate = updateDate;
+ }
+
+ public String getUpdateBy() {
+ return updateBy;
+ }
+
+ public void setUpdateBy(String updateBy) {
+ this.updateBy = updateBy;
+ }
+
+ public String getCheckTaskId() {
+ return checkTaskId;
+ }
+
+ public void setCheckTaskId(String checkTaskId) {
+ this.checkTaskId = checkTaskId;
+ }
+
+ public String getCheckStatus() {
+ return checkStatus;
+ }
+
+ public void setCheckStatus(String checkStatus) {
+ this.checkStatus = checkStatus;
+ }
+
+ public String getCheckTime() {
+ return checkTime;
+ }
+
+ public void setCheckTime(String checkTime) {
+ this.checkTime = checkTime;
+ }
+
+ public String getCreateByMobile() {
+ return createByMobile;
+ }
+
+ public void setCreateByMobile(String createByMobile) {
+ this.createByMobile = createByMobile;
+ }
+
+ public String getUpdateByMobile() {
+ return updateByMobile;
+ }
+
+ public void setUpdateByMobile(String updateByMobile) {
+ this.updateByMobile = updateByMobile;
+ }
+
+}
+
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportCheckTaskFromWorkDTO.java b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportCheckTaskFromWorkDTO.java
new file mode 100644
index 0000000..6eeee58
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportCheckTaskFromWorkDTO.java
@@ -0,0 +1,132 @@
+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_check_task_from_work")
+public class CJReportCheckTaskFromWorkDTO implements Serializable {
+ /**
+ * 主键
+ */
+ private String id;
+ /**
+ * 公司编码
+ */
+ private String companyCode;
+ /**
+ * 删除标志：0-有效，1-删除
+ */
+ private String deleted;
+ /**
+ * 创建时间
+ */
+ private String createDate;
+ /**
+ * 创建人
+ */
+ private String createBy;
+ /**
+ * 最后修改时间
+ */
+ private String updateDate;
+ /**
+ * 修改人
+ */
+ private String updateBy;
+ /**
+ * 管控措施UUID
+ */
+ private String riskMeasureId;
+ /**
+ * 巡检周期
+ */
+ private Integer checkCycle;
+ /**
+ * 巡检周期单位 小时，日，月，年
+ */
+ private String checkCycleUnit;
+
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getCompanyCode() {
+ return companyCode;
+ }
+
+ public void setCompanyCode(String companyCode) {
+ this.companyCode = companyCode;
+ }
+
+ public String getDeleted() {
+ return deleted;
+ }
+
+ public void setDeleted(String deleted) {
+ this.deleted = deleted;
+ }
+
+ public String getCreateBy() {
+ return createBy;
+ }
+
+ public void setCreateBy(String createBy) {
+ this.createBy = createBy;
+ }
+
+ public String getCreateDate() {
+ return createDate;
+ }
+
+ public void setCreateDate(String createDate) {
+ this.createDate = createDate;
+ }
+
+ public String getUpdateDate() {
+ return updateDate;
+ }
+
+ public void setUpdateDate(String updateDate) {
+ this.updateDate = updateDate;
+ }
+
+ public String getUpdateBy() {
+ return updateBy;
+ }
+
+ public void setUpdateBy(String updateBy) {
+ this.updateBy = updateBy;
+ }
+
+ public String getRiskMeasureId() {
+ return riskMeasureId;
+ }
+
+ public void setRiskMeasureId(String riskMeasureId) {
+ this.riskMeasureId = riskMeasureId;
+ }
+
+ public Integer getCheckCycle() {
+ return checkCycle;
+ }
+
+ public void setCheckCycle(Integer checkCycle) {
+ this.checkCycle = checkCycle;
+ }
+
+ public String getCheckCycleUnit() {
+ return checkCycleUnit;
+ }
+
+ public void setCheckCycleUnit(String checkCycleUnit) {
+ this.checkCycleUnit = checkCycleUnit;
+ }
+}
+
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportDangerInfoDTO.java b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportDangerInfoDTO.java
new file mode 100644
index 0000000..380c9e9
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportDangerInfoDTO.java
@@ -0,0 +1,334 @@
+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_danger_info")
+public class CJReportDangerInfoDTO{
+ /**
+ * 主键
+ */
+ private String id;
+ /**
+ * 公司编码
+ */
+ private String companyCode;
+ /**
+ * 删除标志：0-有效，1-删除
+ */
+ private String deleted;
+ /**
+ * 创建时间
+ */
+ private String createDate;
+ /**
+ * 创建人
+ */
+ private String createBy;
+ /**
+ * 最后修改时间
+ */
+ private String 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 String dangerManageDeadline;
+ /**
+ * 隐患状态
+ */
+ private String dangerState;
+ /**
+ * 隐患类型
+ */
+ private String hazardDangerType;
+ /**
+ * 登记人姓名
+ */
+ private String registrant;
+ /**
+ * 登记时间
+ */
+ private String registTime;
+ /**
+ * 整改责任人姓名
+ */
+ private String liablePerson;
+ /**
+ * 验收人
+ */
+ private String checkAcceptPerson;
+ /**
+ * 验收情况
+ */
+ private String checkAcceptComment;
+ /**
+ * 验收时间
+ */
+ private String checkAcceptTime;
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getCompanyCode() {
+ return companyCode;
+ }
+
+ public void setCompanyCode(String companyCode) {
+ this.companyCode = companyCode;
+ }
+
+ public String getCreateBy() {
+ return createBy;
+ }
+
+ public void setCreateBy(String createBy) {
+ this.createBy = createBy;
+ }
+
+ public String getUpdateBy() {
+ return updateBy;
+ }
+
+ public void setUpdateBy(String updateBy) {
+ this.updateBy = updateBy;
+ }
+
+ public String getHazardCode() {
+ return hazardCode;
+ }
+
+ public void setHazardCode(String hazardCode) {
+ this.hazardCode = hazardCode;
+ }
+
+ public String getRiskMeasureId() {
+ return riskMeasureId;
+ }
+
+ public void setRiskMeasureId(String riskMeasureId) {
+ this.riskMeasureId = riskMeasureId;
+ }
+
+ public String getCheckRecordId() {
+ return checkRecordId;
+ }
+
+ public void setCheckRecordId(String checkRecordId) {
+ this.checkRecordId = checkRecordId;
+ }
+
+ public String getDangerName() {
+ return dangerName;
+ }
+
+ public void setDangerName(String dangerName) {
+ this.dangerName = dangerName;
+ }
+
+ public String getDangerLevel() {
+ return dangerLevel;
+ }
+
+ public void setDangerLevel(String dangerLevel) {
+ this.dangerLevel = dangerLevel;
+ }
+
+ public String getDangerSrc() {
+ return dangerSrc;
+ }
+
+ public void setDangerSrc(String dangerSrc) {
+ this.dangerSrc = dangerSrc;
+ }
+
+ public String getDangerManageType() {
+ return dangerManageType;
+ }
+
+ public void setDangerManageType(String dangerManageType) {
+ this.dangerManageType = dangerManageType;
+ }
+
+ public String getDangerDesc() {
+ return dangerDesc;
+ }
+
+ public void setDangerDesc(String dangerDesc) {
+ this.dangerDesc = dangerDesc;
+ }
+
+ public String getDangerReason() {
+ return dangerReason;
+ }
+
+ public void setDangerReason(String dangerReason) {
+ this.dangerReason = dangerReason;
+ }
+
+ public String getControlMeasures() {
+ return controlMeasures;
+ }
+
+ public void setControlMeasures(String controlMeasures) {
+ this.controlMeasures = controlMeasures;
+ }
+
+ public String getCost() {
+ return cost;
+ }
+
+ public void setCost(String cost) {
+ this.cost = cost;
+ }
+
+ public String getDangerState() {
+ return dangerState;
+ }
+
+ public void setDangerState(String dangerState) {
+ this.dangerState = dangerState;
+ }
+
+ public String getHazardDangerType() {
+ return hazardDangerType;
+ }
+
+ public void setHazardDangerType(String hazardDangerType) {
+ this.hazardDangerType = hazardDangerType;
+ }
+
+ public String getRegistrant() {
+ return registrant;
+ }
+
+ public void setRegistrant(String registrant) {
+ this.registrant = registrant;
+ }
+ public String getLiablePerson() {
+ return liablePerson;
+ }
+
+ public void setLiablePerson(String liablePerson) {
+ this.liablePerson = liablePerson;
+ }
+
+ public String getCheckAcceptPerson() {
+ return checkAcceptPerson;
+ }
+
+ public void setCheckAcceptPerson(String checkAcceptPerson) {
+ this.checkAcceptPerson = checkAcceptPerson;
+ }
+
+ public String getCheckAcceptComment() {
+ return checkAcceptComment;
+ }
+
+ public void setCheckAcceptComment(String checkAcceptComment) {
+ this.checkAcceptComment = checkAcceptComment;
+ }
+
+ public String getDeleted() {
+ return deleted;
+ }
+
+ public void setDeleted(String deleted) {
+ this.deleted = deleted;
+ }
+
+ public String getCreateDate() {
+ return createDate;
+ }
+
+ public void setCreateDate(String createDate) {
+ this.createDate = createDate;
+ }
+
+ public String getUpdateDate() {
+ return updateDate;
+ }
+
+ public void setUpdateDate(String updateDate) {
+ this.updateDate = updateDate;
+ }
+
+ public String getDangerManageDeadline() {
+ return dangerManageDeadline;
+ }
+
+ public void setDangerManageDeadline(String dangerManageDeadline) {
+ this.dangerManageDeadline = dangerManageDeadline;
+ }
+
+ public String getRegistTime() {
+ return registTime;
+ }
+
+ public void setRegistTime(String registTime) {
+ this.registTime = registTime;
+ }
+
+ public String getCheckAcceptTime() {
+ return checkAcceptTime;
+ }
+
+ public void setCheckAcceptTime(String checkAcceptTime) {
+ this.checkAcceptTime = checkAcceptTime;
+ }
+}
+
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportPointDTO.java b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportPointDTO.java
new file mode 100644
index 0000000..7649d04
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportPointDTO.java
@@ -0,0 +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;
+ }
+
+
+}
+
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportRiskAnaUnitDTO.java b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportRiskAnaUnitDTO.java
new file mode 100644
index 0000000..25ec4e4
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportRiskAnaUnitDTO.java
@@ -0,0 +1,145 @@
+package com.ruoyi.doublePrevention.entity.CJReport.CJdto.HandlerDO;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+//@TableName("prevent_cj_report_risk_ana_unit")
+public class CJReportRiskAnaUnitDTO {
+ /**
+ * 主键
+ */
+ private String id;
+ /**
+ * 公司编码
+ */
+ private String companyCode;
+ /**
+ * 安全风险分析单元名称
+ */
+ private String riskUnitName;
+ /**
+ * 安全风险分析对象编码
+ */
+ private String hazardCode;
+ /**
+ * 责任部门
+ */
+ 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;
+ }
+}
+
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportRiskControlMeasureDTO.java b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportRiskControlMeasureDTO.java
new file mode 100644
index 0000000..2952f3a
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportRiskControlMeasureDTO.java
@@ -0,0 +1,179 @@
+package com.ruoyi.doublePrevention.entity.CJReport.CJdto.HandlerDO;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.util.Date;
+
+//@TableName("prevent_cj_report_risk_control_measure")
+public class CJReportRiskControlMeasureDTO implements Serializable {
+ /**
+ * 主键
+ */
+ private String id;
+ /**
+ * 公司编码
+ */
+ private String companyCode;
+ /**
+ * 删除标志：0-有效，1-删除
+ */
+ private String deleted;
+ /**
+ * 创建时间
+ */
+ private String createDate;
+ /**
+ * 创建人
+ */
+ private String createBy;
+ /**
+ * 最后修改时间
+ */
+ private String 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;
+
+ 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;
+ }
+}
+
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportRiskEventDTO.java b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportRiskEventDTO.java
new file mode 100644
index 0000000..bd4f459
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportRiskEventDTO.java
@@ -0,0 +1,118 @@
+package com.ruoyi.doublePrevention.entity.CJReport.CJdto.HandlerDO;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.util.Date;
+
+//@TableName("prevent_cj_report_risk_event")
+public class CJReportRiskEventDTO implements Serializable {
+ /**
+ * 主键
+ */
+ private String id;
+ /**
+ * 公司编码
+ */
+ private String companyCode;
+ /**
+ * 风险事件名称
+ */
+ private String riskEventName;
+ /**
+ * 关联风险分析单元UUID
+ */
+ private String riskUnitId;
+ /**
+ * 删除标志：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;
+ }
+}
+
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportCheckRecordFromTask.java b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportCheckRecordFromTask.java
new file mode 100644
index 0000000..71c2fe5
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportCheckRecordFromTask.java
@@ -0,0 +1,218 @@
+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_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;
+
+ public Long getTaskId() {
+ return taskId;
+ }
+
+ public void setTaskId(Long taskId) {
+ this.taskId = taskId;
+ }
+
+ public Integer getIndexId() {
+ return indexId;
+ }
+
+ public void setIndexId(Integer indexId) {
+ this.indexId = indexId;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getCompanyCode() {
+ return companyCode;
+ }
+
+ public void setCompanyCode(String companyCode) {
+ this.companyCode = companyCode;
+ }
+
+ public String getDeleted() {
+ return deleted;
+ }
+
+ public void setDeleted(String deleted) {
+ this.deleted = deleted;
+ }
+
+ public Date getCreateDate() {
+ return createDate;
+ }
+
+ public void setCreateDate(Date createDate) {
+ this.createDate = createDate;
+ }
+
+ public String getCreateBy() {
+ return createBy;
+ }
+
+ public void setCreateBy(String createBy) {
+ this.createBy = createBy;
+ }
+
+ public Date getUpdateDate() {
+ return updateDate;
+ }
+
+ public void setUpdateDate(Date updateDate) {
+ this.updateDate = updateDate;
+ }
+
+ public String getUpdateBy() {
+ return updateBy;
+ }
+
+ public void setUpdateBy(String updateBy) {
+ this.updateBy = updateBy;
+ }
+
+ public String getCheckTaskId() {
+ return checkTaskId;
+ }
+
+ public void setCheckTaskId(String checkTaskId) {
+ this.checkTaskId = checkTaskId;
+ }
+
+ public String getCheckStatus() {
+ return checkStatus;
+ }
+
+ public void setCheckStatus(String checkStatus) {
+ this.checkStatus = checkStatus;
+ }
+
+ public Date getCheckTime() {
+ return checkTime;
+ }
+
+ public void setCheckTime(Date checkTime) {
+ this.checkTime = checkTime;
+ }
+
+ public String getCreateByMobile() {
+ return createByMobile;
+ }
+
+ public void setCreateByMobile(String createByMobile) {
+ this.createByMobile = createByMobile;
+ }
+
+ public String getUpdateByMobile() {
+ return updateByMobile;
+ }
+
+ public void setUpdateByMobile(String updateByMobile) {
+ this.updateByMobile = updateByMobile;
+ }
+
+ public Date getReportTime() {
+ return reportTime;
+ }
+
+ public void setReportTime(Date reportTime) {
+ this.reportTime = reportTime;
+ }
+
+ public Byte getReportStatus() {
+ return reportStatus;
+ }
+
+ public void setReportStatus(Byte reportStatus) {
+ this.reportStatus = reportStatus;
+ }
+
+ public Byte getDataSource() {
+ return dataSource;
+ }
+
+ public void setDataSource(Byte dataSource) {
+ this.dataSource = dataSource;
+ }
+}
+
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportCheckTaskFromWork.java b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportCheckTaskFromWork.java
new file mode 100644
index 0000000..45a273c
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportCheckTaskFromWork.java
@@ -0,0 +1,194 @@
+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_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;
+
+ public Long getWorkId() {
+ return workId;
+ }
+
+ public void setWorkId(Long workId) {
+ this.workId = workId;
+ }
+
+ public Integer getIndexId() {
+ return indexId;
+ }
+
+ public void setIndexId(Integer indexId) {
+ this.indexId = indexId;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getCompanyCode() {
+ return companyCode;
+ }
+
+ public void setCompanyCode(String companyCode) {
+ this.companyCode = companyCode;
+ }
+
+ public String getDeleted() {
+ return deleted;
+ }
+
+ public void setDeleted(String deleted) {
+ this.deleted = deleted;
+ }
+
+ public Date getCreateDate() {
+ return createDate;
+ }
+
+ public void setCreateDate(Date createDate) {
+ this.createDate = createDate;
+ }
+
+ public String getCreateBy() {
+ return createBy;
+ }
+
+ public void setCreateBy(String createBy) {
+ this.createBy = createBy;
+ }
+
+ public Date getUpdateDate() {
+ return updateDate;
+ }
+
+ public void setUpdateDate(Date updateDate) {
+ this.updateDate = updateDate;
+ }
+
+ public String getUpdateBy() {
+ return updateBy;
+ }
+
+ public void setUpdateBy(String updateBy) {
+ this.updateBy = updateBy;
+ }
+
+ public String getRiskMeasureId() {
+ return riskMeasureId;
+ }
+
+ public void setRiskMeasureId(String riskMeasureId) {
+ this.riskMeasureId = riskMeasureId;
+ }
+
+ public Integer getCheckCycle() {
+ return checkCycle;
+ }
+
+ public void setCheckCycle(Integer checkCycle) {
+ this.checkCycle = checkCycle;
+ }
+
+ public String getCheckCycleUnit() {
+ return checkCycleUnit;
+ }
+
+ public void setCheckCycleUnit(String checkCycleUnit) {
+ this.checkCycleUnit = checkCycleUnit;
+ }
+
+ public Date getReportTime() {
+ return reportTime;
+ }
+
+ public void setReportTime(Date reportTime) {
+ this.reportTime = reportTime;
+ }
+
+ public Byte getReportStatus() {
+ return reportStatus;
+ }
+
+ public void setReportStatus(Byte reportStatus) {
+ this.reportStatus = reportStatus;
+ }
+
+ public Byte getDataSource() {
+ return dataSource;
+ }
+
+ public void setDataSource(Byte dataSource) {
+ this.dataSource = dataSource;
+ }
+}
+
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportConfig.java b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportConfig.java
new file mode 100644
index 0000000..dca5f91
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportConfig.java
@@ -0,0 +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;
+ }
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportConfigLog.java b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportConfigLog.java
new file mode 100644
index 0000000..4988630
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportConfigLog.java
@@ -0,0 +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;
+ }
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportDangerInfo.java b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportDangerInfo.java
new file mode 100644
index 0000000..1641dda
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportDangerInfo.java
@@ -0,0 +1,398 @@
+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_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;
+
+ public Long getDangerManagerId() {
+ return dangerManagerId;
+ }
+
+ public void setDangerManagerId(Long dangerManagerId) {
+ this.dangerManagerId = dangerManagerId;
+ }
+
+ public Integer getIndexId() {
+ return indexId;
+ }
+
+ public void setIndexId(Integer indexId) {
+ this.indexId = indexId;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getCompanyCode() {
+ return companyCode;
+ }
+
+ public void setCompanyCode(String companyCode) {
+ this.companyCode = companyCode;
+ }
+
+ public Date getCreateDate() {
+ return createDate;
+ }
+
+ public void setCreateDate(Date createDate) {
+ this.createDate = createDate;
+ }
+
+ public String getCreateBy() {
+ return createBy;
+ }
+
+ public void setCreateBy(String createBy) {
+ this.createBy = createBy;
+ }
+
+ public Date getUpdateDate() {
+ return updateDate;
+ }
+
+ public void setUpdateDate(Date updateDate) {
+ this.updateDate = updateDate;
+ }
+
+ public String getUpdateBy() {
+ return updateBy;
+ }
+
+ public void setUpdateBy(String updateBy) {
+ this.updateBy = updateBy;
+ }
+
+ public String getHazardCode() {
+ return hazardCode;
+ }
+
+ public void setHazardCode(String hazardCode) {
+ this.hazardCode = hazardCode;
+ }
+
+ public String getRiskMeasureId() {
+ return riskMeasureId;
+ }
+
+ public void setRiskMeasureId(String riskMeasureId) {
+ this.riskMeasureId = riskMeasureId;
+ }
+
+ public String getCheckRecordId() {
+ return checkRecordId;
+ }
+
+ public void setCheckRecordId(String checkRecordId) {
+ this.checkRecordId = checkRecordId;
+ }
+
+ public String getDangerName() {
+ return dangerName;
+ }
+
+ public void setDangerName(String dangerName) {
+ this.dangerName = dangerName;
+ }
+
+ public String getDangerLevel() {
+ return dangerLevel;
+ }
+
+ public void setDangerLevel(String dangerLevel) {
+ this.dangerLevel = dangerLevel;
+ }
+
+ public String getDangerSrc() {
+ return dangerSrc;
+ }
+
+ public void setDangerSrc(String dangerSrc) {
+ this.dangerSrc = dangerSrc;
+ }
+
+ public String getDangerManageType() {
+ return dangerManageType;
+ }
+
+ public void setDangerManageType(String dangerManageType) {
+ this.dangerManageType = dangerManageType;
+ }
+
+ public String getDangerDesc() {
+ return dangerDesc;
+ }
+
+ public void setDangerDesc(String dangerDesc) {
+ this.dangerDesc = dangerDesc;
+ }
+
+ public String getDangerReason() {
+ return dangerReason;
+ }
+
+ public void setDangerReason(String dangerReason) {
+ this.dangerReason = dangerReason;
+ }
+
+ public String getControlMeasures() {
+ return controlMeasures;
+ }
+
+ public void setControlMeasures(String controlMeasures) {
+ this.controlMeasures = controlMeasures;
+ }
+
+ public String getCost() {
+ return cost;
+ }
+
+ public void setCost(String cost) {
+ this.cost = cost;
+ }
+
+ public Date getDangerManageDeadline() {
+ return dangerManageDeadline;
+ }
+
+ public void setDangerManageDeadline(Date dangerManageDeadline) {
+ this.dangerManageDeadline = dangerManageDeadline;
+ }
+
+ public String getDangerState() {
+ return dangerState;
+ }
+
+ public void setDangerState(String dangerState) {
+ this.dangerState = dangerState;
+ }
+
+ public String getHazardDangerType() {
+ return hazardDangerType;
+ }
+
+ public void setHazardDangerType(String hazardDangerType) {
+ this.hazardDangerType = hazardDangerType;
+ }
+
+ public String getRegistrant() {
+ return registrant;
+ }
+
+ public void setRegistrant(String registrant) {
+ this.registrant = registrant;
+ }
+
+ public Date getRegistTime() {
+ return registTime;
+ }
+
+ public void setRegistTime(Date registTime) {
+ this.registTime = registTime;
+ }
+
+ public String getLiablePerson() {
+ return liablePerson;
+ }
+
+ public void setLiablePerson(String liablePerson) {
+ this.liablePerson = liablePerson;
+ }
+
+ public String getCheckAcceptPerson() {
+ return checkAcceptPerson;
+ }
+
+ public void setCheckAcceptPerson(String checkAcceptPerson) {
+ this.checkAcceptPerson = checkAcceptPerson;
+ }
+
+ public String getCheckAcceptComment() {
+ return checkAcceptComment;
+ }
+
+ public void setCheckAcceptComment(String checkAcceptComment) {
+ this.checkAcceptComment = checkAcceptComment;
+ }
+
+ public Date getCheckAcceptTime() {
+ return checkAcceptTime;
+ }
+
+ public void setCheckAcceptTime(Date checkAcceptTime) {
+ this.checkAcceptTime = checkAcceptTime;
+ }
+
+ public Date getReportTime() {
+ return reportTime;
+ }
+
+ public void setReportTime(Date reportTime) {
+ this.reportTime = reportTime;
+ }
+
+ public Byte getReportStatus() {
+ return reportStatus;
+ }
+
+ public void setReportStatus(Byte reportStatus) {
+ this.reportStatus = reportStatus;
+ }
+
+ public Byte getDataSource() {
+ return dataSource;
+ }
+
+ public void setDataSource(Byte dataSource) {
+ this.dataSource = dataSource;
+ }
+
+ public String getDeleted() {
+ return deleted;
+ }
+
+ public void setDeleted(String deleted) {
+ this.deleted = deleted;
+ }
+}
+
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportPoint.java b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportPoint.java
new file mode 100644
index 0000000..e1c63b0
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportPoint.java
@@ -0,0 +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;
+ }
+
+}
+
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportResultData.java b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportResultData.java
new file mode 100644
index 0000000..b31dd5f
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportResultData.java
@@ -0,0 +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;
+ }
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportRiskAnaUnit.java b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportRiskAnaUnit.java
new file mode 100644
index 0000000..3287958
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportRiskAnaUnit.java
@@ -0,0 +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;
+ }
+
+
+}
+
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportRiskControlMeasure.java b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportRiskControlMeasure.java
new file mode 100644
index 0000000..96edb53
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportRiskControlMeasure.java
@@ -0,0 +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;
+ }
+
+}
+
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportRiskEvent.java b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportRiskEvent.java
new file mode 100644
index 0000000..7156867
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportRiskEvent.java
@@ -0,0 +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;
+ }
+
+}
+
diff --git a/src/main/java/com/ruoyi/doublePrevention/enums/CJReportEnum.java b/src/main/java/com/ruoyi/doublePrevention/enums/CJReportEnum.java
new file mode 100644
index 0000000..044952d
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/enums/CJReportEnum.java
@@ -0,0 +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;
+ }
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/enums/E.java b/src/main/java/com/ruoyi/doublePrevention/enums/E.java
new file mode 100644
index 0000000..d9cfe0b
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/enums/E.java
@@ -0,0 +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;
+ }
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/enums/SyncEnum.java b/src/main/java/com/ruoyi/doublePrevention/enums/SyncEnum.java
index 042c66a..3b3ba20 100644
--- a/src/main/java/com/ruoyi/doublePrevention/enums/SyncEnum.java
+++ b/src/main/java/com/ruoyi/doublePrevention/enums/SyncEnum.java
@@ -12,12 +12,12 @@
REPORT_ON((byte) 0, "开启"),
REPORT_OFF((byte) 1, "关闭"),
- CHOOSE_DATA_REPORT_ON((byte) 1, "上报"),
- CHOOSE_DATA_REPORT_OFF((byte) 2, "不上报"),
-
REPORT_AUTO_EXEC_CONFIG((byte) 0, "手动上报配置"),
REPORT_HAND_EXEC_CONFIG((byte) 1, "自动上报配置"),
+ CHOOSE_DATA_REPORT_ON((byte) 1, "上报"),
+ CHOOSE_DATA_REPORT_OFF((byte) 2, "不上报"),
+
REPORT_CONFIG_RISK_ANA_UNIT((byte) 1, "风险分析单元"),
REPORT_CONFIG_RISK_EVENT((byte) 2, "安全风险分析事件"),
REPORT_CONFIG_RISK_MEASURE((byte) 3, "安全风险管控措施"),
diff --git a/src/main/java/com/ruoyi/doublePrevention/exception/AusinessException.java b/src/main/java/com/ruoyi/doublePrevention/exception/AusinessException.java
new file mode 100644
index 0000000..5d64b98
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/exception/AusinessException.java
@@ -0,0 +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;
+ }
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/exception/BusinessException.java b/src/main/java/com/ruoyi/doublePrevention/exception/BusinessException.java
new file mode 100644
index 0000000..6755d06
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/exception/BusinessException.java
@@ -0,0 +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;
+ }
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportCheckRecordFromTaskRepository.java b/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportCheckRecordFromTaskRepository.java
new file mode 100644
index 0000000..0c67ee7
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportCheckRecordFromTaskRepository.java
@@ -0,0 +1,37 @@
+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 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);
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportCheckTaskFromWorkRepository.java b/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportCheckTaskFromWorkRepository.java
new file mode 100644
index 0000000..80d512f
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportCheckTaskFromWorkRepository.java
@@ -0,0 +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.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> {
+
+// /**
+// * 上报数据-任务配置-分页查询
+// */
+// IPage<PreventCJReportCheckTaskFromWork> getReportTaskFromWorkPage(Page<Object> objectPage, PreventReportCheckTaskFromWorkReqDTO queryReqDTO);
+ /**
+ * 批量插入数据
+ * */
+ int insertList(List<PreventCJReportCheckTaskFromWork> taskFromWorkLists);
+ /**
+ * 任务配置 -查询待上报
+ * */
+ List<PreventCJReportCheckTaskFromWork> listReportTaskFromWorkDate();
+ /**
+ * 任务配置 -待上报状态变更
+ * */
+ int updateWorkReportStatus(HandlerReportParam handlerReportParam);
+ /**
+ * 任务配置 -待上报状态变更 -通过id
+ * */
+ int updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);
+ /**
+ * 插入数据
+ * */
+ int insertTaskFromWorkList(PreventCJReportCheckTaskFromWork cjTaskFromWork);
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportConfigLogRepository.java b/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportConfigLogRepository.java
new file mode 100644
index 0000000..628c259
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportConfigLogRepository.java
@@ -0,0 +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> {
+//
+// /**
+// * 数据上报配置历史记录-查询
+// */
+// IPage<PreventCJReportConfigLog> getReportConfigLogPage(Page<Object> page, PreventReportConfigLogQueryReqDTO queryReqDTO);
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportConfigRepository.java b/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportConfigRepository.java
new file mode 100644
index 0000000..267ed91
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportConfigRepository.java
@@ -0,0 +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);
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportDangerInfoRepository.java b/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportDangerInfoRepository.java
new file mode 100644
index 0000000..6a0d783
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportDangerInfoRepository.java
@@ -0,0 +1,36 @@
+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);
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportPointRepository.java b/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportPointRepository.java
new file mode 100644
index 0000000..16401bc
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportPointRepository.java
@@ -0,0 +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> {
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportResultDataRepository.java b/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportResultDataRepository.java
new file mode 100644
index 0000000..4963c2e
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportResultDataRepository.java
@@ -0,0 +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> {
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportRiskAnaUnitRepository.java b/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportRiskAnaUnitRepository.java
new file mode 100644
index 0000000..39326ef
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportRiskAnaUnitRepository.java
@@ -0,0 +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);
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportRiskControlMeasureRepository.java b/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportRiskControlMeasureRepository.java
new file mode 100644
index 0000000..d777f25
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportRiskControlMeasureRepository.java
@@ -0,0 +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);
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportRiskEventRepository.java b/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportRiskEventRepository.java
new file mode 100644
index 0000000..8d6432e
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportRiskEventRepository.java
@@ -0,0 +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);
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskControlMeasureRepository.java b/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskControlMeasureRepository.java
index a6c0f8f..4df18ba 100644
--- a/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskControlMeasureRepository.java
+++ b/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskControlMeasureRepository.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.doublePrevention.entity.PreventRiskControlMeasure;
+import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
@@ -41,6 +42,19 @@
/**
* @description 分页获取风险管控措施
*/
+ List<PreventRiskControlMeasure> listRiskEvenByCondition(@Param("controlType") Byte controlType,@Param("riskEventId") Long riskEventId);
+
+
+
+
+ /**
+ * 检索需要上报的风险管控措施
+ */
+ List<PreventRiskControlMeasure> listReportMeasure();
+ /**
+ * 修改上报的风险管控措施状态
+ */
+ int updateMeasureReportStatus(HandlerReportParam handlerReportParam);
List<PreventRiskControlMeasure> listRiskControlMeasureByCondition(@Param("controlType") Byte controlType,@Param("riskEventId") Long riskEventId);
/**
diff --git a/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskControlTemplateRepository.java b/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskControlTemplateRepository.java
index d9bb898..a155625 100644
--- a/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskControlTemplateRepository.java
+++ b/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskControlTemplateRepository.java
@@ -13,5 +13,8 @@
* 管控措施- 获取管控措施模板
*/
List<PreventRiskControlTemplate> listMeasureTemplates();
-
+ /**
+ * 管控措施- 获取管控措施模板 - by id
+ */
+ PreventRiskControlTemplate getControlTemplateById(Byte classify2);
}
diff --git a/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskDangerCheckLogRepository.java b/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskDangerCheckLogRepository.java
index 78a7e7a..ddf0c83 100644
--- a/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskDangerCheckLogRepository.java
+++ b/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskDangerCheckLogRepository.java
@@ -1,7 +1,10 @@
package com.ruoyi.doublePrevention.repository;
import com.ruoyi.doublePrevention.entity.PreventRiskDangerCheckLog;
+import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
import org.springframework.stereotype.Repository;
+
+import java.util.List;
@Repository
public interface PreventRiskDangerCheckLogRepository {
@@ -14,4 +17,19 @@
* 删除定时核查任务
* */
int deleteDangerCheck(Long checkId);
+
+
+
+ /**
+ * 检索需要上报的任务记录
+ * */
+ List<PreventRiskDangerCheckLog> listReportTask();
+ /**
+ * 修改上报的数据状态
+ * */
+ int updateEventReportStatus(HandlerReportParam handlerReportParam);
+ /**
+ * 查询by checkId
+ * */
+ PreventRiskDangerCheckLog getByDangerCheckByCheckId(Long checkId);
}
diff --git a/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskDangerInfoRepository.java b/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskDangerInfoRepository.java
index 9345b1f..5ec9b00 100644
--- a/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskDangerInfoRepository.java
+++ b/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskDangerInfoRepository.java
@@ -3,6 +3,7 @@
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;
@@ -31,4 +32,15 @@
* @description 统计时间段内所有、死亡、重伤、轻伤的隐患数量
*/
DataCountDangerResultRespDO listDangerResultCountByTime(@Param("startTime") Date startTime, @Param("endTime") Date endTime,@Param("depIds") List<Long> depIds);
+
+
+
+ /**
+ * 搜索需要上报的隐患
+ */
+ List<PreventRiskDangerInfo> listReportDanger();
+ /**
+ * 修改上报的数据的姿态
+ */
+ PreventRiskDangerInfo updateDangerInfoReportStatus(HandlerReportParam handlerReportParam);
}
diff --git a/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskEventRepository.java b/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskEventRepository.java
index 78e089c..f248c38 100644
--- a/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskEventRepository.java
+++ b/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskEventRepository.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.doublePrevention.entity.PreventRiskEvent;
+import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
@@ -45,4 +46,14 @@
* @description 根据条件批量获取风险控制事件
*/
List<PreventRiskEvent> listRiskEvenByCondition(@Param("riskUnitId") Long riskUnitId, @Param("riskEventName") String riskEventName);
+
+
+ /**
+ * 检索需要上报的风险控制事件
+ */
+ List<PreventRiskEvent> listReportEvent();
+ /**
+ * 安全风险事件-更新上报状态
+ */
+ int updateEventReportStatus(HandlerReportParam handlerReportParam);
}
diff --git a/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskJobAndMeasureRepository.java b/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskJobAndMeasureRepository.java
index 3400a48..23902a8 100644
--- a/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskJobAndMeasureRepository.java
+++ b/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskJobAndMeasureRepository.java
@@ -1,7 +1,10 @@
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 {
@@ -19,4 +22,18 @@
*/
int deleteJobAndMeasure(Long jobId);
+
+
+ /**
+ * 检索需要上报的隐患排查任务
+ */
+ List<PreventRiskJobAndMeasure> listReportWork();
+ /**
+ * 根据jobId查询对应的管控措施
+ */
+ List<PreventRiskJobAndMeasure> getMeasureListByJobId(Long jobId);
+ /**
+ * 修改上报状态
+ */
+ int updateWorkReportStatus(HandlerReportParam handlerReportParam);
}
diff --git a/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskUnitUuidRepository.java b/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskUnitUuidRepository.java
index fb55261..c0d3414 100644
--- a/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskUnitUuidRepository.java
+++ b/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskUnitUuidRepository.java
@@ -2,7 +2,10 @@
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{
@@ -22,4 +25,16 @@
* 删除附属表信息
*/
int deleteRiskUnit(String[] riskListIds);
+
+
+
+
+ /**
+ * 检索需要上报的数据
+ */
+ List<PreventRiskUnitUuid> listRiskAnaUnit();
+ /**
+ * 修改已经被检索读取完成数据的状态
+ */
+ int updateReportStatus(HandlerReportParam handlerReportParam);
}
diff --git a/src/main/java/com/ruoyi/doublePrevention/repository/param/HandlerCJReportParam.java b/src/main/java/com/ruoyi/doublePrevention/repository/param/HandlerCJReportParam.java
new file mode 100644
index 0000000..d62cd21
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/repository/param/HandlerCJReportParam.java
@@ -0,0 +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;
+ }
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/repository/param/HandlerReportParam.java b/src/main/java/com/ruoyi/doublePrevention/repository/param/HandlerReportParam.java
new file mode 100644
index 0000000..34c8fdc
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/repository/param/HandlerReportParam.java
@@ -0,0 +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;
+ }
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/scheduls/ExecCJReportDateSchedule.java b/src/main/java/com/ruoyi/doublePrevention/scheduls/ExecCJReportDateSchedule.java
new file mode 100644
index 0000000..9a3043d
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/scheduls/ExecCJReportDateSchedule.java
@@ -0,0 +1,764 @@
+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.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;
+
+ 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/1 * * * ?")
+ //@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);
+
+ /**
+ * 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);{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()));
+ reportCheckTaskFromWorkList.add(cjReportCheckTaskFromWorkDTO);
+ }
+ //数据上报
+ 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()));
+ reportRecordFromTaskList.add(cjReportCheckRecordFromTaskDTO);
+ }
+ //数据加密
+ String AESReportRecordFromTask = encrypt(JSONObject.toJSONString(reportRecordFromTaskList), key.getBytes(), iv.getBytes());
+
+ 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());
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ //接收返回值，保存返回值
+ CJReportResultData CJRecordFromTaskResult = JSONObject.parseObject(recordFromTaskResultBuffer.toString(), CJReportResultData.class);
+ //接收返回值，保存返回值
+ 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】隐患信息-无数据上报昌吉州");
+ }
+
+ }
+
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java b/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java
new file mode 100644
index 0000000..a118cb0
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java
@@ -0,0 +1,705 @@
+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.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
+
+@Component
+public class SearchReportDateSchedule {
+
+ private final Logger logger = LoggerFactory.getLogger(this.getClass());
+
+
+ @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;//管控措施，任务清单对应关系。基础排查点附属表
+
+
+ @Transactional
+// @Scheduled(cron = "0 0/1 * * * ?")
+ 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();
+
+ 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);
+ CJReportRiskEvent.setRiskUnitId(riskEvent.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
+ * 本数据以 todo
+ * */
+ //读取任务配置数据上报主配置信息
+ 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();
+ //转换时间周期单位
+ if (jobById.getTroubleshootTypeCycleType() == 1){
+ CJTaskFromWork.setCheckCycle(Math.toIntExact(jobById.getTroubleshootTypeCycleNum()));
+ CJTaskFromWork.setCheckCycleUnit("小时");
+ }else if (jobById.getTroubleshootTypeCycleType() == 2){
+ Long num = jobById.getTroubleshootTypeCycleNum() * 7;
+ CJTaskFromWork.setCheckCycle(Math.toIntExact(num));
+ CJTaskFromWork.setCheckCycleUnit("日");
+ }else if (jobById.getTroubleshootTypeCycleType() == 3){
+ CJTaskFromWork.setCheckCycle(Math.toIntExact(jobById.getTroubleshootTypeCycleNum()));
+ 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(SyncEnum.SYNC_WAIT_EXEC.getCode());
+ CJTaskFromWork.setReportTime(null);
+ CJTaskFromWork.setDataSource((byte) 1);
+ CJTaskFromWork.setRiskMeasureId(work.getMeasureUuid());
+ CJTaskFromWork.setWorkId(jobById.getJobId());
+ //封装数据
+ 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.检索排查任务记录数据...");
+
+ //查询所有 选择上报的数据 && (reportTime == null 或者 reportTime < updateReportDataTime）
+ List<PreventRiskDangerCheckLog> tasks = preventRiskDangerCheckLogService.listReportTask();
+ //获取上报数据对象
+ List<PreventCJReportCheckRecordFromTask> CJRecordFromTaskLists = new ArrayList<>();
+ HandlerReportParam handlerReportParam = new HandlerReportParam();
+
+ if (ObjectUtils.isNotEmpty(tasks)){
+ //遍历，封装数据
+ for (PreventRiskDangerCheckLog task : tasks) {
+ //获取任务记录主表信息
+ HiddenDangerCheck hiddenDangerCheckById = trHiddenDangerCheckService.getHiddenDangerCheckById(task.getCheckId());
+ //获取任务附属表信息
+ PreventRiskJobAndMeasure jobAndMeasureByJobId = preventRiskJobAndMeasureService.getJobAndMeasureByJobId(task.getJobId());
+ //获取上报数据对象
+ PreventCJReportCheckRecordFromTask CJRecordFromTask = new PreventCJReportCheckRecordFromTask();
+ //转换检查结果
+ /**
+ * todo 结果暂时不写入，需要后续处理
+ * 1.找到每个点的提交接口，进行数据处理
+ * 2.写一个定时任务处理（备用）
+ * */
+ CJRecordFromTask.setCheckStatus("0");// 0-正常；1-存在隐患；2-未处理；3-其他
+// String checkStatus = null;
+// if (ObjectUtils.isEmpty(task.getResult() )){
+// checkStatus = "2";
+// }else if (task.getResult() == 2){
+// checkStatus = "1";
+// }else if (task.getResult() == 1){
+// checkStatus = "0";
+// }
+
+ User createUser = trUserService.getUserByLoginName(hiddenDangerCheckById.getCreateBy());
+ User updateUser = trUserService.getUserByLoginName(hiddenDangerCheckById.getUpdateBy());
+
+ //封装上报昌吉州的任务数据
+ CJRecordFromTask.setId(task.getUuid());
+ 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(jobAndMeasureByJobId.getJobUuid());
+ CJRecordFromTask.setCheckTime(hiddenDangerCheckById.getCheckTime());
+ CJRecordFromTask.setTaskId(task.getCheckId());
+
+ //封装数据
+ CJRecordFromTaskLists.add(CJRecordFromTask);
+ //设置原始数据上报状态
+ handlerReportParam.setId(task.getId());
+ handlerReportParam.setReportTime(new Date());
+ handlerReportParam.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
+ preventRiskDangerCheckLogService.updateTaskReportStatus(handlerReportParam);
+ }
+ }else {
+ logger.info("【双重预防】当前无排查任务记录需要处理");
+ }
+
+ //插入上报昌吉州转换表
+ for (PreventCJReportCheckRecordFromTask CJRecordFromTasks : CJRecordFromTaskLists) {
+ int result = CJTaskRecordService.insert(CJRecordFromTasks);
+ if (result < 0){
+ throw new AusinessException(E.ADD_FAIL.getCode(), "排查任务记录插入失败");
+ }
+ logger.info("【双重预防】排查任务记录CJ：数据处理...");
+ }
+ 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("【##】4.检索隐患信息数据...");
+
+ //查询所有 选择上报的数据 && (reportTime == null 或者 reportTime < updateReportDataTime）
+ List<PreventRiskDangerInfo> dangerManages = preventRiskDangerInfoService.listReportDanger();
+ //获取上报数据list
+ List<PreventCJReportDangerInfo> CJDangerInfoLists = new ArrayList<>();
+
+ if (ObjectUtils.isNotEmpty(dangerManages)){
+ HandlerReportParam handlerReportParam = new HandlerReportParam();
+ //遍历，封装数据
+ for (PreventRiskDangerInfo dangerManage : dangerManages) {
+
+ //获取隐患信息主表信息
+ HiddenDangerCheckPoint hiddenDanger = trHiddenDangerCheckPointService.getHiddenDangerCheckPointById(dangerManage.getDangerCheckPointId());
+ //获取上报数据对象
+ PreventCJReportDangerInfo CJDangerInfo = new PreventCJReportDangerInfo();
+
+ //通过用户名，获取涉及到的各位用户的真实姓名
+ User createUser = trUserService.getUserByLoginName(hiddenDanger.getCreateBy());
+ User updateUser = trUserService.getUserByLoginName(hiddenDanger.getUpdateBy());
+ if (ObjectUtils.isNotEmpty(hiddenDanger.getRegisterUserName())){
+ User registerUser = trUserService.getUserByLoginName(hiddenDanger.getRegisterUserName());
+ //登记人信息
+ CJDangerInfo.setRegistrant(registerUser.getUserName());//登记人
+ CJDangerInfo.setRegistTime(hiddenDanger.getRegisterCreateTime());//登记时间
+ }
+
+ if (ObjectUtils.isNotEmpty(hiddenDanger.getRectifyUserName())){
+ User rectifyUser = trUserService.getUserByLoginName(hiddenDanger.getRectifyUserName());
+ //整改人信息
+ CJDangerInfo.setLiablePerson(rectifyUser.getUserName());//整改责任人
+ }
+
+ if (ObjectUtils.isNotEmpty(hiddenDanger.getAcceptUserName())){
+ User acceptUser = trUserService.getUserByLoginName(hiddenDanger.getUpdateBy());
+ //验收人信息
+ CJDangerInfo.setCheckAcceptPerson(acceptUser.getUserName());//验收人
+ CJDangerInfo.setCheckAcceptComment(hiddenDanger.getAcceptOpinion());//验收情况
+ CJDangerInfo.setCheckAcceptTime(hiddenDanger.getAcceptCreateTime());//验收时间
+ }
+ //如果排查任务正常存在，封装任务相关数据
+ HiddenDangerCheck dangerCheckById = trHiddenDangerCheckService.getHiddenDangerCheckById(hiddenDanger.getCheckId());
+ if (ObjectUtils.isNotEmpty(dangerCheckById)){
+
+ PreventRiskDangerCheckLog dangerCheckLogByCheckId = preventRiskDangerCheckLogService.getByDangerCheckByCheckId(hiddenDanger.getCheckId());
+ CJDangerInfo.setCheckRecordId(dangerCheckLogByCheckId.getUuid());//隐患排查任务记录uuid
+ //找排查点，然后查措施
+ PreventRiskCheckUnit unit = preventRiskCheckUnitService.getUnitByBaseCheckPointId(hiddenDanger.getCheckPointId());
+ //查管控措施
+ PreventRiskControlMeasure controlMeasureById = preventRiskControlMeasureService.getPreventRiskControlMeasureById(unit.getControlMeasureId());
+ CJDangerInfo.setRiskMeasureId(controlMeasureById.getUuid());//管控措施uuid
+ CJDangerInfo.setControlMeasures(controlMeasureById.getCheckContent());//控制措施 ,整改措施
+ }else {
+ CJDangerInfo.setCheckRecordId(null);//隐患排查任务记录uuid
+ CJDangerInfo.setRiskMeasureId(null);//管控措施uuid
+ }
+
+ if (dangerManage.getReportStatus().equals(SyncEnum.SYNC_EXEC_SUCCESS.getCode())){
+ CJDangerInfo.setDeleted("2");//数据更新状态标识，目前仅昌吉州需要 2022-08-10
+ }else {
+ CJDangerInfo.setDeleted("0");
+ }
+ CJDangerInfo.setId(dangerManage.getUuid());
+ CJDangerInfo.setCompanyCode(companyCode);
+ CJDangerInfo.setHazardCode(dangerManage.getHazardCode());//风险分析对象编码
+ CJDangerInfo.setCreateBy(createUser.getUserName());
+ CJDangerInfo.setCreateDate(hiddenDanger.getCreateTime());
+
+ if (ObjectUtils.isEmpty(updateUser)){
+ CJDangerInfo.setUpdateBy(createUser.getUserName());
+ CJDangerInfo.setUpdateDate(hiddenDanger.getCreateTime());
+ }else {
+ CJDangerInfo.setUpdateBy(updateUser.getUserName());
+ CJDangerInfo.setUpdateDate(hiddenDanger.getUpdateTime());
+ }
+
+ CJDangerInfo.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
+ CJDangerInfo.setReportTime(null);
+ CJDangerInfo.setDataSource((byte) 1);
+ CJDangerInfo.setDangerName(hiddenDanger.getDangerName());
+ CJDangerInfo.setDangerLevel(hiddenDanger.getDangerLevel());//隐患等级
+ CJDangerInfo.setDangerSrc(dangerManage.getDangerSrc().toString());//隐患来源
+ CJDangerInfo.setDangerManageType(hiddenDanger.getRectifyType());//隐患治理类型
+ CJDangerInfo.setDangerDesc(hiddenDanger.getDangerDescription());//隐患描述
+ CJDangerInfo.setDangerReason(dangerManage.getDangerReason());//隐患产生原因
+ CJDangerInfo.setCost(hiddenDanger.getRectifyFund());//资金
+ CJDangerInfo.setDangerManageDeadline(hiddenDanger.getRectifyDeadlineTime());//治理期限
+ CJDangerInfo.setDangerState(dangerManage.getDangerState().toString());//隐患状态
+ CJDangerInfo.setHazardDangerType(dangerManage.getHazardDangerType().toString());//隐患类型
+ CJDangerInfo.setDangerManagerId(dangerManage.getId());
+ //封装数据
+ CJDangerInfoLists.add(CJDangerInfo);
+ //设置原始数据上报状态
+ handlerReportParam.setId(dangerManage.getId());
+ handlerReportParam.setReportTime(new Date());
+ handlerReportParam.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
+ //修改隐患信息附属表状态
+ preventRiskDangerInfoService.updateDangerInfoReportStatus(handlerReportParam);
+ }
+ }else {
+ logger.info("【双重预防】当前无隐患信息需要处理");
+ }
+
+ //插入上报昌吉州转换表
+ for (PreventCJReportDangerInfo CJDanger : CJDangerInfoLists) {
+ logger.info("【双重预防】隐患信息插入...");
+ int result = CJDangerInfoService.insert(CJDanger);
+ if (result < 0){
+ throw new AusinessException(E.ADD_FAIL.getCode(), "隐患信息插入失败");
+ }
+ logger.info("【双重预防】隐患信息：数据处理...");
+ }
+ }else {
+ logger.info("隐患信息数据上报已关闭");
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+// 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("安全风险事件数据上报已关闭");
+// }
+
+
+ }
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportCheckRecordFromTaskService.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportCheckRecordFromTaskService.java
new file mode 100644
index 0000000..ce877db
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportCheckRecordFromTaskService.java
@@ -0,0 +1,31 @@
+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 java.util.List;
+
+public interface PreventCJReportCheckRecordFromTaskService extends IService<PreventCJReportCheckRecordFromTask> {
+ /**
+ * 插入任务记录
+ * */
+ int insert(PreventCJReportCheckRecordFromTask recordFromTasks);
+// /**
+// * 任务记录-分页查询
+// * */
+// IPage<PreventCJReportCheckRecordFromTask> getReportTaskFromWorkPage(Page<Object> objectPage, PreventReportCheckRecordFromTaskReqDTO queryReqDTO);
+ /**
+ * 任务-查询待上报
+ * */
+ List<PreventCJReportCheckRecordFromTask> listReportTaskRecordDate();
+ /**PreventReportBatchService
+ * 任务-待上报状态变更
+ * */
+ void updateTaskReportStatus(HandlerReportParam handlerReportParam);
+ /**
+ * 任务-待上报状态变更 - 通过id
+ * */
+ void updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportCheckTaskFromWorkService.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportCheckTaskFromWorkService.java
new file mode 100644
index 0000000..e0d912a
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportCheckTaskFromWorkService.java
@@ -0,0 +1,32 @@
+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);
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportConfigLogService.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportConfigLogService.java
new file mode 100644
index 0000000..77b5862
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportConfigLogService.java
@@ -0,0 +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);
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportConfigService.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportConfigService.java
new file mode 100644
index 0000000..d6afc51
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportConfigService.java
@@ -0,0 +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);
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportDangerInfoService.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportDangerInfoService.java
new file mode 100644
index 0000000..7075462
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportDangerInfoService.java
@@ -0,0 +1,31 @@
+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);
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportPointService.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportPointService.java
new file mode 100644
index 0000000..c96d7f4
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportPointService.java
@@ -0,0 +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> {
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportResultDataService.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportResultDataService.java
new file mode 100644
index 0000000..9a8c472
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportResultDataService.java
@@ -0,0 +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> {
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportRiskAnaUnitService.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportRiskAnaUnitService.java
new file mode 100644
index 0000000..6428d5e
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportRiskAnaUnitService.java
@@ -0,0 +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);
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportRiskControlMeasureService.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportRiskControlMeasureService.java
new file mode 100644
index 0000000..afd2a66
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportRiskControlMeasureService.java
@@ -0,0 +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);
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportRiskEventService.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportRiskEventService.java
new file mode 100644
index 0000000..05ff260
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportRiskEventService.java
@@ -0,0 +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);
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskControlMeasureService.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskControlMeasureService.java
index 4c05e42..ae36071 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskControlMeasureService.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskControlMeasureService.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.doublePrevention.entity.PreventRiskControlMeasure;
+import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -39,6 +40,18 @@
/**
* @description 分页获取风险管控措施
*/
+ List<PreventRiskControlMeasure> listRiskEvenByCondition(Byte controlType, Long riskEventId);
+
+
+
+ /**
+ * 检索需要上报的风险管控措施
+ */
+ List<PreventRiskControlMeasure> listReportMeasure();
+ /**
+ * 修改上报的风险管控措施状态
+ */
+ void updateMeasureReportStatus(HandlerReportParam handlerReportParam);
List<PreventRiskControlMeasure> listRiskControlMeasureByCondition(Byte controlType, Long riskEventId);
/**
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskControlTemplateService.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskControlTemplateService.java
index 7018eda..13ca6ac 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskControlTemplateService.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskControlTemplateService.java
@@ -13,4 +13,8 @@
*/
List<PreventRiskControlTemplate> listMeasureTemplates();
+ /**
+ * 管控措施- 获取管控措施模板 - by id
+ */
+ PreventRiskControlTemplate getControlTemplateById(Byte classify2);
}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskDangerCheckLogService.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskDangerCheckLogService.java
index a4af585..7f1e6e4 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskDangerCheckLogService.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskDangerCheckLogService.java
@@ -1,6 +1,9 @@
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 {
/**
@@ -12,4 +15,18 @@
* 删除定时核查任务
* */
int deleteDangerCheck(Long checkId);
+
+
+ /**
+ * 检索需要上报的任务记录
+ * */
+ List<PreventRiskDangerCheckLog> listReportTask();
+ /**
+ * 修改上报的数据状态
+ * */
+ int updateTaskReportStatus(HandlerReportParam handlerReportParam);
+ /**
+ * 查询by checkId
+ * */
+ PreventRiskDangerCheckLog getByDangerCheckByCheckId(Long checkId);
}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskDangerInfoService.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskDangerInfoService.java
index 98ee2d0..8377d9b 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskDangerInfoService.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskDangerInfoService.java
@@ -3,6 +3,7 @@
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;
@@ -17,6 +18,7 @@
* 修改隐患上报
* */
int updateDangerInfo(PreventRiskDangerInfo dangerInfo);
+
/**
* 删除隐患上报
*/
@@ -31,4 +33,14 @@
*/
DataCountDangerResultRespDO listDangerResultCountByTime(Date startTime, Date endTime, List<Long> depIds);
+
+
+ /**
+ * 搜索需要上报的隐患
+ */
+ List<PreventRiskDangerInfo> listReportDanger();
+ /**
+ * 修改上报的数据的姿态
+ */
+ PreventRiskDangerInfo updateDangerInfoReportStatus(HandlerReportParam handlerReportParam);
}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskEventService.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskEventService.java
index 9845fd6..4390430 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskEventService.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskEventService.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.doublePrevention.entity.PreventRiskControlMeasure;
import com.ruoyi.doublePrevention.entity.PreventRiskEvent;
+import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
import java.util.List;
@@ -39,4 +40,14 @@
* @description 根据条件批量获取风险控制事件
*/
List<PreventRiskEvent> listRiskEvenByCondition(Long riskUnitId, String riskEventName);
+
+
+ /**
+ * 检索需要上报的风险事件
+ */
+ List<PreventRiskEvent> listReportEvent();
+ /**
+ * 安全风险事件-更新上报状态
+ */
+ void updateEventReportStatus(HandlerReportParam handlerReportParam);
}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskJobAndMeasureService.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskJobAndMeasureService.java
index a5c212b..4061cbe 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskJobAndMeasureService.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskJobAndMeasureService.java
@@ -1,6 +1,9 @@
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 {
/**
@@ -16,4 +19,18 @@
*/
int deleteJobAndMeasure(Long jobId);
+
+
+ /**
+ * 检索需要上报的隐患排查任务
+ */
+ List<PreventRiskJobAndMeasure> listReportWork();
+ /**
+ * 根据jobId查询对应的管控措施
+ */
+ List<PreventRiskJobAndMeasure> getMeasureListByJobId(Long jobId);
+ /**
+ * 修改上报状态
+ */
+ int updateWorkReportStatus(HandlerReportParam handlerReportParam);
}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskUnitUuidService.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskUnitUuidService.java
index 0b9bdac..4635420 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskUnitUuidService.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskUnitUuidService.java
@@ -2,6 +2,9 @@
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 {
/**
@@ -20,4 +23,14 @@
* 删除附属表信息
*/
int deleteRiskUnit(String[] riskListIds);
+
+
+ /**
+ * 检索需要上报的数据
+ */
+ List<PreventRiskUnitUuid> listRiskAnaUnit();
+ /**
+ * 修改已经被检索读取完成数据的状态
+ */
+ int updateReportStatus(HandlerReportParam handlerReportParam);
}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportCheckRecordFromTaskServiceImpl.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportCheckRecordFromTaskServiceImpl.java
new file mode 100644
index 0000000..7386a01
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportCheckRecordFromTaskServiceImpl.java
@@ -0,0 +1,68 @@
+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 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(), "修改任务配置数据上报状态失败");
+ }
+ }
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportCheckTaskFromWorkServiceImpl.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportCheckTaskFromWorkServiceImpl.java
new file mode 100644
index 0000000..efdb397
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportCheckTaskFromWorkServiceImpl.java
@@ -0,0 +1,71 @@
+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(), "任务-配置 状态变更失败");
+ }
+ }
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportConfigLogServiceImpl.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportConfigLogServiceImpl.java
new file mode 100644
index 0000000..9638ce7
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportConfigLogServiceImpl.java
@@ -0,0 +1,28 @@
+package com.ruoyi.doublePrevention.service.baseService.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportConfigLog;
+import com.ruoyi.doublePrevention.repository.PreventCJReportConfigLogRepository;
+import com.ruoyi.doublePrevention.service.baseService.PreventCJReportConfigLogService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service("PreventCJReportConfigLogService")
+public class PreventCJReportConfigLogServiceImpl extends ServiceImpl<PreventCJReportConfigLogRepository, PreventCJReportConfigLog> implements PreventCJReportConfigLogService {
+
+ @Autowired
+ private PreventCJReportConfigLogRepository preventCJReportConfigLogRepository;
+
+// @Override
+// public int insertOldReportConfig(PreventReportConfigLog preventReportConfigLog) {
+// return preventReportConfigLogRepository.insert(preventReportConfigLog);
+// }
+//
+// /**
+// * 数据上报配置历史记录-查询
+// */
+// @Override
+// public IPage<PreventReportConfigLog> getReportConfigLogPage(Page<Object> page, PreventReportConfigLogQueryReqDTO queryReqDTO) {
+// return preventReportConfigLogRepository.getReportConfigLogPage(page, queryReqDTO);
+// }
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportConfigServiceImpl.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportConfigServiceImpl.java
new file mode 100644
index 0000000..f8cded6
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportConfigServiceImpl.java
@@ -0,0 +1,43 @@
+package com.ruoyi.doublePrevention.service.baseService.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportConfig;
+import com.ruoyi.doublePrevention.repository.PreventCJReportConfigRepository;
+import com.ruoyi.doublePrevention.repository.param.PreventReportConfigUpdateParams;
+import com.ruoyi.doublePrevention.service.baseService.PreventCJReportConfigService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service("PreventCJReportConfigService")
+public class PreventCJReportConfigServiceImpl extends ServiceImpl<PreventCJReportConfigRepository, PreventCJReportConfig> implements PreventCJReportConfigService {
+
+ @Autowired
+ private PreventCJReportConfigRepository preventCJReportConfigRepository;
+
+// /**
+// * 数据上报配置-查询
+// */
+// @Override
+// public List<PreventCJReportConfig> ListReportConfigs() {
+// return preventCJReportConfigRepository.ListReportConfigs();
+// }
+
+ /**
+ * 数据上报配置-修改
+ */
+ @Override
+ public int updateReportConfig(PreventReportConfigUpdateParams updateParams) {
+ return preventCJReportConfigRepository.updateReportConfig(updateParams);
+ }
+
+ /**
+ * 数据上报配置-按照id查询
+ */
+ @Override
+ public PreventCJReportConfig getReportConfigById(int Id) {
+ return preventCJReportConfigRepository.selectById(Id);
+ }
+
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportDangerInfoServiceImpl.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportDangerInfoServiceImpl.java
new file mode 100644
index 0000000..cbe5bdf
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportDangerInfoServiceImpl.java
@@ -0,0 +1,65 @@
+package com.ruoyi.doublePrevention.service.baseService.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportDangerInfo;
+import com.ruoyi.doublePrevention.enums.E;
+import com.ruoyi.doublePrevention.exception.AusinessException;
+import com.ruoyi.doublePrevention.repository.PreventCJReportDangerInfoRepository;
+import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam;
+import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
+import com.ruoyi.doublePrevention.service.baseService.PreventCJReportDangerInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service("PreventCJReportDangerInfoService")
+public class PreventCJReportDangerInfoServiceImpl
+ extends ServiceImpl<PreventCJReportDangerInfoRepository, PreventCJReportDangerInfo> implements PreventCJReportDangerInfoService {
+
+ @Autowired
+ private PreventCJReportDangerInfoRepository preventCJReportDangerInfoRepository;
+
+ /**
+ * 插入隐患信息
+ * */
+ @Override
+ public int insert(PreventCJReportDangerInfo danger) {
+ return preventCJReportDangerInfoRepository.insertDangerInfo(danger);
+ }
+// /**
+// * 上报数据-隐患信息-分页查询
+// */
+// @Override
+// public IPage<PreventCJReportDangerInfo> getReportDangerInfoPage(Page<Object> objectPage, PreventReportDangerInfoReqDTO queryReqDTO) {
+// return preventCJReportDangerInfoRepository.getReportDangerInfoPage(objectPage, queryReqDTO);
+// }
+
+ /**
+ * 上报数据-待上报数据查询
+ */
+ @Override
+ public List<PreventCJReportDangerInfo> listReportDangerDate() {
+ return preventCJReportDangerInfoRepository.listReportDangerDate();
+ }
+ /**
+ * 上报数据-待上报状态变更
+ */
+ @Override
+ public void updateTaskReportStatus(HandlerReportParam handlerReportParam) {
+ int result = preventCJReportDangerInfoRepository.updateTaskReportStatus(handlerReportParam);
+ if (result < 0){
+ throw new AusinessException(E.UPDATE_FAIL.getCode(), "隐患信息状态变更失败");
+ }
+ }
+ /**
+ * 上报数据-待上报状态变更-通过id
+ */
+ @Override
+ public void updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam) {
+ int result = preventCJReportDangerInfoRepository.updateCJReportStatusById(handlerCJReportParam);
+ if (result < 0){
+ throw new AusinessException(E.UPDATE_FAIL.getCode(), "隐患信息状态变更失败");
+ }
+ }
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportPointServiceImpl.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportPointServiceImpl.java
new file mode 100644
index 0000000..520386d
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportPointServiceImpl.java
@@ -0,0 +1,11 @@
+package com.ruoyi.doublePrevention.service.baseService.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportPoint;
+import com.ruoyi.doublePrevention.repository.PreventCJReportPointRepository;
+import com.ruoyi.doublePrevention.service.baseService.PreventCJReportPointService;
+import org.springframework.stereotype.Service;
+
+@Service("PreventCJReportPointService")
+public class PreventCJReportPointServiceImpl extends ServiceImpl<PreventCJReportPointRepository, PreventCJReportPoint> implements PreventCJReportPointService {
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportResultDataServiceImpl.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportResultDataServiceImpl.java
new file mode 100644
index 0000000..ecd00e6
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportResultDataServiceImpl.java
@@ -0,0 +1,16 @@
+package com.ruoyi.doublePrevention.service.baseService.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportResultData;
+import com.ruoyi.doublePrevention.repository.PreventCJReportResultDataRepository;
+import com.ruoyi.doublePrevention.service.baseService.PreventCJReportResultDataService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service("PreventCJReportResultDataService")
+public class PreventCJReportResultDataServiceImpl extends ServiceImpl<PreventCJReportResultDataRepository, PreventCJReportResultData> implements PreventCJReportResultDataService {
+
+ @Autowired
+ private PreventCJReportResultDataRepository preventCJReportResultDataRepository;
+
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportRiskAnaUnitServiceImpl.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportRiskAnaUnitServiceImpl.java
new file mode 100644
index 0000000..8c9c955
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportRiskAnaUnitServiceImpl.java
@@ -0,0 +1,72 @@
+package com.ruoyi.doublePrevention.service.baseService.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportRiskAnaUnit;
+import com.ruoyi.doublePrevention.enums.E;
+import com.ruoyi.doublePrevention.exception.AusinessException;
+import com.ruoyi.doublePrevention.repository.PreventCJReportRiskAnaUnitRepository;
+import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam;
+import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
+import com.ruoyi.doublePrevention.service.baseService.PreventCJReportRiskAnaUnitService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service("PreventCJReportRiskAnaUnitService")
+public class PreventCJReportRiskAnaUnitServiceImpl
+ extends ServiceImpl<PreventCJReportRiskAnaUnitRepository, PreventCJReportRiskAnaUnit> implements PreventCJReportRiskAnaUnitService {
+
+ @Autowired
+ private PreventCJReportRiskAnaUnitRepository preventCJReportRiskAnaUnitRepository;
+
+// /**
+// * 上报数据-风险分析单元-分页查询
+// */
+// @Override
+// public IPage<PreventCJReportRiskAnaUnit> getReportRiskUnitPage(Page<Object> page, PreReportRiskUnitQueryReqDTO queryReqDTO) {
+// return preventCJReportRiskAnaUnitRepository.getReportRiskUnitPage(page, queryReqDTO);
+// }
+
+ /**
+ * 上报数据-插入
+ */
+ @Override
+ public int insertUnitList(PreventCJReportRiskAnaUnit unit) {
+ int result = preventCJReportRiskAnaUnitRepository.insertUnitList(unit);
+ if (result < 1){
+ throw new AusinessException(E.ADD_FAIL.getCode(), "保存CJ风险单元失败");
+ }
+ return result;
+ }
+
+ /**
+ * 上报数据-查询待上报数据
+ */
+ @Override
+ public List<PreventCJReportRiskAnaUnit> listReportUnitDate() {
+ return preventCJReportRiskAnaUnitRepository.listReportUnitDate();
+ }
+
+ /**
+ * 上报数据-修改待上报
+ */
+ @Override
+ public void updateReportStatus(HandlerReportParam handlerReportParam) {
+ int result = preventCJReportRiskAnaUnitRepository.updateReportStatus();
+ if (result < 1){
+ throw new AusinessException(E.ADD_FAIL.getCode(), "CJ保存风险单元失败");
+ }
+ }
+
+ /**
+ * 上报数据-修改待上报-通过id
+ */
+ @Override
+ public void updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam) {
+ int result = preventCJReportRiskAnaUnitRepository.updateCJReportStatusById(handlerCJReportParam);
+ if (result < 1){
+ throw new AusinessException(E.ADD_FAIL.getCode(), "CJ保存风险单元失败");
+ }
+ }
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportRiskControlMeasureServiceImpl.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportRiskControlMeasureServiceImpl.java
new file mode 100644
index 0000000..2d7a100
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportRiskControlMeasureServiceImpl.java
@@ -0,0 +1,70 @@
+package com.ruoyi.doublePrevention.service.baseService.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportRiskControlMeasure;
+import com.ruoyi.doublePrevention.enums.E;
+import com.ruoyi.doublePrevention.exception.AusinessException;
+import com.ruoyi.doublePrevention.repository.PreventCJReportRiskControlMeasureRepository;
+import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam;
+import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
+import com.ruoyi.doublePrevention.service.baseService.PreventCJReportRiskControlMeasureService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service("PreventCJReportRiskControlMeasureService")
+public class PreventCJReportRiskControlMeasureServiceImpl
+ extends ServiceImpl<PreventCJReportRiskControlMeasureRepository, PreventCJReportRiskControlMeasure> implements PreventCJReportRiskControlMeasureService {
+
+ @Autowired
+ private PreventCJReportRiskControlMeasureRepository preventCJReportRiskControlMeasureRepository;
+
+// /**
+// * 上报数据-管控措施-分页查询
+// */
+// @Override
+// public IPage<PreventCJReportRiskControlMeasure> getReportMeasurePage(Page<Object> objectPage, PreventReportRiskControlMeasureReqDTO queryReqDTO) {
+// return preventCJReportRiskControlMeasureRepository.getReportMeasurePage(objectPage, queryReqDTO);
+// }
+ /**
+ * 插入管控措施上报数据
+ * */
+ @Override
+ public int insertMeasureList(PreventCJReportRiskControlMeasure CJMeasure) {
+ int result = preventCJReportRiskControlMeasureRepository.insertMeasureList(CJMeasure);
+ if (result < 1){
+ throw new AusinessException(E.ADD_FAIL.getCode(), "保存风险单元失败");
+ }
+ return result;
+ }
+
+ /**
+ * 管控措施-上报数据
+ * */
+ @Override
+ public List<PreventCJReportRiskControlMeasure> listReportMeasureDate() {
+ return preventCJReportRiskControlMeasureRepository.listReportMeasureDate();
+ }
+
+ /**
+ * 管控措施-修改上报状态
+ * */
+ @Override
+ public void updateMeasureReportStatus(HandlerReportParam handlerReportParam) {
+ int result = preventCJReportRiskControlMeasureRepository.updateMeasureReportStatus(handlerReportParam);
+ if (result < 1){
+ throw new AusinessException(E.ADD_FAIL.getCode(), "风险单元状态更新失败");
+ }
+ }
+ /**
+ * 管控措施-修改上报状态-通过id
+ * */
+ @Override
+ public void updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam) {
+ int result = preventCJReportRiskControlMeasureRepository.updateCJReportStatusById(handlerCJReportParam);
+ if (result < 1){
+ throw new AusinessException(E.ADD_FAIL.getCode(), "风险单元状态更新失败");
+ }
+ }
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportRiskEventServiceImpl.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportRiskEventServiceImpl.java
new file mode 100644
index 0000000..07dd7fc
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportRiskEventServiceImpl.java
@@ -0,0 +1,74 @@
+package com.ruoyi.doublePrevention.service.baseService.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportRiskEvent;
+import com.ruoyi.doublePrevention.enums.E;
+import com.ruoyi.doublePrevention.exception.AusinessException;
+import com.ruoyi.doublePrevention.repository.PreventCJReportRiskEventRepository;
+import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam;
+import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
+import com.ruoyi.doublePrevention.service.baseService.PreventCJReportRiskEventService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service("PreventCJReportRiskEventService")
+public class PreventCJReportRiskEventServiceImpl
+ extends ServiceImpl<PreventCJReportRiskEventRepository, PreventCJReportRiskEvent> implements PreventCJReportRiskEventService {
+
+ @Autowired
+ private PreventCJReportRiskEventRepository preventCJReportRiskEventRepository;
+
+
+// /**
+// * 分页查询
+// * */
+// @Override
+// public IPage<PreventCJReportRiskEvent> getReportRiskEventPage(Page<Object> objectPage, PreReportRiskEventQueryReqDTO queryReqDTO) {
+// return preventCJReportRiskEventRepository.getReportRiskEventPage(objectPage, queryReqDTO);
+// }
+
+ /**
+ * 插入
+ * */
+ @Override
+ public int insertEventLists(PreventCJReportRiskEvent event) {
+ int result = preventCJReportRiskEventRepository.insertEventLists(event);
+ if (result < 1){
+ throw new AusinessException(E.ADD_FAIL.getCode(), "保存CJ风险单元失败");
+ }
+ return result;
+ }
+
+ /**
+ * 上报数据-查询待上报数据
+ * */
+ @Override
+ public List<PreventCJReportRiskEvent> listReportEventDate() {
+ return preventCJReportRiskEventRepository.listReportEventDate();
+ }
+
+ /**
+ * 修改上报状态
+ * */
+ @Override
+ public int updateEventReportStatus(HandlerReportParam handlerReportParam) {
+ int result = preventCJReportRiskEventRepository.updateEventReportStatus(handlerReportParam);
+ if (result < 1){
+ throw new AusinessException(E.ADD_FAIL.getCode(), "修改上报-事件状态失败");
+ }
+ return result;
+ }
+
+ /**
+ * 修改上报状态-通过id
+ * */
+ @Override
+ public void updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam) {
+ int result = preventCJReportRiskEventRepository.updateCJReportStatusById(handlerCJReportParam);
+ if (result < 1){
+ throw new AusinessException(E.ADD_FAIL.getCode(), "修改上报-事件状态失败");
+ }
+ }
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskControlMeasureServiceImpl.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskControlMeasureServiceImpl.java
index f090a6e..2a4f2dd 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskControlMeasureServiceImpl.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskControlMeasureServiceImpl.java
@@ -2,8 +2,13 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.exception.BusinessException;
import com.ruoyi.doublePrevention.entity.PreventRiskControlMeasure;
+import com.ruoyi.doublePrevention.enums.E;
+import com.ruoyi.doublePrevention.enums.ResultCodes;
+import com.ruoyi.doublePrevention.exception.AusinessException;
import com.ruoyi.doublePrevention.repository.PreventRiskControlMeasureRepository;
+import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
import com.ruoyi.doublePrevention.service.baseService.PreventRiskControlMeasureService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -74,4 +79,24 @@
public List<PreventRiskControlMeasure> listRiskControlMeasure() {
return preventRiskControlMeasureRepository.listRiskControlMeasure();
}
+
+
+
+ /**
+ * 检索需要上报的风险管控措施
+ */
+ @Override
+ public List<PreventRiskControlMeasure> listReportMeasure() {
+ return preventRiskControlMeasureRepository.listReportMeasure();
+ }
+ /**
+ * 修改上报的风险管控措施状态
+ */
+ @Override
+ public void updateMeasureReportStatus(HandlerReportParam handlerReportParam) {
+ int result = preventRiskControlMeasureRepository.updateMeasureReportStatus(handlerReportParam);
+ if (result < 1){
+ throw new AusinessException(E.ADD_FAIL.getCode(), "修改管控措施状态失败");
+ }
+ }
}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskControlTemplateServiceImpl.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskControlTemplateServiceImpl.java
index 73a9d3c..bcd0af4 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskControlTemplateServiceImpl.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskControlTemplateServiceImpl.java
@@ -22,4 +22,12 @@
public List<PreventRiskControlTemplate> listMeasureTemplates() {
return preventRiskControlTemplateRepository.listMeasureTemplates();
}
+
+ /**
+ * 管控措施- 获取管控措施模板 - by id
+ */
+ @Override
+ public PreventRiskControlTemplate getControlTemplateById(Byte classify2) {
+ return preventRiskControlTemplateRepository.getControlTemplateById(classify2);
+ }
}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskDangerCheckLogServiceImpl.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskDangerCheckLogServiceImpl.java
index efea906..d7494af 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskDangerCheckLogServiceImpl.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskDangerCheckLogServiceImpl.java
@@ -1,10 +1,15 @@
package com.ruoyi.doublePrevention.service.baseService.impl;
import com.ruoyi.doublePrevention.entity.PreventRiskDangerCheckLog;
+import com.ruoyi.doublePrevention.enums.E;
+import com.ruoyi.doublePrevention.exception.AusinessException;
import com.ruoyi.doublePrevention.repository.PreventRiskDangerCheckLogRepository;
+import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
import com.ruoyi.doublePrevention.service.baseService.PreventRiskDangerCheckLogService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
+import java.util.List;
@Service("PreventRiskDangerCheckLogService")
public class PreventRiskDangerCheckLogServiceImpl implements PreventRiskDangerCheckLogService {
@@ -26,4 +31,31 @@
public int deleteDangerCheck(Long checkId) {
return preventRiskDangerCheckLogRepository.deleteDangerCheck(checkId);
}
+
+
+ /**
+ * 检索需要上报的任务记录
+ * */
+ @Override
+ public List<PreventRiskDangerCheckLog> listReportTask() {
+ return preventRiskDangerCheckLogRepository.listReportTask();
+ }
+ /**
+ * 修改上报的数据状态
+ * */
+ @Override
+ public int updateTaskReportStatus(HandlerReportParam handlerReportParam) {
+ int result = preventRiskDangerCheckLogRepository.updateEventReportStatus(handlerReportParam);
+ if (result < 1){
+ throw new AusinessException(E.UPDATE_FAIL.getCode(), "安全风险事件-更新上报状态失败");
+ }
+ return result;
+ }
+ /**
+ * 查询by checkId
+ * */
+ @Override
+ public PreventRiskDangerCheckLog getByDangerCheckByCheckId(Long checkId) {
+ return preventRiskDangerCheckLogRepository.getByDangerCheckByCheckId(checkId);
+ }
}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskDangerInfoServiceImpl.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskDangerInfoServiceImpl.java
index 5c5ff78..daaa09f 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskDangerInfoServiceImpl.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskDangerInfoServiceImpl.java
@@ -4,6 +4,7 @@
import com.ruoyi.doublePrevention.entity.dto.DataCountDangerResultRespDO;
import com.ruoyi.doublePrevention.repository.PreventRiskDangerInfoRepository;
import com.ruoyi.doublePrevention.repository.param.DataCountStartAndEndTimeParams;
+import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
import com.ruoyi.doublePrevention.service.baseService.PreventRiskDangerInfoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -58,5 +59,18 @@
return preventRiskDangerInfoRepository.listDangerResultCountByTime(startTime,endTime,depIds);
}
-
+ /**
+ * 搜索需要上报的隐患
+ */
+ @Override
+ public List<PreventRiskDangerInfo> listReportDanger() {
+ return preventRiskDangerInfoRepository.listReportDanger();
+ }
+ /**
+ * 修改上报的数据的姿态
+ */
+ @Override
+ public PreventRiskDangerInfo updateDangerInfoReportStatus(HandlerReportParam handlerReportParam) {
+ return preventRiskDangerInfoRepository.updateDangerInfoReportStatus(handlerReportParam);
+ }
}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskEventServiceImpl.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskEventServiceImpl.java
index 8ea2c7b..76d33b8 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskEventServiceImpl.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskEventServiceImpl.java
@@ -6,8 +6,11 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.doublePrevention.entity.PreventRiskEvent;
+import com.ruoyi.doublePrevention.enums.E;
import com.ruoyi.doublePrevention.enums.StatusEnum;
+import com.ruoyi.doublePrevention.exception.AusinessException;
import com.ruoyi.doublePrevention.repository.PreventRiskEventRepository;
+import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
import com.ruoyi.doublePrevention.service.baseService.PreventRiskEventService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -71,4 +74,22 @@
return preventRiskEventRepository.listRiskEvenByCondition(riskUnitId,riskEventName);
}
+
+ /**
+ * 检索需要上报的风险控制事件
+ */
+ @Override
+ public List<PreventRiskEvent> listReportEvent() {
+ return preventRiskEventRepository.listReportEvent();
+ }
+ /**
+ * 安全风险事件-更新上报状态
+ */
+ @Override
+ public void updateEventReportStatus(HandlerReportParam handlerReportParam) {
+ int result = preventRiskEventRepository.updateEventReportStatus(handlerReportParam);
+ if (result < 1){
+ throw new AusinessException(E.UPDATE_FAIL.getCode(), "安全风险事件-更新上报状态失败");
+ }
+ }
}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskJobAndMeasureServiceImpl.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskJobAndMeasureServiceImpl.java
index 892a55f..8466f3f 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskJobAndMeasureServiceImpl.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskJobAndMeasureServiceImpl.java
@@ -1,10 +1,15 @@
package com.ruoyi.doublePrevention.service.baseService.impl;
+import com.ruoyi.common.exception.BusinessException;
import com.ruoyi.doublePrevention.entity.PreventRiskJobAndMeasure;
+import com.ruoyi.doublePrevention.enums.ResultCodes;
import com.ruoyi.doublePrevention.repository.PreventRiskJobAndMeasureRepository;
+import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
import com.ruoyi.doublePrevention.service.baseService.PreventRiskJobAndMeasureService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
+import java.util.List;
@Service("PreventRiskJobAndMeasureService")
public class PreventRiskJobAndMeasureServiceImpl implements PreventRiskJobAndMeasureService {
@@ -35,4 +40,31 @@
return preventRiskJobAndMeasureRepository.deleteJobAndMeasure(jobId);
}
+
+
+ /**
+ * 检索需要上报的隐患排查任务
+ */
+ @Override
+ public List<PreventRiskJobAndMeasure> listReportWork() {
+ return preventRiskJobAndMeasureRepository.listReportWork();
+ }
+ /**
+ * 根据jobId查询对应的管控措施
+ */
+ @Override
+ public List<PreventRiskJobAndMeasure> getMeasureListByJobId(Long jobId) {
+ return preventRiskJobAndMeasureRepository.getMeasureListByJobId(jobId);
+ }
+ /**
+ * 修改上报状态
+ */
+ @Override
+ public int updateWorkReportStatus(HandlerReportParam handlerReportParam) {
+ int result = preventRiskJobAndMeasureRepository.updateWorkReportStatus(handlerReportParam);
+ if (result == 0) {
+ throw new BusinessException(ResultCodes.SERVER_UPDATE_ERROR.getCode());
+ }
+ return result;
+ }
}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskUnitUuidServiceImpl.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskUnitUuidServiceImpl.java
index 5f999a2..8aa2b8b 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskUnitUuidServiceImpl.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskUnitUuidServiceImpl.java
@@ -2,10 +2,15 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.doublePrevention.entity.PreventRiskUnitUuid;
+import com.ruoyi.doublePrevention.enums.E;
+import com.ruoyi.doublePrevention.exception.AusinessException;
import com.ruoyi.doublePrevention.repository.PreventRiskUnitUuidRepository;
+import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
import com.ruoyi.doublePrevention.service.baseService.PreventRiskUnitUuidService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
+import java.util.List;
@Service("PreventRiskUnitUuidService")
public class PreventRiskUnitUuidServiceImpl implements PreventRiskUnitUuidService {
@@ -40,4 +45,24 @@
public int deleteRiskUnit(String[] riskListIds) {
return preventRiskUnitUuidRepository.deleteRiskUnit(riskListIds);
}
+
+
+ /**
+ * 检索需要上报的数据
+ */
+ @Override
+ public List<PreventRiskUnitUuid> listRiskAnaUnit() {
+ return preventRiskUnitUuidRepository.listRiskAnaUnit();
+ }
+ /**
+ * 修改已经被检索读取完成数据的状态
+ */
+ @Override
+ public int updateReportStatus(HandlerReportParam handlerReportParam) {
+ int result = preventRiskUnitUuidRepository.updateReportStatus(handlerReportParam);
+ if (result < 1){
+ throw new AusinessException(E.UPDATE_FAIL.getCode(), "安全风险分析单元-更新上报状态失败");
+ }
+ return result;
+ }
}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java b/src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java
index bbfefa2..469236c 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java
@@ -803,7 +803,7 @@
@Override
public int insertJobAndMeasure(Long jobId, HiddenDangerCheckJob hiddenDangerCheckJob) {
- String jobUuid = UUID.randomUUID().toString();
+
PreventRiskJobAndMeasure jobAndMeasure = new PreventRiskJobAndMeasure();
//根据RiskId查询对应的管控措施
@@ -811,6 +811,7 @@
//遍历管控措施集合
for (PreventRiskCheckUnit checkUnit : unitByRiskId) {
+ String jobUuid = UUID.randomUUID().toString();
PreventRiskControlMeasure preventRiskControlMeasureById = riskControlMeasureService.getPreventRiskControlMeasureById(checkUnit.getControlMeasureId());
//封装数据
jobAndMeasure.setJobId(jobId);
@@ -944,7 +945,7 @@
PreventRiskDangerCheckLog dangerCheck = new PreventRiskDangerCheckLog();
dangerCheck.setUuid(dangerCheckUuid);
- dangerCheck.setCheckStatus(null);
+ dangerCheck.setCheckStatus(null);//
dangerCheck.setCheckId(checkId);
dangerCheck.setJobId(hdc.getJobId());
//获取上报主配置信息
@@ -1024,6 +1025,7 @@
return StatusEnum.EXEC_FAIL.getCode();
}
}
+
//2、删除核查任务-检查点的附属表----老代码未删除检查点信息，此处暂不做处理
return StatusEnum.EXEC_SUCCESS.getCode();
diff --git a/src/main/java/com/ruoyi/doublePrevention/utilsCJ/AesGcm256Util.java b/src/main/java/com/ruoyi/doublePrevention/utilsCJ/AesGcm256Util.java
new file mode 100644
index 0000000..b024ea0
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/utilsCJ/AesGcm256Util.java
@@ -0,0 +1,149 @@
+package com.ruoyi.doublePrevention.utilsCJ;//package com.gkhy.safePlatform.doublePrevention.utilsCJ;
+//
+//import com.f2bpm.upload.interfaces.ConstantUpload;
+//import org.bouncycastle.crypto.DataLengthException;
+//import org.bouncycastle.crypto.InvalidCipherTextException;
+//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 java.io.UnsupportedEncodingException;
+//import java.nio.charset.StandardCharsets;
+//import java.security.SecureRandom;
+//import java.util.Base64;
+//
+///**
+// * AES-GCM-256 工具类
+// *
+// * @author ：LX（长沙麓谷）
+// * @date 创建时间： 2022/8/3 14:05
+// */
+//public class AesGcm256Util {
+//
+// /**
+// * 随机数生成
+// */
+// private static final SecureRandom SECURE_RANDOM = new SecureRandom();
+//
+// public static final int NONCE_BIT_SIZE = 128;
+// public static final int MAC_BIT_SIZE = 128;
+// public static final int KEY_BIT_SIZE = 256;
+//
+//
+// private AesGcm256Util(){}
+//
+//
+// /**
+// * 创建密钥
+// * @return 密钥
+// */
+// public static byte[] key() {
+// byte[] key = new byte[KEY_BIT_SIZE / 8];
+// SECURE_RANDOM.nextBytes(key);
+// return key;
+// }
+//
+// /**
+// * 创建向量
+// * @return 向量
+// */
+// public static byte[] iv() {
+// byte[] iv = new byte[NONCE_BIT_SIZE / 8];
+// SECURE_RANDOM.nextBytes(iv);
+// return iv;
+// }
+//
+// /**
+// * 编码
+// * @param hexStr 要编码的文本
+// * @return 字节数组
+// */
+// public static byte[] hexToByte(String hexStr) {
+// int len = hexStr.length();
+// byte[] data = new byte[len / 2];
+// for (int i = 0; i < len; i += 2) {
+// data[i / 2] = (byte) ((Character.digit(hexStr.charAt(i), 16) << 4)
+// + Character.digit(hexStr.charAt(i + 1), 16));
+// }
+// return data;
+// }
+//
+// /**
+// * 转换为十六进制
+// * @param data 字节数组
+// * @return 转换的十六进制数据
+// */
+// public static String toHex(byte[] data) {
+// StringBuilder ret = new StringBuilder();
+// for (byte datum : data) {
+// String hex = Integer.toHexString(datum & 0xFF);
+// if (hex.length() == 1) {
+// hex = '0' + hex;
+// }
+// ret.append(hex.toUpperCase());
+// }
+// return ret.toString();
+// }
+//
+// /**
+// * 加密
+// * @param plainText 要加密的明文文本
+// * @param key 密钥
+// * @param iv 向量
+// * @return
+// */
+// public static String encrypt(String plainText, String key, String iv) throws UnsupportedEncodingException {
+// return encrypt(plainText, key.getBytes(ConstantUpload.Base.UTF-8), iv.getBytes(ConstantUpload.Base.UTF-8));
+// }
+//
+// /**
+// * 加密
+// * @param plainText 要加密的明文文本
+// * @param key 密钥
+// * @param iv 向量
+// * @return
+// */
+// 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("加密异常! Encryption exception：" + ex.getMessage());
+// }
+// return sr;
+// }
+//
+// /**
+// * 解密
+// * @param encryptedText 已加密文本
+// * @param key 密钥
+// * @param iv 向量
+// * @return
+// */
+// public static String decrypt(String encryptedText, byte[] key, byte[] iv) {
+// String sr;
+// try {
+// byte[] encryptedBytes = Base64.getDecoder().decode(encryptedText);
+// GCMBlockCipher cipher = new GCMBlockCipher(new AESFastEngine());
+// AEADParameters parameters = new AEADParameters(new KeyParameter(key), MAC_BIT_SIZE, iv, null);
+// cipher.init(false, parameters);
+// byte[] plainBytes = new byte[cipher.getOutputSize(encryptedBytes.length)];
+// int retLen = cipher.processBytes(encryptedBytes, 0, encryptedBytes.length, plainBytes, 0);
+// cipher.doFinal(plainBytes, retLen);
+// sr = new String(plainBytes, StandardCharsets.UTF_8);
+//
+// } catch (IllegalArgumentException | IllegalStateException | DataLengthException | InvalidCipherTextException ex) {
+// throw new RuntimeException("解密异常! Decryption exception:" + ex.getMessage());
+// }
+// return sr;
+// }
+//}
+//
diff --git a/src/main/java/com/ruoyi/project/mobile/service/ApiDangerScheduleService.java b/src/main/java/com/ruoyi/project/mobile/service/ApiDangerScheduleService.java
index 95c1949..2ed16f4 100644
--- a/src/main/java/com/ruoyi/project/mobile/service/ApiDangerScheduleService.java
+++ b/src/main/java/com/ruoyi/project/mobile/service/ApiDangerScheduleService.java
@@ -209,8 +209,15 @@
queryExist.setWhetherDanger(TrHiddenDangerCheckConstants.WHETHER_DANGER_YES);//是否为隐患(是隐患)
queryExist.setCheckPointId(hdcp.getCheckPointId());
queryExist.setCheckId(hdcp.getCheckId());
+
+ /**
+ * 本次查询结果 ：如果未上报过隐患，必定为空
+ * ？同一个检查任务，同一个排查点，可能多次上报隐患。
+ * 本次查询未用到id,导致数据不唯一
+ * */
List<HiddenDangerCheckPoint> queryExistList = hdcpService.selectHiddenDangerCheckPointList(queryExist);
int i=0;
+ //如果隐患信息已经存在，就新插入一条；如果不存在，就修改隐患信息
if(queryExistList.size()>0){
hdcp.setId(null);
hdcp.setCheckTime(DateUtils.getNowDate());
@@ -219,6 +226,9 @@
hdcp.setCompanyId(user.getCompanyId());
i = hdcpService.insertHiddenDangerCheckPoint(hdcp);
+ if (i< 1){
+ throw new RuntimeException("添加隐患附属信息失败");
+ }
// todo-2022 此处插入附属表
//获取Id返回值
@@ -233,10 +243,14 @@
hdcp.setUpdateTime(DateUtils.getNowDate());
i = hdcpService.updateHiddenDangerCheckPoint(hdcp);
- // todo-2022 此处修改附属表
- int result = riskService.updateDangerInfo(hdcp);
- if (result < 1){
- throw new RuntimeException("修改失败");
+ // todo-2022 此处修改附属表,注释：
+// int result = riskService.updateDangerInfo(hdcp);
+// if (result < 1){
+// throw new RuntimeException("修改失败");
+// }
+ int result = riskService.insertDangerInfo(hdcp.getId(), hdcp);
+ if (result< 1){
+ throw new RuntimeException("添加隐患附属信息失败");
}
}
hdcpService.getTaskCountTotal(Long.valueOf(header.userId));//查询未执行任务总数量并推送
diff --git a/src/main/java/com/ruoyi/project/system/dept/mapper/DeptMapper.java b/src/main/java/com/ruoyi/project/system/dept/mapper/DeptMapper.java
index aeebd59..addf691 100644
--- a/src/main/java/com/ruoyi/project/system/dept/mapper/DeptMapper.java
+++ b/src/main/java/com/ruoyi/project/system/dept/mapper/DeptMapper.java
@@ -106,4 +106,8 @@
* @return 部门列表
*/
List<Dept> selectChildrenDeptById(Long deptId);
+ /**
+ * get by id
+ */
+ Dept getDepById(Long deptId);
}
diff --git a/src/main/java/com/ruoyi/project/system/dept/service/DeptServiceImpl.java b/src/main/java/com/ruoyi/project/system/dept/service/DeptServiceImpl.java
index e752d56..6436f34 100644
--- a/src/main/java/com/ruoyi/project/system/dept/service/DeptServiceImpl.java
+++ b/src/main/java/com/ruoyi/project/system/dept/service/DeptServiceImpl.java
@@ -304,4 +304,11 @@
}
return UserConstants.DEPT_NAME_UNIQUE;
}
+ /**
+ * get by id
+ */
+ @Override
+ public Dept getDepById(Long deptId) {
+ return deptMapper.getDepById(deptId);
+ }
}
diff --git a/src/main/java/com/ruoyi/project/system/dept/service/IDeptService.java b/src/main/java/com/ruoyi/project/system/dept/service/IDeptService.java
index bb138d5..95c17f9 100644
--- a/src/main/java/com/ruoyi/project/system/dept/service/IDeptService.java
+++ b/src/main/java/com/ruoyi/project/system/dept/service/IDeptService.java
@@ -93,4 +93,8 @@
* @return 结果
*/
String checkDeptNameUnique(Dept dept);
+ /**
+ * get by id
+ */
+ Dept getDepById(Long deptId);
}
diff --git a/src/main/java/com/ruoyi/project/system/user/mapper/UserMapper.java b/src/main/java/com/ruoyi/project/system/user/mapper/UserMapper.java
index 5b96e1d..b2f6fb2 100644
--- a/src/main/java/com/ruoyi/project/system/user/mapper/UserMapper.java
+++ b/src/main/java/com/ruoyi/project/system/user/mapper/UserMapper.java
@@ -131,4 +131,15 @@
* @return 结果
*/
User checkEmailUnique(String email);
+
+
+
+ /**
+ * 用户getBYId
+ */
+ User getUserById(Long userId);
+ /**
+ * 用户getBY LoginName
+ */
+ User getUserByLoginName(String createBy);
}
diff --git a/src/main/java/com/ruoyi/project/system/user/service/IUserService.java b/src/main/java/com/ruoyi/project/system/user/service/IUserService.java
index 9538130..d578645 100644
--- a/src/main/java/com/ruoyi/project/system/user/service/IUserService.java
+++ b/src/main/java/com/ruoyi/project/system/user/service/IUserService.java
@@ -222,5 +222,12 @@
* 根据userId获取regionId集合
*/
Set<String> getRegionIdSetByUserId(User user);
-
+ /**
+ * 用户getBYId
+ */
+ User getUserById(Long userId);
+ /**
+ * 用户getBY LoginName
+ */
+ User getUserByLoginName(String createBy);
}
diff --git a/src/main/java/com/ruoyi/project/system/user/service/UserServiceImpl.java b/src/main/java/com/ruoyi/project/system/user/service/UserServiceImpl.java
index 8c153a8..d5dd9c6 100644
--- a/src/main/java/com/ruoyi/project/system/user/service/UserServiceImpl.java
+++ b/src/main/java/com/ruoyi/project/system/user/service/UserServiceImpl.java
@@ -556,4 +556,19 @@
}
+ /**
+ * 用户getBYId
+ */
+ @Override
+ public User getUserById(Long userId) {
+ return userMapper.getUserById(userId);
+ }
+
+ /**
+ * 用户getBY LoginName
+ */
+ @Override
+ public User getUserByLoginName(String createBy) {
+ return userMapper.getUserByLoginName(createBy);
+ }
}
diff --git a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/mapper/HiddenDangerCheckMapper.java b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/mapper/HiddenDangerCheckMapper.java
index 1e29de9..8eff08e 100644
--- a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/mapper/HiddenDangerCheckMapper.java
+++ b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/mapper/HiddenDangerCheckMapper.java
@@ -2,6 +2,7 @@
import java.util.List;
import com.ruoyi.project.tr.hiddenDangerCheck.domain.HiddenDangerCheck;
+import com.ruoyi.project.tr.hiddenDangerCheckPoint.domain.HiddenDangerCheckPoint;
/**
* 隐患排查Mapper接口
@@ -58,4 +59,11 @@
* @return 结果
*/
int deleteHiddenDangerCheckByIds(String[] checkIds);
+
+ /**
+ * 获取任务记录主表信息
+ * */
+ HiddenDangerCheck getHiddenDangerCheckById(Long checkId);
+
+
}
diff --git a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/service/IHiddenDangerCheckService.java b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/service/IHiddenDangerCheckService.java
index 89173f1..a13b818 100644
--- a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/service/IHiddenDangerCheckService.java
+++ b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/service/IHiddenDangerCheckService.java
@@ -60,5 +60,8 @@
int deleteHiddenDangerCheckById(Long checkId);
-
+ /**
+ * 获取任务记录主表信息
+ * */
+ HiddenDangerCheck getHiddenDangerCheckById(Long checkId);
}
diff --git a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/service/impl/HiddenDangerCheckServiceImpl.java b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/service/impl/HiddenDangerCheckServiceImpl.java
index 5bcbda6..03bc4fc 100644
--- a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/service/impl/HiddenDangerCheckServiceImpl.java
+++ b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/service/impl/HiddenDangerCheckServiceImpl.java
@@ -119,11 +119,11 @@
return hiddenDangerCheckMapper.deleteHiddenDangerCheckById(checkId);
}
-
-
-
-
-
-
-
+ /**
+ * 获取任务记录主表信息
+ * */
+ @Override
+ public HiddenDangerCheck getHiddenDangerCheckById(Long checkId) {
+ return hiddenDangerCheckMapper.getHiddenDangerCheckById(checkId);
+ }
}
diff --git a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheckPoint/mapper/HiddenDangerCheckPointMapper.java b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheckPoint/mapper/HiddenDangerCheckPointMapper.java
index 3c53192..fba3c57 100644
--- a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheckPoint/mapper/HiddenDangerCheckPointMapper.java
+++ b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheckPoint/mapper/HiddenDangerCheckPointMapper.java
@@ -77,4 +77,8 @@
* @return
*/
List<BaseCheckPointDTO> selectBaseCheckPointListByCheckId(BaseCheckPointDTO baseCheckPointDTO);
+ /**
+ * 查询by Id
+ */
+ HiddenDangerCheckPoint getHiddenDangerCheckPointById(Long dangerCheckPointId);
}
diff --git a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheckPoint/service/IHiddenDangerCheckPointService.java b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheckPoint/service/IHiddenDangerCheckPointService.java
index ed977b2..29418f2 100644
--- a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheckPoint/service/IHiddenDangerCheckPointService.java
+++ b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheckPoint/service/IHiddenDangerCheckPointService.java
@@ -83,4 +83,10 @@
//查询未执行任务总数量
public void getTaskCountTotal(Long userId);
+
+
+ /**
+ * 查询by Id
+ */
+ HiddenDangerCheckPoint getHiddenDangerCheckPointById(Long dangerCheckPointId);
}
diff --git a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheckPoint/service/impl/HiddenDangerCheckPointServiceImpl.java b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheckPoint/service/impl/HiddenDangerCheckPointServiceImpl.java
index 0800cb0..6c9f5a3 100644
--- a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheckPoint/service/impl/HiddenDangerCheckPointServiceImpl.java
+++ b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheckPoint/service/impl/HiddenDangerCheckPointServiceImpl.java
@@ -182,4 +182,12 @@
jpushService.sendCustomPush(title, content, extrasMap, userId.toString());
}
+
+ /**
+ * 查询by Id
+ */
+ @Override
+ public HiddenDangerCheckPoint getHiddenDangerCheckPointById(Long dangerCheckPointId) {
+ return hiddenDangerCheckPointMapper.getHiddenDangerCheckPointById(dangerCheckPointId);
+ }
}
diff --git a/src/main/java/com/ruoyi/project/tr/riskList/mapper/RiskListMapper.java b/src/main/java/com/ruoyi/project/tr/riskList/mapper/RiskListMapper.java
index 3bd9d47..961fbba 100644
--- a/src/main/java/com/ruoyi/project/tr/riskList/mapper/RiskListMapper.java
+++ b/src/main/java/com/ruoyi/project/tr/riskList/mapper/RiskListMapper.java
@@ -74,4 +74,11 @@
* @return 结果
*/
RiskList getInfoByRiskId(String riskId);
+
+
+
+ /**
+ * 获取风险清单信息
+ */
+ RiskList getInfoByRiskListId(Long riskUnitId);
}
diff --git a/src/main/java/com/ruoyi/project/tr/riskList/service/IRiskListService.java b/src/main/java/com/ruoyi/project/tr/riskList/service/IRiskListService.java
index e5e3afd..5ab834b 100644
--- a/src/main/java/com/ruoyi/project/tr/riskList/service/IRiskListService.java
+++ b/src/main/java/com/ruoyi/project/tr/riskList/service/IRiskListService.java
@@ -75,4 +75,10 @@
* @return 结果
*/
RiskList getInfoByRiskId(String riskId);
+
+
+ /**
+ * 获取风险清单信息
+ */
+ RiskList getInfoByRiskListId(Long riskUnitId);
}
diff --git a/src/main/java/com/ruoyi/project/tr/riskList/service/impl/RiskListServiceImpl.java b/src/main/java/com/ruoyi/project/tr/riskList/service/impl/RiskListServiceImpl.java
index 6079da2..a04018c 100644
--- a/src/main/java/com/ruoyi/project/tr/riskList/service/impl/RiskListServiceImpl.java
+++ b/src/main/java/com/ruoyi/project/tr/riskList/service/impl/RiskListServiceImpl.java
@@ -149,4 +149,12 @@
public RiskList getInfoByRiskId(String riskId) {
return riskListMapper.getInfoByRiskId(riskId);
}
+
+ /**
+ * 获取风险清单信息
+ */
+ @Override
+ public RiskList getInfoByRiskListId(Long riskUnitId) {
+ return riskListMapper.getInfoByRiskListId(riskUnitId);
+ }
}
diff --git a/src/main/resources/mybatis/doublePrevention/PreventCJReportCheckRecordFromTaskMapper.xml b/src/main/resources/mybatis/doublePrevention/PreventCJReportCheckRecordFromTaskMapper.xml
new file mode 100644
index 0000000..131ceda
--- /dev/null
+++ b/src/main/resources/mybatis/doublePrevention/PreventCJReportCheckRecordFromTaskMapper.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ruoyi.doublePrevention.repository.PreventCJReportCheckRecordFromTaskRepository">
+
+ <resultMap id="BaseResultMap" type="com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportCheckRecordFromTask">
+ <id column="index_id" property="indexId"/>
+ <result column="id" property="id"/>
+ <result column="company_code" property="companyCode"/>
+ <result column="deleted" property="deleted"/>
+ <result column="create_date" property="createDate"/>
+ <result column="create_by" property="createBy"/>
+ <result column="update_date" property="updateDate"/>
+ <result column="update_by" property="updateBy"/>
+ <result column="report_status" property="reportStatus"/>
+ <result column="report_time" property="reportTime"/>
+ <result column="data_source" property="dataSource"/>
+ <result column="check_task_id" property="checkTaskId"/>
+ <result column="check_status" property="checkStatus"/>
+ <result column="check_time" property="checkTime"/>
+ <result column="create_by_mobile" property="createByMobile"/>
+ <result column="update_by_mobile" property="updateByMobile"/>
+ <result column="task_id" property="taskId"/>
+ </resultMap>
+
+ <!--IPage<PreventReportCheckRecordFromTask> getReportTaskFromWorkPage(Page<Object> objectPage, PreventReportCheckRecordFromTaskReqDTO queryReqDTO);-->
+ <select id="getReportTaskFromWorkPage" resultMap="BaseResultMap">
+ select * from prevent_cj_report_check_record_from_task
+ order by create_by desc
+ </select>
+
+ <!--List<PreventReportCheckRecordFromTask> listReportTaskRecordDate();-->
+ <select id="listReportTaskRecordDate" resultMap="BaseResultMap">
+ select * from prevent_cj_report_check_record_from_task
+ where report_status = 1
+ limit 200
+ </select>
+
+ <!--int updateTaskReportStatus(HandlerReportParam handlerReportParam);-->
+ <update id="updateTaskReportStatus">
+ update prevent_cj_report_check_record_from_task set
+ report_status = #{reportStatus},
+ report_time = #{reportTime}
+ where task_id = #{id}
+ </update>
+
+ <!--int updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);-->
+ <update id="updateCJReportStatusById">
+ update prevent_cj_report_check_record_from_task set
+ report_status = #{reportStatus},
+ report_time = #{reportTime}
+ where id = #{id}
+ </update>
+
+<!-- int insertRecord(PreventCJReportCheckRecordFromTask recordFromTasks);-->
+ <insert id="insertRecord">
+ insert into prevent_cj_report_check_record_from_task
+ values(null, #{id}, #{companyCode}, #{deleted}, #{createDate}, #{createBy}, #{updateDate}, #{updateBy}
+ , #{checkTaskId}, #{checkStatus}, #{checkTime}, #{createByMobile}, #{updateByMobile}
+ , #{reportStatus}, #{reportTime}, #{dataSource}, #{taskId})
+ </insert>
+
+
+</mapper>
diff --git a/src/main/resources/mybatis/doublePrevention/PreventCJReportCheckTaskFromWorkMapper.xml b/src/main/resources/mybatis/doublePrevention/PreventCJReportCheckTaskFromWorkMapper.xml
new file mode 100644
index 0000000..b781f56
--- /dev/null
+++ b/src/main/resources/mybatis/doublePrevention/PreventCJReportCheckTaskFromWorkMapper.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ruoyi.doublePrevention.repository.PreventCJReportCheckTaskFromWorkRepository">
+
+ <resultMap id="BaseResultMap" type="com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportCheckTaskFromWork">
+ <id column="index_id" property="indexId"/>
+ <result column="id" property="id"/>
+ <result column="company_code" property="companyCode"/>
+ <result column="deleted" property="deleted"/>
+ <result column="create_date" property="createDate"/>
+ <result column="create_by" property="createBy"/>
+ <result column="update_date" property="updateDate"/>
+ <result column="update_by" property="updateBy"/>
+ <result column="report_status" property="reportStatus"/>
+ <result column="report_time" property="reportTime"/>
+ <result column="data_source" property="dataSource"/>
+ <result column="risk_measure_id" property="riskMeasureId"/>
+ <result column="check_cycle" property="checkCycle"/>
+ <result column="check_cycle_unit" property="checkCycleUnit"/>
+ <result column="work_id" property="workId"/>
+ </resultMap>
+
+ <!--IPage<PreventReportCheckTaskFromWork> getReportTaskFromWorkPage(Page<Object> objectPage, PreventReportCheckTaskFromWorkReqDTO queryReqDTO);-->
+ <select id="getReportTaskFromWorkPage" resultMap="BaseResultMap">
+ select * from prevent_cj_report_check_task_from_work
+ order by create_by desc
+ </select>
+
+ <!--List<PreventReportCheckTaskFromWork> listReportTaskFromWorkDate();-->
+ <select id="listReportTaskFromWorkDate" resultMap="BaseResultMap">
+ select * from prevent_cj_report_check_task_from_work
+ where report_status = 1
+ limit 200
+ </select>
+
+ <!--int updateWorkReportStatus(HandlerReportParam handlerReportParam);-->
+ <update id="updateWorkReportStatus">
+ update prevent_cj_report_check_task_from_work set
+ report_status = #{reportStatus},
+ report_time = #{reportTime}
+ where work_id = #{id}
+ </update>
+
+ <!--int updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);-->
+ <update id="updateCJReportStatusById">
+ update prevent_cj_report_check_task_from_work set
+ report_status = #{reportStatus},
+ report_time = #{reportTime}
+ where id = #{id}
+ </update>
+
+<!-- int insertTaskFromWorkList(PreventCJReportCheckTaskFromWork cjTaskFromWork);-->
+ <insert id="insertTaskFromWorkList">
+ insert into prevent_cj_report_check_task_from_work
+ values(null, #{id}, #{companyCode}, #{deleted}, #{createDate}, #{createBy}, #{updateDate}, #{updateBy}
+ , #{riskMeasureId}, #{checkCycle}, #{checkCycleUnit}
+ , #{reportStatus}, #{reportTime}, #{dataSource}, #{workId})
+ </insert>
+
+
+
+
+
+<!-- int insertList(taskFromWorkLists);-->
+ <insert id="saveList">
+ insert into prevent_cj_report_check_task_from_work
+ (
+ id,
+ risk_measure_id,
+ check_cycle,
+ check_cycle_unit,
+ troubleshoot_content,
+ company_code,
+ deleted,
+ create_date,
+ create_by,
+ update_date,
+ update_by,
+ data_source,
+ report_status,
+ report_time
+ )
+ values
+ <foreach collection="taskFromWorkLists" item="taskFromWorkList" separator="," >
+ (
+ #{taskFromWorkList.id},
+ #{taskFromWorkList.riskMeasureId},
+ #{taskFromWorkList.checkCycle},
+ #{taskFromWorkList.checkCycleUnit},
+ #{taskFromWorkList.troubleshootContent},
+ #{taskFromWorkList.companyCode},
+ #{taskFromWorkList.deleted},
+ #{taskFromWorkList.createDate},
+ #{taskFromWorkList.createBy},
+ #{taskFromWorkList.updateDate},
+ #{taskFromWorkList.updateBy},
+ #{taskFromWorkList.dataSource},
+ #{taskFromWorkList.reportStatus},
+ #{taskFromWorkList.reportTime}
+ )
+ </foreach>
+ </insert>
+
+
+</mapper>
diff --git a/src/main/resources/mybatis/doublePrevention/PreventCJReportConfigLogMapper.xml b/src/main/resources/mybatis/doublePrevention/PreventCJReportConfigLogMapper.xml
new file mode 100644
index 0000000..f1618c5
--- /dev/null
+++ b/src/main/resources/mybatis/doublePrevention/PreventCJReportConfigLogMapper.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ruoyi.doublePrevention.repository.PreventCJReportConfigLogRepository">
+
+ <resultMap id="BaseResultMap" type="com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportConfigLog">
+ <id property="id" column="id"/>
+ <result property="reportState" column="report_state"/>
+ <result property="reportType" column="report_type"/>
+ <result property="reportData" column="report_data"/>
+ <result property="reportDataName" column="report_data_name"/>
+ <result property="gmtModitify" column="gmt_moditify"/>
+ <result property="lastEditUserName" column="last_edit_user_name"/>
+ </resultMap>
+
+ <!--IPage<PreventReportConfigLog> getReportConfigLogPage(Page<Object> page, PreventReportConfigLogQueryReqDTO queryReqDTO);-->
+ <select id="getReportConfigLogPage" resultMap="BaseResultMap">
+ select id, report_state, report_type, report_data_name, gmt_moditify, last_edit_user_name, update_info
+ from prevent_cj_report_config_log
+ <where>
+ 1 = 1
+ <if test="queryReqDTO.startTime != null">
+ and #{queryReqDTO.id} >= gmt_moditify
+ </if>
+ <if test="queryReqDTO.endTime != null">
+ and gmt_moditify >= #{queryReqDTO.id}
+ </if>
+ </where>
+ </select>
+
+</mapper>
diff --git a/src/main/resources/mybatis/doublePrevention/PreventCJReportConfigMapper.xml b/src/main/resources/mybatis/doublePrevention/PreventCJReportConfigMapper.xml
new file mode 100644
index 0000000..b1ff7d7
--- /dev/null
+++ b/src/main/resources/mybatis/doublePrevention/PreventCJReportConfigMapper.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ruoyi.doublePrevention.repository.PreventCJReportConfigRepository">
+
+ <resultMap id="BaseResultMap" type="com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportConfig">
+ <id property="id" column="id"/>
+ <result property="reportState" column="report_state"/>
+ <result property="reportType" column="report_type"/>
+ <result property="reportData" column="report_data"/>
+ <result property="reportDataName" column="report_data_name"/>
+ <result property="gmtModitify" column="gmt_moditify"/>
+ <result property="lastEditUserName" column="last_edit_user_name"/>
+ </resultMap>
+
+ <!--List<PreventReportConfig> ListReportConfigs();-->
+ <select id="ListReportConfigs" resultMap="BaseResultMap">
+ select id, report_state, report_type, report_data_name, gmt_moditify, last_edit_user_name
+ from prevent_cj_report_config
+ </select>
+
+ <!--int updateReportConfig(PreventReportConfigUpdateParams updateParams);-->
+ <update id="updateReportConfig">
+ update prevent_cj_report_config set
+ report_state = #{reportState},
+ report_type = #{reportType},
+ last_edit_user_name = #{lastEditUserName},
+ gmt_moditify = #{gmtModitify}
+ where id = #{id}
+ </update>
+
+</mapper>
diff --git a/src/main/resources/mybatis/doublePrevention/PreventCJReportDangerInfoMapper.xml b/src/main/resources/mybatis/doublePrevention/PreventCJReportDangerInfoMapper.xml
new file mode 100644
index 0000000..1387083
--- /dev/null
+++ b/src/main/resources/mybatis/doublePrevention/PreventCJReportDangerInfoMapper.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ruoyi.doublePrevention.repository.PreventCJReportDangerInfoRepository">
+
+ <resultMap id="BaseResultMap" type="com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportDangerInfo">
+ <id column="index_id" property="indexId"/>
+ <result column="id" property="id"/>
+ <result column="company_code" property="companyCode"/>
+ <result column="deleted" property="deleted"/>
+ <result column="create_date" property="createDate"/>
+ <result column="create_by" property="createBy"/>
+ <result column="update_date" property="updateDate"/>
+ <result column="update_by" property="updateBy"/>
+ <result column="report_status" property="reportStatus"/>
+ <result column="report_time" property="reportTime"/>
+ <result column="data_source" property="dataSource"/>
+ <result column="hazard_code" property="hazardCode"/>
+ <result column="risk_measure_id" property="riskMeasureId"/>
+ <result column="check_record_id" property="checkRecordId"/>
+ <result column="danger_name" property="dangerName"/>
+ <result column="danger_level" property="dangerLevel"/>
+ <result column="danger_src" property="dangerSrc"/>
+ <result column="danger_manage_type" property="dangerManageType"/>
+ <result column="danger_desc" property="dangerDesc"/>
+ <result column="danger_reason" property="dangerReason"/>
+ <result column="control_measures" property="controlMeasures"/>
+ <result column="cost" property="cost"/>
+ <result column="danger_manage_deadline" property="dangerManageDeadline"/>
+ <result column="danger_state" property="dangerState"/>
+ <result column="hazard_danger_type" property="hazardDangerType"/>
+ <result column="registrant" property="registrant"/>
+ <result column="regist_time" property="registTime"/>
+ <result column="liable_person" property="liablePerson"/>
+ <result column="check_accept_person" property="checkAcceptPerson"/>
+ <result column="check_accept_comment" property="checkAcceptComment"/>
+ <result column="check_accept_time" property="checkAcceptTime"/>
+ <result column="danger_manager_id" property="dangerManagerId"/>
+ </resultMap>
+
+ <!--IPage<PreventReportDangerInfo> getReportDangerInfoPage(Page<Object> objectPage, PreventReportDangerInfoReqDTO queryReqDTO);-->
+ <select id="getReportDangerInfoPage" resultMap="BaseResultMap">
+ select * from prevent_cj_report_danger_info
+ order by create_by desc
+ </select>
+
+ <!-- List<PreventReportDangerInfo> listReportDangerRecordDate();-->
+ <select id="listReportDangerDate" resultMap="BaseResultMap">
+ select * from prevent_cj_report_danger_info
+ where report_status = 1
+ limit 200
+ </select>
+
+ <!--int updateTaskReportStatus(HandlerReportParam handlerReportParam);-->
+ <update id="updateTaskReportStatus">
+ update prevent_cj_report_danger_info set
+ report_status = #{reportStatus},
+ report_time = #{reportTime}
+ where danger_manager_id = #{id}
+ </update>
+
+ <!--int updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);-->
+ <update id="updateCJReportStatusById">
+ update prevent_cj_report_danger_info set
+ report_status = #{reportStatus},
+ report_time = #{reportTime}
+ where id = #{id}
+ </update>
+
+<!-- int insertDangerInfo(PreventCJReportDangerInfo danger);-->
+ <insert id="insertDangerInfo">
+ insert into prevent_cj_report_danger_info
+ values(null, #{id}, #{companyCode}, #{deleted}, #{createDate}, #{createBy}, #{updateDate}, #{updateBy}
+ , #{hazardCode}, #{riskMeasureId}, #{checkRecordId}, #{dangerName}, #{dangerLevel}, #{dangerSrc}, #{dangerManageType}
+ , #{dangerDesc}, #{dangerReason}, #{controlMeasures}, #{cost}, #{dangerManageDeadline}, #{dangerState}, #{hazardDangerType}
+ , #{registrant}, #{registTime}, #{liablePerson}, #{checkAcceptPerson}, #{checkAcceptComment}, #{checkAcceptTime}
+ , #{reportStatus}, #{reportTime}, #{dataSource}, #{dangerManagerId})
+ </insert>
+
+</mapper>
diff --git a/src/main/resources/mybatis/doublePrevention/PreventCJReportPointMapper.xml b/src/main/resources/mybatis/doublePrevention/PreventCJReportPointMapper.xml
new file mode 100644
index 0000000..581553c
--- /dev/null
+++ b/src/main/resources/mybatis/doublePrevention/PreventCJReportPointMapper.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ruoyi.doublePrevention.repository.PreventCJReportPointRepository">
+
+ <resultMap id="BaseResultMap" type="com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportPoint">
+ <id column="index_id" property="indexId"/>
+ <result column="id" property="id"/>
+ <result column="company_code" property="companyCode"/>
+ <result column="deleted" property="deleted"/>
+ <result column="create_date" property="createDate"/>
+ <result column="create_by" property="createBy"/>
+ <result column="update_date" property="updateDate"/>
+ <result column="update_by" property="updateBy"/>
+ <result column="risk_unit_ids" property="riskUnitIds"/>
+ <result column="risk_event_ids" property="riskEventIds"/>
+ <result column="risk_measure_ids" property="riskMeasureIds"/>
+ <result column="hazard_dep" property="hazardDep"/>
+ <result column="hazard_liable_person" property="hazardLiablePerson"/>
+ <result column="hazard_code" property="hazardCode"/>
+ <result column="report_status" property="reportStatus"/>
+ <result column="report_time" property="reportTime"/>
+ <result column="data_source" property="dataSource"/>
+ <result column="risk_event_id" property="riskEventId"/>
+ </resultMap>
+
+ <!--IPage<PreventReportRiskEvent> getReportRiskEventPage();-->
+ <select id="getReportRiskEventPage" resultMap="BaseResultMap">
+ select * from prevent_cj_report_point
+ order by create_by desc
+ </select>
+
+ <!--List<PreventReportRiskEvent> listReportEventDate();-->
+ <select id="listReportEventDate" resultMap="BaseResultMap">
+ select * from prevent_cj_report_point
+ where report_status = 1
+ limit 200
+ </select>
+
+ <!--int updateEventReportStatus(HandlerReportParam handlerReportParam);-->
+ <update id="updateEventReportStatus">
+ update prevent_cj_report_point set
+ report_status = #{reportStatus},
+ report_time = #{reportTime}
+ where risk_event_id = #{id}
+ </update>
+ <!--int insertList(List<PreventReportRiskEvent> eventLists);-->
+ <insert id="saveList">
+ insert into prevent_cj_report_point
+ (
+ id,
+ risk_event_name,
+ risk_unit_id,
+ company_code,
+ deleted,
+ create_date,
+ create_by,
+ update_date,
+ update_by,
+ data_source,
+ report_status,
+ report_time
+ )
+ values
+ <foreach collection="eventLists" item="eventList" separator="," >
+ (
+ #{eventList.id},
+ #{eventList.riskEventName},
+ #{eventList.riskUnitId},
+ #{eventList.companyCode},
+ #{eventList.deleted},
+ #{eventList.createDate},
+ #{eventList.createBy},
+ #{eventList.updateDate},
+ #{eventList.updateBy},
+ #{eventList.dataSource},
+ #{eventList.reportStatus},
+ #{eventList.reportTime}
+ )
+ </foreach>
+ </insert>
+</mapper>
diff --git a/src/main/resources/mybatis/doublePrevention/PreventCJReportResultDataRepository.xml b/src/main/resources/mybatis/doublePrevention/PreventCJReportResultDataRepository.xml
new file mode 100644
index 0000000..608ee94
--- /dev/null
+++ b/src/main/resources/mybatis/doublePrevention/PreventCJReportResultDataRepository.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ruoyi.doublePrevention.repository.PreventCJReportResultDataRepository" >
+
+ <resultMap id="BaseResultMap" type="com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportResultData">
+ <id column="id" property="id"/>
+ <result column="code" property="batchId"/>
+ <result column="batch_time" property="batchTime"/>
+ <result column="data_source" property="dataSource"/>
+ </resultMap>
+
+
+</mapper>
diff --git a/src/main/resources/mybatis/doublePrevention/PreventCJReportRiskAnaUnitMapper.xml b/src/main/resources/mybatis/doublePrevention/PreventCJReportRiskAnaUnitMapper.xml
new file mode 100644
index 0000000..cfec120
--- /dev/null
+++ b/src/main/resources/mybatis/doublePrevention/PreventCJReportRiskAnaUnitMapper.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ruoyi.doublePrevention.repository.PreventCJReportRiskAnaUnitRepository">
+
+ <resultMap id="BaseResultMap" type="com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportRiskAnaUnit">
+ <id column="index_id" property="indexId"/>
+ <result column="id" property="id"/>
+ <result column="company_code" property="companyCode"/>
+ <result column="deleted" property="deleted"/>
+ <result column="create_date" property="createDate"/>
+ <result column="create_by" property="createBy"/>
+ <result column="update_date" property="updateDate"/>
+ <result column="update_by" property="updateBy"/>
+ <result column="report_status" property="reportStatus"/>
+ <result column="report_time" property="reportTime"/>
+ <result column="data_source" property="dataSource"/>
+ <result column="risk_unit_name" property="riskUnitName"/>
+ <result column="hazard_code" property="hazardCode"/>
+ <result column="hazard_dep" property="hazardDep"/>
+ <result column="hazard_liable_person" property="hazardLiablePerson"/>
+ <result column="risk_unit_id" property="riskUnitId"/>
+ </resultMap>
+
+ <!--IPage<PreventRiskAnaUnit> getReportRiskUnitPage(Page<Object> page, PreReportRiskUnitQueryReqDTO queryReqDTO);-->
+ <select id="getReportRiskUnitPage" resultMap="BaseResultMap">
+ select * from
+ prevent_cj_report_risk_ana_unit
+ <where>
+ 1 = 1
+ <if test="queryReqDTO.riskUnitName != null">
+ and liable_person_id = #{queryReqDTO.riskUnitName}
+ </if>
+ <if test="queryReqDTO.hazardDep != null">
+ and liable_dep_id = #{queryReqDTO.hazardDep}
+ </if>
+ <if test="queryReqDTO.hazardLiablePerson != null">
+ and risk_unit_name = #{queryReqDTO.hazardLiablePerson}
+ </if>
+ </where>
+ </select>
+
+ <!--List<PreventReportRiskAnaUnit> listReportUnitDate();-->
+ <select id="listReportUnitDate" resultMap="BaseResultMap">
+ select * from prevent_cj_report_risk_ana_unit
+ where report_status = 1
+ limit 200
+ </select>
+
+ <!--int updateReportStatus();-->
+ <update id="updateReportStatus">
+ update prevent_cj_report_risk_ana_unit set
+ report_status = #{reportStatus},
+ report_time = #{reportTime}
+ where risk_unit_id = #{id}
+ </update>
+
+ <!--int updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);-->
+ <update id="updateCJReportStatusById">
+ update prevent_cj_report_risk_ana_unit set
+ report_status = #{reportStatus},
+ report_time = #{reportTime}
+ where id = #{id}
+ </update>
+
+<!-- int insertUnitList(PreventCJReportRiskAnaUnit unit);-->
+ <insert id="insertUnitList">
+ insert into prevent_cj_report_risk_ana_unit
+ values(null, #{id}, #{companyCode}, #{deleted}, #{createDate}, #{createBy}, #{updateDate}, #{updateBy}
+ , #{riskUnitName}, #{hazardCode}, #{hazardDep}, #{hazardLiablePerson}
+ , #{reportStatus}, #{reportTime}, #{dataSource}, #{riskUnitId})
+ </insert>
+
+</mapper>
diff --git a/src/main/resources/mybatis/doublePrevention/PreventCJReportRiskControlMeasureMapper.xml b/src/main/resources/mybatis/doublePrevention/PreventCJReportRiskControlMeasureMapper.xml
new file mode 100644
index 0000000..50c7763
--- /dev/null
+++ b/src/main/resources/mybatis/doublePrevention/PreventCJReportRiskControlMeasureMapper.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ruoyi.doublePrevention.repository.PreventCJReportRiskControlMeasureRepository">
+
+ <resultMap id="BaseResultMap" type="com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportRiskControlMeasure">
+ <id column="index_id" property="indexId"/>
+ <result column="id" property="id"/>
+ <result column="company_code" property="companyCode"/>
+ <result column="deleted" property="deleted"/>
+ <result column="create_date" property="createDate"/>
+ <result column="create_by" property="createBy"/>
+ <result column="update_date" property="updateDate"/>
+ <result column="update_by" property="updateBy"/>
+ <result column="report_status" property="reportStatus"/>
+ <result column="report_time" property="reportTime"/>
+ <result column="data_source" property="dataSource"/>
+ <result column="risk_event_id" property="riskEventId"/>
+ <result column="data_src" property="dataSrc"/>
+ <result column="risk_measure_desc" property="riskMeasureDesc"/>
+ <result column="troubleshoot_content" property="troubleshootContent"/>
+ <result column="classify1" property="classify1"/>
+ <result column="classify2" property="classify2"/>
+ <result column="classify3" property="classify3"/>
+ <result column="risk_measure_id" property="riskMeasureId"/>
+ </resultMap>
+
+<!-- IPage<PreventReportRiskControlMeasure> getReportMeasurePage();-->
+ <select id="getReportMeasurePage" resultMap="BaseResultMap">
+ select * from prevent_cj_report_risk_control_measure
+ </select>
+
+ <!--List<PreventReportRiskControlMeasure> listReportMeasureDate();-->
+ <select id="listReportMeasureDate" resultMap="BaseResultMap">
+ select * from prevent_cj_report_risk_control_measure
+ where report_status = 1
+ limit 200
+ </select>
+
+ <!--int updateMeasureReportStatus(HandlerReportParam handlerReportParam);-->
+ <update id="updateMeasureReportStatus">
+ update prevent_cj_report_risk_control_measure set
+ report_status = #{reportStatus},
+ report_time = #{reportTime}
+ where risk_measure_id = #{id}
+ </update>
+
+ <!--int updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);-->
+ <update id="updateCJReportStatusById">
+ update prevent_cj_report_risk_control_measure set
+ report_status = #{reportStatus},
+ report_time = #{reportTime}
+ where id = #{id}
+ </update>
+
+<!-- int insertMeasureList(PreventCJReportRiskControlMeasure cjMeasure);-->
+ <insert id="insertMeasureList">
+ insert into prevent_cj_report_risk_control_measure
+ values(null, #{id}, #{companyCode}, #{deleted}, #{createDate}, #{createBy}, #{updateDate}, #{updateBy}
+ , #{riskEventId}, #{dataSrc}, #{riskMeasureDesc}, #{troubleshootContent}, #{classify1}, #{classify2}, #{classify3}
+ , #{reportStatus}, #{reportTime}, #{dataSource}, #{riskMeasureId})
+ </insert>
+
+
+
+
+ <!--int insertList(List<PreventReportRiskControlMeasure> measureLists);-->
+ <insert id="insertList">
+ insert into prevent_cj_report_risk_control_measure
+ (
+ id,
+ risk_event_id,
+ data_src,
+ risk_measure_desc,
+ troubleshoot_content,
+ classify1,
+ classify2,
+ classify3,
+ company_code,
+ deleted,
+ create_date,
+ create_by,
+ update_date,
+ update_by,
+ data_source,
+ report_status,
+ report_time
+ )
+ values
+ <foreach collection="measureLists" item="measureList" separator="," >
+ (
+ #{eventList.id},
+ #{eventList.riskEventId},
+ #{eventList.dataSrc},
+ #{eventList.riskMeasureDesc},
+ #{eventList.troubleshootContent},
+ #{eventList.classify1},
+ #{eventList.classify2},
+ #{eventList.classify3},
+ #{eventList.companyCode},
+ #{eventList.deleted},
+ #{eventList.createDate},
+ #{eventList.createBy},
+ #{eventList.updateDate},
+ #{eventList.updateBy},
+ #{eventList.dataSource},
+ #{eventList.reportStatus},
+ #{eventList.reportTime}
+ )
+ </foreach>
+ </insert>
+
+</mapper>
diff --git a/src/main/resources/mybatis/doublePrevention/PreventCJReportRiskEventMapper.xml b/src/main/resources/mybatis/doublePrevention/PreventCJReportRiskEventMapper.xml
new file mode 100644
index 0000000..61cfea0
--- /dev/null
+++ b/src/main/resources/mybatis/doublePrevention/PreventCJReportRiskEventMapper.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ruoyi.doublePrevention.repository.PreventCJReportRiskEventRepository">
+
+ <resultMap id="BaseResultMap" type="com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportRiskEvent">
+ <id column="index_id" property="indexId"/>
+ <result column="id" property="id"/>
+ <result column="company_code" property="companyCode"/>
+ <result column="deleted" property="deleted"/>
+ <result column="create_date" property="createDate"/>
+ <result column="create_by" property="createBy"/>
+ <result column="update_date" property="updateDate"/>
+ <result column="update_by" property="updateBy"/>
+ <result column="report_status" property="reportStatus"/>
+ <result column="report_time" property="reportTime"/>
+ <result column="data_source" property="dataSource"/>
+ <result column="risk_event_name" property="riskEventName"/>
+ <result column="risk_unit_id" property="riskUnitId"/>
+ <result column="risk_event_id" property="riskEventId"/>
+ </resultMap>
+
+ <!--IPage<PreventReportRiskEvent> getReportRiskEventPage();-->
+ <select id="getReportRiskEventPage" resultMap="BaseResultMap">
+ select * from prevent_cj_report_risk_event
+ order by create_by desc
+ </select>
+
+ <!--List<PreventReportRiskEvent> listReportEventDate();-->
+ <select id="listReportEventDate" resultMap="BaseResultMap">
+ select * from prevent_cj_report_risk_event
+ where report_status = 1
+ limit 200
+ </select>
+
+ <!--int updateEventReportStatus(HandlerReportParam handlerReportParam);-->
+ <update id="updateEventReportStatus">
+ update prevent_cj_report_risk_event set
+ report_status = #{reportStatus},
+ report_time = #{reportTime}
+ where risk_event_id = #{id}
+ </update>
+
+ <!--int updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);-->
+ <update id="updateCJReportStatusById">
+ update prevent_cj_report_risk_event set
+ report_status = #{reportStatus},
+ report_time = #{reportTime}
+ where id = #{id}
+ </update>
+
+<!-- int insertEventLists(PreventCJReportRiskEvent event);-->
+ <insert id="insertEventLists" >
+ insert into prevent_cj_report_risk_event
+ values(null, #{id}, #{companyCode}, #{deleted}, #{createDate}, #{createBy}, #{updateDate}, #{updateBy}
+ , #{riskEventName}, #{riskUnitId}, #{reportStatus}, #{reportTime}, #{dataSource}, #{riskEventId})
+ </insert>
+
+
+
+
+
+
+
+ <!--int insertList(List<PreventReportRiskEvent> eventLists);-->
+ <insert id="saveList">
+ insert into prevent_cj_report_risk_event
+ (
+ id,
+ risk_event_name,
+ risk_unit_id,
+ company_code,
+ deleted,
+ create_date,
+ create_by,
+ update_date,
+ update_by,
+ data_source,
+ report_status,
+ report_time
+ )
+ values
+ <foreach collection="eventLists" item="eventList" separator="," >
+ (
+ #{eventList.id},
+ #{eventList.riskEventName},
+ #{eventList.riskUnitId},
+ #{eventList.companyCode},
+ #{eventList.deleted},
+ #{eventList.createDate},
+ #{eventList.createBy},
+ #{eventList.updateDate},
+ #{eventList.updateBy},
+ #{eventList.dataSource},
+ #{eventList.reportStatus},
+ #{eventList.reportTime}
+ )
+ </foreach>
+ </insert>
+</mapper>
diff --git a/src/main/resources/mybatis/doublePrevention/PreventRiskControlMeasureMapper.xml b/src/main/resources/mybatis/doublePrevention/PreventRiskControlMeasureMapper.xml
index ff15316..eba3771 100644
--- a/src/main/resources/mybatis/doublePrevention/PreventRiskControlMeasureMapper.xml
+++ b/src/main/resources/mybatis/doublePrevention/PreventRiskControlMeasureMapper.xml
@@ -182,4 +182,19 @@
select * from prevent_risk_control_measure where delete_status = 0
</select>
+
+
+<!-- List<PreventRiskControlMeasure> listReportMeasure();-->
+ <select id="listReportMeasure" resultMap="BaseResultMap">
+ select * from prevent_risk_control_measure
+ where report_switch = 0 and (update_report_data_time > report_time or report_time is null)
+ </select>
+
+<!-- int updateMeasureReportStatus(HandlerReportParam handlerReportParam);-->
+ <update id="updateMeasureReportStatus" >
+ update prevent_risk_control_measure set
+ report_status = #{reportStatus},
+ report_time = #{reportTime}
+ where id = #{id}
+ </update>
</mapper>
diff --git a/src/main/resources/mybatis/doublePrevention/PreventRiskControlTemplateMapper.xml b/src/main/resources/mybatis/doublePrevention/PreventRiskControlTemplateMapper.xml
index 1e887d6..927cd41 100644
--- a/src/main/resources/mybatis/doublePrevention/PreventRiskControlTemplateMapper.xml
+++ b/src/main/resources/mybatis/doublePrevention/PreventRiskControlTemplateMapper.xml
@@ -16,4 +16,9 @@
</select>
+<!-- PreventRiskControlTemplate getControlTemplateById(Byte classify2);-->
+ <select id="getControlTemplateById" resultMap="BaseResultMap">
+ select * from prevent_risk_control_template
+ where id = #{classify2}
+ </select>
</mapper>
diff --git a/src/main/resources/mybatis/doublePrevention/PreventRiskDangerCheckLogMapper.xml b/src/main/resources/mybatis/doublePrevention/PreventRiskDangerCheckLogMapper.xml
index 3140711..b3b654e 100644
--- a/src/main/resources/mybatis/doublePrevention/PreventRiskDangerCheckLogMapper.xml
+++ b/src/main/resources/mybatis/doublePrevention/PreventRiskDangerCheckLogMapper.xml
@@ -27,5 +27,27 @@
delete from prevent_risk_danger_check_log
where check_id = #{checkId}
</delete>
+
+
+<!-- List<PreventRiskDangerCheckLog> listReportTask();-->
+ <select id="listReportTask" resultMap="BaseResultMap">
+ select * from prevent_risk_danger_check_log
+ where report_switch = 0 and (update_report_data_time > report_time or report_time is null)
+ </select>
+
+<!-- int updateEventReportStatus(HandlerReportParam handlerReportParam);-->
+ <update id="updateEventReportStatus" >
+ update prevent_risk_danger_check_log set
+ report_status = #{reportStatus},
+ report_time = #{reportTime}
+ where id = #{id}
+ </update>
+
+<!-- PreventRiskDangerCheckLog getByDangerCheckByCheckId(Long checkId);-->
+ <select id="getByDangerCheckByCheckId" resultMap="BaseResultMap">
+ select * from prevent_risk_danger_check_log
+ where check_id = #{checkId}
+ </select>
</mapper>
+
diff --git a/src/main/resources/mybatis/doublePrevention/PreventRiskDangerInfoMapper.xml b/src/main/resources/mybatis/doublePrevention/PreventRiskDangerInfoMapper.xml
index e4de7ad..bc09908 100644
--- a/src/main/resources/mybatis/doublePrevention/PreventRiskDangerInfoMapper.xml
+++ b/src/main/resources/mybatis/doublePrevention/PreventRiskDangerInfoMapper.xml
@@ -87,6 +87,20 @@
where danger_check_point_id = #{dangerCheckPointId}
</update>
+
+<!-- List<PreventRiskDangerInfo> listReportDanger();-->
+ <select id="listReportDanger" resultMap="BaseResultMap">
+ select * from prevent_risk_danger_info
+ where report_switch = 0 and (update_report_data_time > report_time or report_time is null)
+ </select>
+
+<!-- PreventRiskDangerInfo updateDangerInfoReportStatus(HandlerReportParam handlerReportParam);-->
+ <select id="updateDangerInfoReportStatus">
+ update prevent_risk_danger_info set
+ report_status = #{reportStatus},
+ report_time = #{reportTime}
+ where id = #{id}
+ </select>
</mapper>
diff --git a/src/main/resources/mybatis/doublePrevention/PreventRiskEventMapper.xml b/src/main/resources/mybatis/doublePrevention/PreventRiskEventMapper.xml
index 8bf37cd..0e6c5fa 100644
--- a/src/main/resources/mybatis/doublePrevention/PreventRiskEventMapper.xml
+++ b/src/main/resources/mybatis/doublePrevention/PreventRiskEventMapper.xml
@@ -127,4 +127,16 @@
</where>
</select>
+<!-- List<PreventRiskEvent> listReportEvent();-->
+ <select id="listReportEvent" resultMap="BaseResultMap">
+ select * from prevent_risk_event
+ where report_switch = 0 and (update_report_data_time > report_time or report_time is null)
+ </select>
+<!-- int updateEventReportStatus(HandlerReportParam handlerReportParam);-->
+ <update id="updateEventReportStatus">
+ update prevent_risk_event set
+ report_status = #{reportStatus},
+ report_time = #{reportTime}
+ where id = #{id}
+ </update>
</mapper>
diff --git a/src/main/resources/mybatis/doublePrevention/PreventRiskJobAndMeasureMapper.xml b/src/main/resources/mybatis/doublePrevention/PreventRiskJobAndMeasureMapper.xml
index 8bbab7d..644229e 100644
--- a/src/main/resources/mybatis/doublePrevention/PreventRiskJobAndMeasureMapper.xml
+++ b/src/main/resources/mybatis/doublePrevention/PreventRiskJobAndMeasureMapper.xml
@@ -34,4 +34,25 @@
</delete>
<!-- PreventRiskJobAndMeasure getJobAndMeasure(Long jobId);-->
+
+<!-- List<PreventRiskJobAndMeasure> listReportWork();-->
+ <select id="listReportWork" resultMap="BaseResultMap">
+ select * from prevent_risk_job_and_measure
+ where report_switch = 0 and (update_report_data_time > report_time or report_time is null)
+ </select>
+
+<!-- List<PreventRiskJobAndMeasure> getMeasureListByJobId(Long jobId);-->
+ <select id="getMeasureListByJobId" resultMap="BaseResultMap">
+ select * from prevent_risk_job_and_measure
+ where job_id = #{jobId}
+ </select>
+
+<!-- int updateWorkReportStatus(HandlerReportParam handlerReportParam);-->
+ <update id="updateWorkReportStatus">
+ update prevent_risk_job_and_measure set
+ report_status = #{reportStatus},
+ report_time = #{reportTime}
+ where id = #{id}
+ </update>
</mapper>
+
diff --git a/src/main/resources/mybatis/doublePrevention/PreventRiskUnitUuidMapper.xml b/src/main/resources/mybatis/doublePrevention/PreventRiskUnitUuidMapper.xml
index 3ca9672..b2f6c92 100644
--- a/src/main/resources/mybatis/doublePrevention/PreventRiskUnitUuidMapper.xml
+++ b/src/main/resources/mybatis/doublePrevention/PreventRiskUnitUuidMapper.xml
@@ -16,7 +16,7 @@
<!-- PreventRiskUnitUuid getRiskUnitUuidById(Long id);-->
<select id="getRiskUnitUuidById" resultMap="BaseResultMap">
select * from prevent_risk_unit_uuid
- where risk_unit_id = #{id}
+ where risk_unit_id = #{id}
</select>
<!-- int insertUuid(PreventRiskUnitUuid riskUnitUuid);-->
@@ -41,4 +41,19 @@
#{riskListId}
</foreach>
</delete>
+
+
+
+<!-- List<PreventRiskUnitUuid> listRiskAnaUnit();-->
+ <select id="listRiskAnaUnit" resultMap="BaseResultMap">
+ select * from prevent_risk_unit_uuid
+ where report_switch = 0 and (update_report_data_time > report_time or report_time is null)
+ </select>
+<!-- int updateReportStatus(HandlerReportParam handlerReportParam);-->
+ <update id="updateReportStatus">
+ update prevent_risk_unit_uuid set
+ report_status = #{reportStatus},
+ report_time = #{reportTime}
+ where id = #{id}
+ </update>
</mapper>
diff --git a/src/main/resources/mybatis/system/DeptMapper.xml b/src/main/resources/mybatis/system/DeptMapper.xml
index f0e1ccd..0d5bf2b 100644
--- a/src/main/resources/mybatis/system/DeptMapper.xml
+++ b/src/main/resources/mybatis/system/DeptMapper.xml
@@ -188,4 +188,9 @@
where dept_id in (${ancestors})
</update>
+<!-- Dept getDepById(Long deptId);-->
+ <select id="getDepById" parameterType="Long" resultMap="DeptResult">
+ select * from sys_dept where dept_id = #{deptId}
+ </select>
+
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mybatis/system/UserMapper.xml b/src/main/resources/mybatis/system/UserMapper.xml
index c45bf4e..32cffc9 100644
--- a/src/main/resources/mybatis/system/UserMapper.xml
+++ b/src/main/resources/mybatis/system/UserMapper.xml
@@ -276,4 +276,13 @@
)
</insert>
+<!-- User getUserById(Long userId);-->
+ <select id="getUserById" parameterType="User" resultMap="UserResult">
+ select * from sys_user where user_id = #{userId}
+ </select>
+
+<!-- User getUserByLoginName(String createBy);-->
+ <select id="getUserByLoginName" parameterType="User" resultMap="UserResult">
+ select * from sys_user where login_name = #{createBy}
+ </select>
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mybatis/tr/HiddenDangerCheckMapper.xml b/src/main/resources/mybatis/tr/HiddenDangerCheckMapper.xml
index 59ef875..4b29f32 100644
--- a/src/main/resources/mybatis/tr/HiddenDangerCheckMapper.xml
+++ b/src/main/resources/mybatis/tr/HiddenDangerCheckMapper.xml
@@ -359,4 +359,11 @@
</foreach>
</delete>
+<!-- HiddenDangerCheck getHiddenDangerCheckById(Long checkId);-->
+ <select id="getHiddenDangerCheckById" parameterType="HiddenDangerCheck" resultMap="HiddenDangerCheckResult">
+ select * from tr_hidden_danger_check
+ where check_id = #{checkId}
+ </select>
+
+
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mybatis/tr/HiddenDangerCheckPointMapper.xml b/src/main/resources/mybatis/tr/HiddenDangerCheckPointMapper.xml
index a5676a1..9b5b764 100644
--- a/src/main/resources/mybatis/tr/HiddenDangerCheckPointMapper.xml
+++ b/src/main/resources/mybatis/tr/HiddenDangerCheckPointMapper.xml
@@ -671,5 +671,10 @@
order by bcp.create_time DESC
</select>
+ <!-- HiddenDangerCheckPoint getHiddenDangerCheckPointById(Long dangerCheckPointId);-->
+ <select id="getHiddenDangerCheckPointById" parameterType="HiddenDangerCheckPoint" resultMap="HiddenDangerCheckPointResult">
+ select * from tr_hidden_danger_check_point
+ where id = #{dangerCheckPointId}
+ </select>
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mybatis/tr/RiskListMapper.xml b/src/main/resources/mybatis/tr/RiskListMapper.xml
index 49a6300..4756578 100644
--- a/src/main/resources/mybatis/tr/RiskListMapper.xml
+++ b/src/main/resources/mybatis/tr/RiskListMapper.xml
@@ -318,7 +318,12 @@
<!-- RiskList getInfoByRiskId(String riskId);-->
- <select id="getInfoByRiskId" resultType="com.ruoyi.project.tr.riskList.domain.RiskList">
+ <select id="getInfoByRiskId" parameterType="RiskList" resultMap="RiskListResult">
select * from tr_risk_list where risk_list_id = #{riskId}
</select>
-</mapper>
\ No newline at end of file
+
+<!-- RiskList getInfoByRiskListId(Long riskUnitId);-->
+ <select id="getInfoByRiskListId" parameterType="RiskList" resultMap="RiskListResult">
+ select * from tr_risk_list where risk_list_id = #{riskUnitId}
+ </select>
+</mapper>
--
Gitblit v1.9.2