From 1662beb45dd4c67b3601cce5ca8dabf1e888742a Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期日, 07 四月 2024 08:22:00 +0800
Subject: [PATCH] 临时提交
---
src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskDangerCheckLogRepository.java | 4
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportCheckRecordFromTaskServiceImpl.java | 5
src/main/resources/mybatis/doublePrevention/PreventTaskTypeMapper.xml | 4
src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java | 1026 ++++++++++++++++++++++++++------------------------
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskDangerCheckLogServiceImpl.java | 10
src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportCheckRecordFromTaskService.java | 5
src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventTaskTypeService.java | 1
src/main/java/com/ruoyi/project/system/user/test.java | 21 +
src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportCheckRecordFromTaskRepository.java | 7
src/main/java/com/ruoyi/doublePrevention/repository/PreventTaskTypeRepository.java | 2
src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskControlMeasureService.java | 2
src/main/resources/mybatis/system/UserMapper.xml | 5
src/main/java/com/ruoyi/project/system/user/service/IUserService.java | 2
src/main/resources/mybatis/doublePrevention/PreventRiskControlMeasureMapper.xml | 5
src/main/java/com/ruoyi/project/system/user/mapper/UserMapper.java | 2
src/main/resources/mybatis/doublePrevention/PreventRiskDangerCheckLogMapper.xml | 13
src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskDangerCheckLogService.java | 2
src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskControlMeasureRepository.java | 2
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskControlMeasureServiceImpl.java | 5
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventTaskTypeServiceImpl.java | 5
src/main/resources/mybatis/doublePrevention/PreventCJReportCheckRecordFromTaskMapper.xml | 13
src/main/java/com/ruoyi/project/system/user/service/UserServiceImpl.java | 5
src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerLedgerController.java | 2
23 files changed, 654 insertions(+), 494 deletions(-)
diff --git a/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportCheckRecordFromTaskRepository.java b/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportCheckRecordFromTaskRepository.java
index 0c67ee7..e2f19bd 100644
--- a/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportCheckRecordFromTaskRepository.java
+++ b/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportCheckRecordFromTaskRepository.java
@@ -7,6 +7,7 @@
import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportCheckRecordFromTask;
import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam;
import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
+import io.lettuce.core.dynamic.annotation.Param;
import org.springframework.stereotype.Repository;
import java.util.List;
@@ -31,7 +32,11 @@
* */
int updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);
/**
- * 批量插入任务记录
+ * 插入任务记录
* */
int insertRecord(PreventCJReportCheckRecordFromTask recordFromTasks);
+ /**
+ * 批量插入任务记录
+ * */
+ int insertRecordList(@Param(value="list") List<PreventCJReportCheckRecordFromTask> recordFromTaskList);
}
diff --git a/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskControlMeasureRepository.java b/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskControlMeasureRepository.java
index ca44a6f..f60f6ff 100644
--- a/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskControlMeasureRepository.java
+++ b/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskControlMeasureRepository.java
@@ -63,4 +63,6 @@
List<PreventRiskControlMeasure> listRiskControlMeasure();
PreventRiskControlMeasure getPreventRiskControlMeasureByUuid(String riskMeasureId);
+
+ List<PreventRiskControlMeasure> getAllMeasureList();
}
diff --git a/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskDangerCheckLogRepository.java b/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskDangerCheckLogRepository.java
index 1337683..24b61e8 100644
--- a/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskDangerCheckLogRepository.java
+++ b/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskDangerCheckLogRepository.java
@@ -1,9 +1,11 @@
package com.ruoyi.doublePrevention.repository;
+import com.ruoyi.doublePrevention.entity.CJReport.CJdto.Data;
import com.ruoyi.doublePrevention.entity.PreventRiskDangerCheckLog;
import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
import org.springframework.stereotype.Repository;
+import java.util.Date;
import java.util.List;
@Repository
@@ -36,4 +38,6 @@
PreventRiskDangerCheckLog getByDangerCheckByJobId(Long jobId);
int updateCheckLog(Long checkId, Long mobileCode);
+
+ int updateTaskReportStatusByList(List<Long> ids, Byte reportStatus, Date reportTime);
}
diff --git a/src/main/java/com/ruoyi/doublePrevention/repository/PreventTaskTypeRepository.java b/src/main/java/com/ruoyi/doublePrevention/repository/PreventTaskTypeRepository.java
index 2c5d98c..6431bda 100644
--- a/src/main/java/com/ruoyi/doublePrevention/repository/PreventTaskTypeRepository.java
+++ b/src/main/java/com/ruoyi/doublePrevention/repository/PreventTaskTypeRepository.java
@@ -12,4 +12,6 @@
PreventTaskType getInfoByTaskId(Long taskId);
List<PreventTaskType> getInfoByJobId(Long jobId);
+
+ List<PreventTaskType> getAllTaskTypeList();
}
diff --git a/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java b/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java
index fc0d7a5..90dcd0d 100644
--- a/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java
+++ b/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java
@@ -116,325 +116,325 @@
int step = 1;
String companyCode = "652310082";
- /**
- * 1、检索风险分析单元
- * */
- //读取风险分析单元数据上报主配置信息
- PreventReportConfig unitReportConfig = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_RISK_ANA_UNIT.getCode());
- //如果主配置开启上报，开始
- if (unitReportConfig.getReportState().equals(SyncEnum.REPORT_ON.getCode())){
-
- logger.info("【##】1.检索风险分析单元...");
-
- //查询所有 选择上报的数据 && (reportTime == null 或者 reportTime < updateReportDataTime）
- List<PreventRiskUnitUuid> riskUnitUuidList = preventRiskUnitUuidService.listRiskAnaUnit();
- //获取上报数据list
-// List<PreventReportRiskAnaUnit> unitLists = new ArrayList<>();
- List<PreventCJReportRiskAnaUnit> CJUnitLists = new ArrayList<>();
- if (ObjectUtils.isNotEmpty(riskUnitUuidList)){
- HandlerReportParam handlerReportParam = new HandlerReportParam();
- //遍历，封装数据
- for (PreventRiskUnitUuid riskUnitUuid : riskUnitUuidList) {
- //查询漯安表中对应数据
- RiskList infoByRiskId = trRiskAnaUnitService.getInfoByRiskListId(riskUnitUuid.getRiskUnitId());
- //获取上报数据对象
- PreventCJReportRiskAnaUnit CJReportRiskAnaUnit = new PreventCJReportRiskAnaUnit();
-
- //此类方法已经修改，实际使用username
- User createUser = trUserService.getUserByLoginName(infoByRiskId.getCreateBy());
- User updateUser = trUserService.getUserByLoginName(infoByRiskId.getUpdateBy());
- User userById = trUserService.getUserById(infoByRiskId.getUserId());
- Dept depById = trDeptService.getDepById(infoByRiskId.getDeptId());
-
- //封装上报昌吉州的风险分析单元数据
- CJReportRiskAnaUnit.setId(riskUnitUuid.getRiskUnitUuid());//此处封装附属表的uuid
- CJReportRiskAnaUnit.setCompanyCode(companyCode);
- CJReportRiskAnaUnit.setRiskUnitName(infoByRiskId.getRiskListName());
- CJReportRiskAnaUnit.setHazardCode(infoByRiskId.getRiskListNum());
- CJReportRiskAnaUnit.setHazardDep(depById.getDeptName());
- CJReportRiskAnaUnit.setHazardLiablePerson(userById.getUserName());
- CJReportRiskAnaUnit.setDeleted("0");
-// if (riskUnitUuid.getReportStatus().equals(SyncEnum.SYNC_EXEC_SUCCESS.getCode())){
-// CJReportRiskAnaUnit.setDeleted("2");//数据更新状态标识，目前仅昌吉州需要 2022-08-10
+// /**
+// * 1、检索风险分析单元
+// * */
+// //读取风险分析单元数据上报主配置信息
+// PreventReportConfig unitReportConfig = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_RISK_ANA_UNIT.getCode());
+// //如果主配置开启上报，开始
+// if (unitReportConfig.getReportState().equals(SyncEnum.REPORT_ON.getCode())){
+//
+// logger.info("【##】1.检索风险分析单元...");
+//
+// //查询所有 选择上报的数据 && (reportTime == null 或者 reportTime < updateReportDataTime）
+// List<PreventRiskUnitUuid> riskUnitUuidList = preventRiskUnitUuidService.listRiskAnaUnit();
+// //获取上报数据list
+//// List<PreventReportRiskAnaUnit> unitLists = new ArrayList<>();
+// List<PreventCJReportRiskAnaUnit> CJUnitLists = new ArrayList<>();
+// if (ObjectUtils.isNotEmpty(riskUnitUuidList)){
+// HandlerReportParam handlerReportParam = new HandlerReportParam();
+// //遍历，封装数据
+// for (PreventRiskUnitUuid riskUnitUuid : riskUnitUuidList) {
+// //查询漯安表中对应数据
+// RiskList infoByRiskId = trRiskAnaUnitService.getInfoByRiskListId(riskUnitUuid.getRiskUnitId());
+// //获取上报数据对象
+// PreventCJReportRiskAnaUnit CJReportRiskAnaUnit = new PreventCJReportRiskAnaUnit();
+//
+// //此类方法已经修改，实际使用username
+// User createUser = trUserService.getUserByLoginName(infoByRiskId.getCreateBy());
+// User updateUser = trUserService.getUserByLoginName(infoByRiskId.getUpdateBy());
+// User userById = trUserService.getUserById(infoByRiskId.getUserId());
+// Dept depById = trDeptService.getDepById(infoByRiskId.getDeptId());
+//
+// //封装上报昌吉州的风险分析单元数据
+// CJReportRiskAnaUnit.setId(riskUnitUuid.getRiskUnitUuid());//此处封装附属表的uuid
+// CJReportRiskAnaUnit.setCompanyCode(companyCode);
+// CJReportRiskAnaUnit.setRiskUnitName(infoByRiskId.getRiskListName());
+// CJReportRiskAnaUnit.setHazardCode(infoByRiskId.getRiskListNum());
+// CJReportRiskAnaUnit.setHazardDep(depById.getDeptName());
+// CJReportRiskAnaUnit.setHazardLiablePerson(userById.getUserName());
+// CJReportRiskAnaUnit.setDeleted("0");
+//// if (riskUnitUuid.getReportStatus().equals(SyncEnum.SYNC_EXEC_SUCCESS.getCode())){
+//// CJReportRiskAnaUnit.setDeleted("2");//数据更新状态标识，目前仅昌吉州需要 2022-08-10
+//// }else {
+//// CJReportRiskAnaUnit.setDeleted(riskAnaUnit.getDeleteStatus().toString());
+//// }
+// CJReportRiskAnaUnit.setCreateBy(createUser.getUserName());
+// CJReportRiskAnaUnit.setCreateDate(infoByRiskId.getCreateTime());
+// if (ObjectUtils.isEmpty(updateUser)){
+// CJReportRiskAnaUnit.setUpdateBy(createUser.getUserName());
+// CJReportRiskAnaUnit.setUpdateDate(infoByRiskId.getUpdateTime());
// }else {
-// CJReportRiskAnaUnit.setDeleted(riskAnaUnit.getDeleteStatus().toString());
+// CJReportRiskAnaUnit.setUpdateBy(updateUser.getUserName());
+// CJReportRiskAnaUnit.setUpdateDate(infoByRiskId.getCreateTime());
// }
- CJReportRiskAnaUnit.setCreateBy(createUser.getUserName());
- CJReportRiskAnaUnit.setCreateDate(infoByRiskId.getCreateTime());
- if (ObjectUtils.isEmpty(updateUser)){
- CJReportRiskAnaUnit.setUpdateBy(createUser.getUserName());
- CJReportRiskAnaUnit.setUpdateDate(infoByRiskId.getUpdateTime());
- }else {
- CJReportRiskAnaUnit.setUpdateBy(updateUser.getUserName());
- CJReportRiskAnaUnit.setUpdateDate(infoByRiskId.getCreateTime());
- }
- CJReportRiskAnaUnit.setDataSource((byte) 1);
- CJReportRiskAnaUnit.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
- CJReportRiskAnaUnit.setReportTime(null);
- CJReportRiskAnaUnit.setRiskUnitId(infoByRiskId.getRiskListId());//此处封装主表的id
- //封装数据
- CJUnitLists.add(CJReportRiskAnaUnit);
- //修改原始数据状态为待上传
- handlerReportParam.setId(riskUnitUuid.getId());//此处修改的是附属表
- handlerReportParam.setReportTime(new Date());
- handlerReportParam.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
- int result = preventRiskUnitUuidService.updateReportStatus(handlerReportParam);
- }
- }else {
- logger.info("【双重预防】当前无风险分析单元数据需要处理");
- }
- //写入昌吉州转换表
- for (PreventCJReportRiskAnaUnit CJUnit : CJUnitLists) {
- CJRiskAnaUnitService.insertUnitList(CJUnit);
- logger.info("【双重预防】1.风险分析单元CJ：数据处理...");
- }
- step = 2;
- }else {
- step = 2;
- logger.info("风险分析单元数据上报已关闭");
- }
-
-
- /**
- * 2、检索安全风险事件数据
- * */
- //读取风险分析单元数据上报主配置信息
- PreventReportConfig eventReportConfig = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_RISK_EVENT.getCode());
- //如果风险事件主配置开启上报
- if (eventReportConfig.getReportState().equals(SyncEnum.REPORT_ON.getCode())){
-
- //logger.info("【##】2.检索安全风险事件...");
- //查询所有 选择上报的数据 && (reportTime == null 或者 reportTime < updateReportDataTime）
- List<PreventRiskEvent> riskEvents = preventRiskEventService.listReportEvent();
- //获取上报数据对象与list
- List<PreventCJReportRiskEvent> CJEventLists = new ArrayList<>();
- if (ObjectUtils.isNotEmpty(riskEvents)){
- //遍历，封装数据
- for (PreventRiskEvent riskEvent : riskEvents) {
- //String eventUuid = UUID.randomUUID().toString();
- HandlerReportParam handlerReportParam = new HandlerReportParam();
- PreventCJReportRiskEvent CJReportRiskEvent = new PreventCJReportRiskEvent();
- //封装上报昌吉州风险事件数据
- CJReportRiskEvent.setId(riskEvent.getUuid());
- CJReportRiskEvent.setCompanyCode(companyCode);
- if (riskEvent.getReportStatus().equals(SyncEnum.SYNC_EXEC_SUCCESS.getCode())){
- CJReportRiskEvent.setDeleted("2");//数据更新状态标识，目前仅昌吉州需要 2022-08-10
- }else {
- CJReportRiskEvent.setDeleted("0");
- }
- CJReportRiskEvent.setCreateBy(riskEvent.getCreateByUserName());
- CJReportRiskEvent.setCreateDate(riskEvent.getGmtCreate());
- CJReportRiskEvent.setUpdateBy(riskEvent.getCreateByUserName());
- CJReportRiskEvent.setUpdateDate(riskEvent.getGmtModitify());
- CJReportRiskEvent.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
- CJReportRiskEvent.setReportTime(null);
- CJReportRiskEvent.setDataSource((byte) 1);
- PreventRiskUnitUuid riskUnitUuidByUnitId = preventRiskUnitUuidService.getRiskUnitUuidByUnitId(riskEvent.getRiskUnitId());
- CJReportRiskEvent.setRiskUnitId(riskUnitUuidByUnitId.getRiskUnitUuid());
- CJReportRiskEvent.setRiskEventName(riskEvent.getRiskEventName());
- CJReportRiskEvent.setRiskEventId(riskEvent.getId());
- //封装数据
- CJEventLists.add(CJReportRiskEvent);
- //设置原始数据上报状态
- handlerReportParam.setId(riskEvent.getId());
- handlerReportParam.setReportTime(new Date());
- handlerReportParam.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
- preventRiskEventService.updateEventReportStatus(handlerReportParam);
- }
- }else {
- logger.info("【双重预防】当前无安全风险事件数据需要处理");
- }
- //写入昌吉州转换表
- for (PreventCJReportRiskEvent CJEvent : CJEventLists) {
- CJEventService.insertEventLists(CJEvent);
- logger.info("【双重预防】2.风险分析事件CJ：数据处理...");
- }
- step = 3;
- }else {
- step = 3;
- logger.info("安全风险事件数据上报已关闭");
- }
-
-
- /**
- * 3、检索安全风险管控措施数据
- * */
- //读取安全风险管控措施数据上报主配置信息
- PreventReportConfig measureReportConfig = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_RISK_MEASURE.getCode());
- //如果安全风险管控措施主配置开启上报
- if (measureReportConfig.getReportState().equals(SyncEnum.REPORT_ON.getCode())){
- //logger.info("{【##】3.检索安全风险管控措施...");
-
- //查询所有 选择上报的数据 && (reportTime == null 或者 reportTime < updateReportDataTime）
- List<PreventRiskControlMeasure> measures = preventRiskControlMeasureService.listReportMeasure();
- //获取上报数据list
- List<PreventCJReportRiskControlMeasure> CJMeasureLists = new ArrayList<>();
- HandlerReportParam handlerReportParam = new HandlerReportParam();
-
- if (ObjectUtils.isNotEmpty(measures)){
- //遍历，封装数据
- for (PreventRiskControlMeasure measure : measures) {
- String measureUuid = UUID.randomUUID().toString();
- //获取上报数据对象
- PreventCJReportRiskControlMeasure CJReportMeasure = new PreventCJReportRiskControlMeasure();
- //转换数据
- PreventRiskControlTemplate controlTemplateById = preventRiskControlTemplateService.getControlTemplateById(measure.getClassify2());
- String classify2 = measure.getClassify1() + "-" + controlTemplateById.getOrderIndex();
-
- //封装上报昌吉州管控措施数据
- CJReportMeasure.setId(measure.getUuid());
- CJReportMeasure.setCompanyCode(companyCode);
- if (measure.getReportStatus().equals(SyncEnum.SYNC_EXEC_SUCCESS.getCode())){
- CJReportMeasure.setDeleted("2");//数据更新状态标识，目前仅昌吉州需要 2022-08-10
- }else {
- CJReportMeasure.setDeleted("0");
- }
- CJReportMeasure.setCreateBy(measure.getCreateByUserName());
- CJReportMeasure.setCreateDate(measure.getGmtCreate());
- CJReportMeasure.setUpdateBy(measure.getCreateByUserName());
- CJReportMeasure.setUpdateDate(measure.getGmtModitify());
- CJReportMeasure.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
- CJReportMeasure.setReportTime(null);
- CJReportMeasure.setDataSource((byte) 1);
- CJReportMeasure.setRiskEventId(measure.getRiskEventUuid());
- CJReportMeasure.setRiskMeasureDesc(measure.getMeasureDesc());
- CJReportMeasure.setDataSrc(measure.getControlType().toString());
- CJReportMeasure.setClassify1(measure.getClassify1().toString());
- CJReportMeasure.setClassify2(classify2);
- CJReportMeasure.setClassify3(measure.getClassify3());
- CJReportMeasure.setRiskMeasureId(measure.getId());
- CJReportMeasure.setTroubleshootContent(measure.getCheckContent());
-
-
- //封装数据
- CJMeasureLists.add(CJReportMeasure);
- //设置原始数据上报状态
- handlerReportParam.setId(measure.getId());
- handlerReportParam.setReportTime(new Date());
- handlerReportParam.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
- preventRiskControlMeasureService.updateMeasureReportStatus(handlerReportParam);
- }
- }else {
- logger.info("【双重预防】当前无安全风险管控措施数据需要处理");
- }
-
- step = 4;
-
- //写入上报昌吉州转换表
- for (PreventCJReportRiskControlMeasure CJMeasure : CJMeasureLists) {
- CJMeasureService.insertMeasureList(CJMeasure);
-
- logger.info("【双重预防】3.安全风险管控措施CJ：数据处理...");
- }
- }else {
- step = 4;
- logger.info("安全风险管控措施数据上报已关闭");
- }
-
- /**
- * 4、检索 任务配置 数据 prevent_report_check_record_from_task
- * */
- //读取任务配置数据上报主配置信息
- PreventReportConfig workReportConfig = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_TASK_FROM_WORK.getCode());
- //如果任务配置主配置开启上报
- if (workReportConfig.getReportState().equals(SyncEnum.REPORT_ON.getCode())){
- // logger.info("【##】4.检索任务配置...");
- //查询所有 选择上报的数据 && (reportTime == null 或者 reportTime < updateReportDataTime）
- List<PreventRiskJobAndMeasure> works = preventRiskJobAndMeasureService.listReportWork();
- //获取上报数据对象与list
- List<PreventCJReportCheckTaskFromWork> CJTaskFromWorkLists = new ArrayList<>();
- HandlerReportParam handlerReportParam = new HandlerReportParam();
-
- if (ObjectUtils.isNotEmpty(works)){
- //遍历，封装数据
- for (PreventRiskJobAndMeasure work : works) {
- //通过work中的信息，查询主表数据
- HiddenDangerCheckJob jobById = trHiddenDangerCheckJobService.getJobById(work.getJobId());
- //获取数据对象
- PreventCJReportCheckTaskFromWork CJTaskFromWork = new PreventCJReportCheckTaskFromWork();
- //转换时间周期单位 (1小时,2日,3周,4月,5年)
- if (jobById.getTroubleshootTypeCycleType() == 1){
- CJTaskFromWork.setCheckCycle(Math.toIntExact(jobById.getTroubleshootTypeCycleNum()));
- CJTaskFromWork.setCheckCycleUnit("小时");
- CJTaskFromWork.setWorkStartTime("00:00:00");
- CJTaskFromWork.setWorkEndTime("23:59:59");
- }else if (jobById.getTroubleshootTypeCycleType() == 2){
- CJTaskFromWork.setCheckCycle(Math.toIntExact(jobById.getTroubleshootTypeCycleNum()));
- CJTaskFromWork.setCheckCycleUnit("天");
- }else if (jobById.getTroubleshootTypeCycleType() == 3){
- Long num = jobById.getTroubleshootTypeCycleNum() * 7;
- CJTaskFromWork.setCheckCycle(Math.toIntExact(num));
- CJTaskFromWork.setCheckCycleUnit("天");
- }else if (jobById.getTroubleshootTypeCycleType() == 4){
- CJTaskFromWork.setCheckCycle(Math.toIntExact(jobById.getTroubleshootTypeCycleNum()));
- CJTaskFromWork.setCheckCycleUnit("月");
- }else if (jobById.getTroubleshootTypeCycleType() == 5){
- CJTaskFromWork.setCheckCycle(Math.toIntExact(jobById.getTroubleshootTypeCycleNum()));
- CJTaskFromWork.setCheckCycleUnit("年");
- }
- //获取用户信息
- User createUser = 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());
-
- //第二版标准新增
- PreventRiskControlMeasure measureById = preventRiskControlMeasureService.getPreventRiskControlMeasureById(work.getMeasureId());
- CJTaskFromWork.setTroubleshootContent(measureById.getCheckContent());
- CJTaskFromWork.setTaskStartTime(jobById.getStartTime());
-
- CJTaskFromWork.setWorkDayType("0");
- List<PreventTaskType> typeByJobId = taskTypeService.getInfoByJobId(work.getJobId());
- int typeTag = 0;
- for (PreventTaskType taskType : typeByJobId) {
- typeTag = taskType.getType();
- }
- if (typeTag !=0){
- CJTaskFromWork.setTaskNum("1");
- }
- CJTaskFromWork.setWorkType(String.valueOf(typeTag));
-
- //封装数据
- CJTaskFromWorkLists.add(CJTaskFromWork);
- //设置原始数据上报状态
- handlerReportParam.setId(work.getId());
- handlerReportParam.setReportTime(new Date());
- handlerReportParam.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
- preventRiskJobAndMeasureService.updateWorkReportStatus(handlerReportParam);
- }
- }else {
- logger.info("【双重预防】当前无任务配置数据需要处理");
- }
- //写入上报昌吉州数据转换表
- for (PreventCJReportCheckTaskFromWork CJTaskFromWorks : CJTaskFromWorkLists) {
- CJTaskFromWorkService.insertTaskFromWorkList(CJTaskFromWorks);
- logger.info("【双重预防】任务配置CJ：数据处理...");
- }
- }else {
- step = 5;
- logger.info("任务配置数据上报已关闭");
- }
+// CJReportRiskAnaUnit.setDataSource((byte) 1);
+// CJReportRiskAnaUnit.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
+// CJReportRiskAnaUnit.setReportTime(null);
+// CJReportRiskAnaUnit.setRiskUnitId(infoByRiskId.getRiskListId());//此处封装主表的id
+// //封装数据
+// CJUnitLists.add(CJReportRiskAnaUnit);
+// //修改原始数据状态为待上传
+// handlerReportParam.setId(riskUnitUuid.getId());//此处修改的是附属表
+// handlerReportParam.setReportTime(new Date());
+// handlerReportParam.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
+// int result = preventRiskUnitUuidService.updateReportStatus(handlerReportParam);
+// }
+// }else {
+// logger.info("【双重预防】当前无风险分析单元数据需要处理");
+// }
+// //写入昌吉州转换表
+// for (PreventCJReportRiskAnaUnit CJUnit : CJUnitLists) {
+// CJRiskAnaUnitService.insertUnitList(CJUnit);
+// logger.info("【双重预防】1.风险分析单元CJ：数据处理...");
+// }
+// step = 2;
+// }else {
+// step = 2;
+// logger.info("风险分析单元数据上报已关闭");
+// }
+//
+//
+// /**
+// * 2、检索安全风险事件数据
+// * */
+// //读取风险分析单元数据上报主配置信息
+// PreventReportConfig eventReportConfig = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_RISK_EVENT.getCode());
+// //如果风险事件主配置开启上报
+// if (eventReportConfig.getReportState().equals(SyncEnum.REPORT_ON.getCode())){
+//
+// //logger.info("【##】2.检索安全风险事件...");
+// //查询所有 选择上报的数据 && (reportTime == null 或者 reportTime < updateReportDataTime）
+// List<PreventRiskEvent> riskEvents = preventRiskEventService.listReportEvent();
+// //获取上报数据对象与list
+// List<PreventCJReportRiskEvent> CJEventLists = new ArrayList<>();
+// if (ObjectUtils.isNotEmpty(riskEvents)){
+// //遍历，封装数据
+// for (PreventRiskEvent riskEvent : riskEvents) {
+// //String eventUuid = UUID.randomUUID().toString();
+// HandlerReportParam handlerReportParam = new HandlerReportParam();
+// PreventCJReportRiskEvent CJReportRiskEvent = new PreventCJReportRiskEvent();
+// //封装上报昌吉州风险事件数据
+// CJReportRiskEvent.setId(riskEvent.getUuid());
+// CJReportRiskEvent.setCompanyCode(companyCode);
+// if (riskEvent.getReportStatus().equals(SyncEnum.SYNC_EXEC_SUCCESS.getCode())){
+// CJReportRiskEvent.setDeleted("2");//数据更新状态标识，目前仅昌吉州需要 2022-08-10
+// }else {
+// CJReportRiskEvent.setDeleted("0");
+// }
+// CJReportRiskEvent.setCreateBy(riskEvent.getCreateByUserName());
+// CJReportRiskEvent.setCreateDate(riskEvent.getGmtCreate());
+// CJReportRiskEvent.setUpdateBy(riskEvent.getCreateByUserName());
+// CJReportRiskEvent.setUpdateDate(riskEvent.getGmtModitify());
+// CJReportRiskEvent.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
+// CJReportRiskEvent.setReportTime(null);
+// CJReportRiskEvent.setDataSource((byte) 1);
+// PreventRiskUnitUuid riskUnitUuidByUnitId = preventRiskUnitUuidService.getRiskUnitUuidByUnitId(riskEvent.getRiskUnitId());
+// CJReportRiskEvent.setRiskUnitId(riskUnitUuidByUnitId.getRiskUnitUuid());
+// CJReportRiskEvent.setRiskEventName(riskEvent.getRiskEventName());
+// CJReportRiskEvent.setRiskEventId(riskEvent.getId());
+// //封装数据
+// CJEventLists.add(CJReportRiskEvent);
+// //设置原始数据上报状态
+// handlerReportParam.setId(riskEvent.getId());
+// handlerReportParam.setReportTime(new Date());
+// handlerReportParam.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
+// preventRiskEventService.updateEventReportStatus(handlerReportParam);
+// }
+// }else {
+// logger.info("【双重预防】当前无安全风险事件数据需要处理");
+// }
+// //写入昌吉州转换表
+// for (PreventCJReportRiskEvent CJEvent : CJEventLists) {
+// CJEventService.insertEventLists(CJEvent);
+// logger.info("【双重预防】2.风险分析事件CJ：数据处理...");
+// }
+// step = 3;
+// }else {
+// step = 3;
+// logger.info("安全风险事件数据上报已关闭");
+// }
+//
+//
+// /**
+// * 3、检索安全风险管控措施数据
+// * */
+// //读取安全风险管控措施数据上报主配置信息
+// PreventReportConfig measureReportConfig = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_RISK_MEASURE.getCode());
+// //如果安全风险管控措施主配置开启上报
+// if (measureReportConfig.getReportState().equals(SyncEnum.REPORT_ON.getCode())){
+// //logger.info("{【##】3.检索安全风险管控措施...");
+//
+// //查询所有 选择上报的数据 && (reportTime == null 或者 reportTime < updateReportDataTime）
+// List<PreventRiskControlMeasure> measures = preventRiskControlMeasureService.listReportMeasure();
+// //获取上报数据list
+// List<PreventCJReportRiskControlMeasure> CJMeasureLists = new ArrayList<>();
+// HandlerReportParam handlerReportParam = new HandlerReportParam();
+//
+// if (ObjectUtils.isNotEmpty(measures)){
+// //遍历，封装数据
+// for (PreventRiskControlMeasure measure : measures) {
+// String measureUuid = UUID.randomUUID().toString();
+// //获取上报数据对象
+// PreventCJReportRiskControlMeasure CJReportMeasure = new PreventCJReportRiskControlMeasure();
+// //转换数据
+// PreventRiskControlTemplate controlTemplateById = preventRiskControlTemplateService.getControlTemplateById(measure.getClassify2());
+// String classify2 = measure.getClassify1() + "-" + controlTemplateById.getOrderIndex();
+//
+// //封装上报昌吉州管控措施数据
+// CJReportMeasure.setId(measure.getUuid());
+// CJReportMeasure.setCompanyCode(companyCode);
+// if (measure.getReportStatus().equals(SyncEnum.SYNC_EXEC_SUCCESS.getCode())){
+// CJReportMeasure.setDeleted("2");//数据更新状态标识，目前仅昌吉州需要 2022-08-10
+// }else {
+// CJReportMeasure.setDeleted("0");
+// }
+// CJReportMeasure.setCreateBy(measure.getCreateByUserName());
+// CJReportMeasure.setCreateDate(measure.getGmtCreate());
+// CJReportMeasure.setUpdateBy(measure.getCreateByUserName());
+// CJReportMeasure.setUpdateDate(measure.getGmtModitify());
+// CJReportMeasure.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
+// CJReportMeasure.setReportTime(null);
+// CJReportMeasure.setDataSource((byte) 1);
+// CJReportMeasure.setRiskEventId(measure.getRiskEventUuid());
+// CJReportMeasure.setRiskMeasureDesc(measure.getMeasureDesc());
+// CJReportMeasure.setDataSrc(measure.getControlType().toString());
+// CJReportMeasure.setClassify1(measure.getClassify1().toString());
+// CJReportMeasure.setClassify2(classify2);
+// CJReportMeasure.setClassify3(measure.getClassify3());
+// CJReportMeasure.setRiskMeasureId(measure.getId());
+// CJReportMeasure.setTroubleshootContent(measure.getCheckContent());
+//
+//
+// //封装数据
+// CJMeasureLists.add(CJReportMeasure);
+// //设置原始数据上报状态
+// handlerReportParam.setId(measure.getId());
+// handlerReportParam.setReportTime(new Date());
+// handlerReportParam.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
+// preventRiskControlMeasureService.updateMeasureReportStatus(handlerReportParam);
+// }
+// }else {
+// logger.info("【双重预防】当前无安全风险管控措施数据需要处理");
+// }
+//
+// step = 4;
+//
+// //写入上报昌吉州转换表
+// for (PreventCJReportRiskControlMeasure CJMeasure : CJMeasureLists) {
+// CJMeasureService.insertMeasureList(CJMeasure);
+//
+// logger.info("【双重预防】3.安全风险管控措施CJ：数据处理...");
+// }
+// }else {
+// step = 4;
+// logger.info("安全风险管控措施数据上报已关闭");
+// }
+//
+// /**
+// * 4、检索 任务配置 数据 prevent_report_check_record_from_task
+// * */
+// //读取任务配置数据上报主配置信息
+// PreventReportConfig workReportConfig = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_TASK_FROM_WORK.getCode());
+// //如果任务配置主配置开启上报
+// if (workReportConfig.getReportState().equals(SyncEnum.REPORT_ON.getCode())){
+// // logger.info("【##】4.检索任务配置...");
+// //查询所有 选择上报的数据 && (reportTime == null 或者 reportTime < updateReportDataTime）
+// List<PreventRiskJobAndMeasure> works = preventRiskJobAndMeasureService.listReportWork();
+// //获取上报数据对象与list
+// List<PreventCJReportCheckTaskFromWork> CJTaskFromWorkLists = new ArrayList<>();
+// HandlerReportParam handlerReportParam = new HandlerReportParam();
+//
+// if (ObjectUtils.isNotEmpty(works)){
+// //遍历，封装数据
+// for (PreventRiskJobAndMeasure work : works) {
+// //通过work中的信息，查询主表数据
+// HiddenDangerCheckJob jobById = trHiddenDangerCheckJobService.getJobById(work.getJobId());
+// //获取数据对象
+// PreventCJReportCheckTaskFromWork CJTaskFromWork = new PreventCJReportCheckTaskFromWork();
+// //转换时间周期单位 (1小时,2日,3周,4月,5年)
+// if (jobById.getTroubleshootTypeCycleType() == 1){
+// CJTaskFromWork.setCheckCycle(Math.toIntExact(jobById.getTroubleshootTypeCycleNum()));
+// CJTaskFromWork.setCheckCycleUnit("小时");
+// CJTaskFromWork.setWorkStartTime("00:00:00");
+// CJTaskFromWork.setWorkEndTime("23:59:59");
+// }else if (jobById.getTroubleshootTypeCycleType() == 2){
+// CJTaskFromWork.setCheckCycle(Math.toIntExact(jobById.getTroubleshootTypeCycleNum()));
+// CJTaskFromWork.setCheckCycleUnit("天");
+// }else if (jobById.getTroubleshootTypeCycleType() == 3){
+// Long num = jobById.getTroubleshootTypeCycleNum() * 7;
+// CJTaskFromWork.setCheckCycle(Math.toIntExact(num));
+// CJTaskFromWork.setCheckCycleUnit("天");
+// }else if (jobById.getTroubleshootTypeCycleType() == 4){
+// CJTaskFromWork.setCheckCycle(Math.toIntExact(jobById.getTroubleshootTypeCycleNum()));
+// CJTaskFromWork.setCheckCycleUnit("月");
+// }else if (jobById.getTroubleshootTypeCycleType() == 5){
+// CJTaskFromWork.setCheckCycle(Math.toIntExact(jobById.getTroubleshootTypeCycleNum()));
+// CJTaskFromWork.setCheckCycleUnit("年");
+// }
+// //获取用户信息
+// User createUser = 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());
+//
+// //第二版标准新增
+// PreventRiskControlMeasure measureById = preventRiskControlMeasureService.getPreventRiskControlMeasureById(work.getMeasureId());
+// CJTaskFromWork.setTroubleshootContent(measureById.getCheckContent());
+// CJTaskFromWork.setTaskStartTime(jobById.getStartTime());
+//
+// CJTaskFromWork.setWorkDayType("0");
+// List<PreventTaskType> typeByJobId = taskTypeService.getInfoByJobId(work.getJobId());
+// int typeTag = 0;
+// for (PreventTaskType taskType : typeByJobId) {
+// typeTag = taskType.getType();
+// }
+// if (typeTag !=0){
+// CJTaskFromWork.setTaskNum("1");
+// }
+// CJTaskFromWork.setWorkType(String.valueOf(typeTag));
+//
+// //封装数据
+// CJTaskFromWorkLists.add(CJTaskFromWork);
+// //设置原始数据上报状态
+// handlerReportParam.setId(work.getId());
+// handlerReportParam.setReportTime(new Date());
+// handlerReportParam.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
+// preventRiskJobAndMeasureService.updateWorkReportStatus(handlerReportParam);
+// }
+// }else {
+// logger.info("【双重预防】当前无任务配置数据需要处理");
+// }
+// //写入上报昌吉州数据转换表
+// for (PreventCJReportCheckTaskFromWork CJTaskFromWorks : CJTaskFromWorkLists) {
+// CJTaskFromWorkService.insertTaskFromWorkList(CJTaskFromWorks);
+// logger.info("【双重预防】任务配置CJ：数据处理...");
+// }
+// }else {
+// step = 5;
+// logger.info("任务配置数据上报已关闭");
+// }
/**
@@ -450,18 +450,22 @@
//查询所有 选择上报的数据 && (reportTime == null 或者 reportTime < updateReportDataTime）
List<PreventRiskDangerCheckLog> tasks = preventRiskDangerCheckLogService.listReportTask();
+ List<Long> taskIds = new ArrayList<>();
//获取上报数据对象
List<PreventCJReportCheckRecordFromTask> CJRecordFromTaskLists = new ArrayList<>();
- HandlerReportParam handlerReportParam = new HandlerReportParam();
+// HandlerReportParam handlerReportParam = new HandlerReportParam();
+// List<HandlerReportParam> handlerReportParamList = new ArrayList<>();
if (ObjectUtils.isNotEmpty(tasks)){
+ //获取信息
+ List<User> allUserList = trUserService.getAllUser();
+ List<PreventRiskControlMeasure> allMeasureList = preventRiskControlMeasureService.getAllMeasureList();
+ List<PreventTaskType> allTaskTypeList = taskTypeService.getAllTaskTypeList();
//遍历，封装数据
for (PreventRiskDangerCheckLog task : tasks) {
//获取任务记录主表信息
HiddenDangerCheck hiddenDangerCheckById = trHiddenDangerCheckService.getHiddenDangerCheckById(task.getCheckId());
- //获取任务附属表信息
- PreventRiskJobAndMeasure jobAndMeasureByJobId = preventRiskJobAndMeasureService.getJobAndMeasureByJobId(task.getJobId());
//转换检查结果
- //如果已经执行过，进入方法 todo
+ //如果已经执行过，进入方法
if (Integer.valueOf(hiddenDangerCheckById.getScheduleCheckStatus()) == 1){
List<HiddenDangerCheckPoint> hiddenDangerCheckPointList = trHiddenDangerCheckPointService.getHiddenDangerCheckPointByCheckId(task.getCheckId());
@@ -477,12 +481,34 @@
if (Integer.valueOf(hiddenDangerCheckPoint.getWhetherDanger()) == 1){
CJRecordFromTask.setCheckStatus("1");// 0-正常；1-存在隐患；2-未处理；3-其他
}
+
User createUser = new User();
- createUser = trUserService.getUserByLoginName(hiddenDangerCheckById.getCreateBy());
- if(ObjectUtils.isEmpty(createUser)){
- createUser = trUserService.getUserByName(hiddenDangerCheckById.getCreateBy());
+ User updateUser = new User();
+// createUser = trUserService.getUserByLoginName(hiddenDangerCheckById.getCreateBy());
+// if(ObjectUtils.isEmpty(createUser)){
+// createUser = trUserService.getUserByName(hiddenDangerCheckById.getCreateBy());
+// }
+// updateUser = trUserService.getUserByLoginName(hiddenDangerCheckById.getUpdateBy());
+
+
+ // todo 取出所有用户信息，再循环在匹配
+ for (User user : allUserList) {
+ if (hiddenDangerCheckById.getCreateBy().equals(user.getLoginName())){
+ createUser = user;
+ }
+ if (hiddenDangerCheckById.getUpdateBy().equals(user.getLoginName())){
+ updateUser = user;
+ }
}
- User updateUser = trUserService.getUserByLoginName(hiddenDangerCheckById.getUpdateBy());
+ if(ObjectUtils.isEmpty(createUser)){
+ for (User user : allUserList) {
+ if (hiddenDangerCheckById.getCreateBy().equals(user.getUserName())){
+ createUser = user;
+ }
+ }
+ }
+
+
//封装上报昌吉州的任务数据
// String taskUuid = UUID.randomUUID().toString();
@@ -515,22 +541,43 @@
for (PreventRiskDangerCheckAndMeasure checkAndMeasure : baseCheckPointAndMeasure) {
controlMeasureId = checkAndMeasure.getControlMeasureId();
}
- //获取该条记录对应的管控措施uuid
- PreventRiskControlMeasure preventRiskControlMeasureById = preventRiskControlMeasureService.getPreventRiskControlMeasureById(controlMeasureId);
- //通过管控措施uuid ，jobId(workId)，在任务上报表中，找到任务对应的uuid
- PreventCJReportCheckTaskFromWork preventCJReportCheckTaskFromWork = CJTaskFromWorkService.geByMeasureUUidAndJobId(preventRiskControlMeasureById.getUuid(), task.getJobId());
- CJRecordFromTask.setCheckTaskId(preventCJReportCheckTaskFromWork.getId());
+// //获取该条记录对应的管控措施uuid
+// PreventRiskControlMeasure preventRiskControlMeasureById = preventRiskControlMeasureService.getPreventRiskControlMeasureById(controlMeasureId);
+// //通过管控措施uuid ，jobId(workId)，在任务上报表中，找到任务对应的uuid
+// PreventCJReportCheckTaskFromWork preventCJReportCheckTaskFromWork = CJTaskFromWorkService.geByMeasureUUidAndJobId(preventRiskControlMeasureById.getUuid(), task.getJobId());
+// CJRecordFromTask.setCheckTaskId(preventCJReportCheckTaskFromWork.getId());
+ // todo 取出所有措施，再循环在匹配
+ for (PreventRiskControlMeasure measure : allMeasureList) {
+ if (controlMeasureId.equals(measure.getId())){
+ //通过管控措施uuid ，jobId(workId)，在任务上报表中，找到任务对应的uuid
+ PreventCJReportCheckTaskFromWork preventCJReportCheckTaskFromWork = CJTaskFromWorkService.geByMeasureUUidAndJobId(measure.getUuid(), task.getJobId());
+ CJRecordFromTask.setCheckTaskId(preventCJReportCheckTaskFromWork.getId());
+ }
+ }
+
+
CJRecordFromTask.setCheckTime(hiddenDangerCheckById.getCheckTime());
CJRecordFromTask.setTaskId(task.getCheckId());
//第二版标准新增
CJRecordFromTask.setMobileCode(task.getMobileCode().toString());
- List<PreventTaskType> typeByJobIds = taskTypeService.getInfoByJobId(task.getJobId());
+
int typeTag = 0;
- for (PreventTaskType typeByJobId : typeByJobIds) {
- if (typeByJobId.getType()!= 0) {
- typeTag = 1;
+// List<PreventTaskType> typeByJobIds = taskTypeService.getInfoByJobId(task.getJobId());
+// for (PreventTaskType typeByJobId : typeByJobIds) {
+// if (typeByJobId.getType()!= 0) {
+// typeTag = 1;
+// }
+// }
+
+ // todo 取出所有任务信息表，再循环在匹配
+ for (PreventTaskType taskType : allTaskTypeList) {
+ if (taskType.getJobId().equals(task.getJobId())){
+ if (taskType.getType()!= 0) {
+ typeTag = 1;
+ }
}
}
+
CJRecordFromTask.setDefend(String.valueOf(typeTag));
//封装数据
@@ -539,182 +586,179 @@
}
//设置原始数据上报状态
- handlerReportParam.setId(task.getId());
- handlerReportParam.setReportTime(new Date());
- handlerReportParam.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
- preventRiskDangerCheckLogService.updateTaskReportStatus(handlerReportParam);
+// handlerReportParam.setId(task.getId());
+// handlerReportParam.setReportTime(new Date());
+// handlerReportParam.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
+// handlerReportParamList.add(handlerReportParam);
+// preventRiskDangerCheckLogService.updateTaskReportStatus(handlerReportParam);
int i = 1;
-// System.out.println("【##】数据封装" + 1);
+ taskIds.add(task.getId());
}
System.out.println("【##】5.数据封装完成...");
-// String checkStatus = null;
-// if (ObjectUtils.isEmpty(task.getResult() )){
-// checkStatus = "2";
-// }else if (task.getResult() == 2){
-// checkStatus = "1";
-// }else if (task.getResult() == 1){
-// checkStatus = "0";
-// }
+
}
}else {
logger.info("【双重预防】当前无排查任务记录需要处理");
}
- //插入上报昌吉州转换表
- for (PreventCJReportCheckRecordFromTask CJRecordFromTasks : CJRecordFromTaskLists) {
- int result = CJTaskRecordService.insert(CJRecordFromTasks);
- if (result < 0){
- throw new AusinessException(E.ADD_FAIL.getCode(), "排查任务记录插入失败");
- }
+ if (CJRecordFromTaskLists.size() > 0){
logger.info("【双重预防】排查任务记录CJ：数据处理...");
+ //设置原始数据状态
+ int taskUpdateResult = preventRiskDangerCheckLogService.updateTaskReportStatusByList(taskIds);
+ if (taskUpdateResult < tasks.size()){
+ throw new AusinessException(E.ADD_FAIL.getCode(), "排查任务记录原始数据更新失败, 取消操作");
+ }
+ int result = CJTaskRecordService.insertRecordList(CJRecordFromTaskLists);
+ if (result < CJRecordFromTaskLists.size()){
+ throw new AusinessException(E.ADD_FAIL.getCode(), "排查任务记录插入失败, 取消操作");
+ }
}
step = 6;
-
}else {
step = 6;
logger.info("排查任务记录数据上报已关闭");
}
- /**
- * 6、隐患信息数据
- * */
- //读取安全风险管控措施数据上报主配置信息
- PreventReportConfig dangerReportConfig = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_DANGER_INFO.getCode());
- //如果安全风险管控措施主配置开启上报
- if (dangerReportConfig.getReportState().equals(SyncEnum.REPORT_ON.getCode())){
-
- //logger.info("【##】6.检索隐患数据...");
-
- //查询所有 选择上报的数据 && (reportTime == null 或者 reportTime < updateReportDataTime）
- List<PreventRiskDangerInfo> dangerManages = preventRiskDangerInfoService.listReportDanger();
- //获取上报数据list
- List<PreventCJReportDangerInfo> CJDangerInfoLists = new ArrayList<>();
-
- if (ObjectUtils.isNotEmpty(dangerManages)){
- HandlerReportParam handlerReportParam = new HandlerReportParam();
- //遍历，封装数据
- for (PreventRiskDangerInfo dangerManage : dangerManages) {
-
- //获取隐患信息主表信息
- HiddenDangerCheckPoint hiddenDanger = trHiddenDangerCheckPointService.getHiddenDangerCheckPointById(dangerManage.getDangerCheckPointId());
- //获取上报数据对象
- PreventCJReportDangerInfo CJDangerInfo = new PreventCJReportDangerInfo();
-
- //通过用户名，获取涉及到的各位用户的真实姓名
- User createUser = new User();
- createUser = trUserService.getUserByLoginName(hiddenDanger.getCreateBy());
-// createUser = trUserService.getUserByLoginName("guotai");
- if(ObjectUtils.isEmpty(createUser)){
- createUser = trUserService.getUserByName(hiddenDanger.getCreateBy());
- }
- User updateUser = trUserService.getUserByLoginName(hiddenDanger.getUpdateBy());
-// User updateUser = trUserService.getUserByLoginName("guotai");
- if (ObjectUtils.isNotEmpty(hiddenDanger.getRegisterUserName())){
- User registerUser = trUserService.getUserByLoginName(hiddenDanger.getRegisterUserName());
- //登记人信息
- CJDangerInfo.setRegistrant(registerUser.getUserName());//登记人
- CJDangerInfo.setRegistTime(hiddenDanger.getRegisterCreateTime());//登记时间
- }
-
- CJDangerInfo.setCost(String.valueOf(0));//初始值给0
- if (ObjectUtils.isNotEmpty(hiddenDanger.getRectifyUserName())){
- User rectifyUser = trUserService.getUserByLoginName(hiddenDanger.getRectifyUserName());
- //整改人信息
- CJDangerInfo.setLiablePerson(rectifyUser.getUserName());//整改责任人
- CJDangerInfo.setCost(hiddenDanger.getRectifyFund());//资金
- }
-
- if (ObjectUtils.isNotEmpty(hiddenDanger.getAcceptUserName())){
- //验收人信息
- CJDangerInfo.setCheckAcceptPerson(hiddenDanger.getAcceptUserName());//验收人
- CJDangerInfo.setCheckAcceptComment(hiddenDanger.getAcceptOpinion());//验收情况
- CJDangerInfo.setCheckAcceptTime(hiddenDanger.getAcceptCreateTime());//验收时间
- }
-
- //如果排查任务正常存在，封装任务相关数据
-// if (Integer.parseInt(hiddenDanger.getDangerSources()) != 2){
-// HiddenDangerCheck dangerCheckById = trHiddenDangerCheckService.getHiddenDangerCheckById(hiddenDanger.getCheckId());
+// /**
+// * 6、隐患信息数据
+// * */
+// //读取安全风险管控措施数据上报主配置信息
+// PreventReportConfig dangerReportConfig = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_DANGER_INFO.getCode());
+// //如果安全风险管控措施主配置开启上报
+// if (dangerReportConfig.getReportState().equals(SyncEnum.REPORT_ON.getCode())){
//
-// PreventRiskDangerCheckLog dangerCheckLogByCheckId = preventRiskDangerCheckLogService.getByDangerCheckByCheckId(hiddenDanger.getCheckId());
-// CJDangerInfo.setCheckRecordId(dangerCheckLogByCheckId.getUuid());//隐患排查任务记录uuid
-// //找排查点，然后查措施
-// PreventRiskCheckUnit unit = preventRiskCheckUnitService.getUnitByBaseCheckPointId(hiddenDanger.getCheckPointId());
-// //查管控措施
-// PreventRiskControlMeasure controlMeasureById = preventRiskControlMeasureService.getPreventRiskControlMeasureById(unit.getControlMeasureId());
-// CJDangerInfo.setRiskMeasureId(controlMeasureById.getUuid());//管控措施uuid
-// CJDangerInfo.setControlMeasures(controlMeasureById.getCheckContent());//控制措施 ,整改措施
-// }else {
-// CJDangerInfo.setCheckRecordId(null);
-// CJDangerInfo.setRiskMeasureId(null);
+// //logger.info("【##】6.检索隐患数据...");
+//
+// //查询所有 选择上报的数据 && (reportTime == null 或者 reportTime < updateReportDataTime）
+// List<PreventRiskDangerInfo> dangerManages = preventRiskDangerInfoService.listReportDanger();
+// //获取上报数据list
+// List<PreventCJReportDangerInfo> CJDangerInfoLists = new ArrayList<>();
+//
+// if (ObjectUtils.isNotEmpty(dangerManages)){
+// HandlerReportParam handlerReportParam = new HandlerReportParam();
+// //遍历，封装数据
+// for (PreventRiskDangerInfo dangerManage : dangerManages) {
+//
+// //获取隐患信息主表信息
+// HiddenDangerCheckPoint hiddenDanger = trHiddenDangerCheckPointService.getHiddenDangerCheckPointById(dangerManage.getDangerCheckPointId());
+// //获取上报数据对象
+// PreventCJReportDangerInfo CJDangerInfo = new PreventCJReportDangerInfo();
+//
+// //通过用户名，获取涉及到的各位用户的真实姓名
+// User createUser = new User();
+// createUser = trUserService.getUserByLoginName(hiddenDanger.getCreateBy());
+//// createUser = trUserService.getUserByLoginName("guotai");
+// if(ObjectUtils.isEmpty(createUser)){
+// createUser = trUserService.getUserByName(hiddenDanger.getCreateBy());
// }
- CJDangerInfo.setCheckRecordId(null);
- CJDangerInfo.setRiskMeasureId(null);//默认无任务
- CJDangerInfo.setDeleted("0");
- CJDangerInfo.setId(dangerManage.getUuid());
- CJDangerInfo.setCompanyCode(companyCode);
- CJDangerInfo.setHazardCode(dangerManage.getHazardCode());
- CJDangerInfo.setCreateBy(createUser.getUserName());
- CJDangerInfo.setCreateDate(hiddenDanger.getCreateTime());
-
- if (ObjectUtils.isEmpty(updateUser)){
- CJDangerInfo.setUpdateBy(createUser.getUserName());
- CJDangerInfo.setUpdateDate(hiddenDanger.getCreateTime());
- }else {
- CJDangerInfo.setUpdateBy(updateUser.getUserName());
- CJDangerInfo.setUpdateDate(hiddenDanger.getUpdateTime());
- }
- CJDangerInfo.setHazardCategory("0");
- if (dangerManage.getId() <= 383){
- PreventTaskType taskTypeInfo = taskTypeService.getInfoByTaskId(dangerManage.getId());
- int i = 1;
- CJDangerInfo.setHazardCategory(taskTypeInfo.getType().toString());
- }
- CJDangerInfo.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
- CJDangerInfo.setReportTime(null);
- CJDangerInfo.setDataSource((byte) 1);
- CJDangerInfo.setDangerName(hiddenDanger.getDangerName());
- CJDangerInfo.setDangerLevel(hiddenDanger.getDangerLevel());
- CJDangerInfo.setDangerSrc(dangerManage.getDangerSrc().toString());
- if (hiddenDanger.getRectifyType().equals("1")){
- CJDangerInfo.setDangerManageType("0");
- }else {
- CJDangerInfo.setDangerManageType("1");
- }
- CJDangerInfo.setDangerDesc(hiddenDanger.getDangerDescription());
- CJDangerInfo.setDangerReason(dangerManage.getDangerReason());
- CJDangerInfo.setDangerManageDeadline(hiddenDanger.getRectifyDeadlineTime());
- if (ObjectUtils.isNotEmpty(dangerManage.getDangerState())){
- CJDangerInfo.setDangerState(dangerManage.getDangerState().toString());
- }
- CJDangerInfo.setHazardDangerType(dangerManage.getHazardDangerType().toString());
- CJDangerInfo.setDangerManagerId(dangerManage.getId());
-
- CJDangerInfoLists.add(CJDangerInfo);
- //设置原始数据上报状态
- handlerReportParam.setId(dangerManage.getId());
- handlerReportParam.setReportTime(new Date());
- handlerReportParam.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
- //修改隐患信息附属表状态
- preventRiskDangerInfoService.updateDangerInfoReportStatus(handlerReportParam);
- }
- }else {
- logger.info("【双重预防】当前无隐患信息需要处理");
- }
-
- //插入上报昌吉州转换表
- for (PreventCJReportDangerInfo CJDanger : CJDangerInfoLists) {
- logger.info("【双重预防】隐患信息插入...");
- int result = CJDangerInfoService.insert(CJDanger);
- if (result < 0){
- throw new AusinessException(E.ADD_FAIL.getCode(), "隐患信息插入失败");
- }
- logger.info("【双重预防】隐患信息：数据处理...");
- }
- }else {
- logger.info("隐患信息数据上报已关闭");
- }
-
+// User updateUser = trUserService.getUserByLoginName(hiddenDanger.getUpdateBy());
+//// User updateUser = trUserService.getUserByLoginName("guotai");
+// if (ObjectUtils.isNotEmpty(hiddenDanger.getRegisterUserName())){
+// User registerUser = trUserService.getUserByLoginName(hiddenDanger.getRegisterUserName());
+// //登记人信息
+// CJDangerInfo.setRegistrant(registerUser.getUserName());//登记人
+// CJDangerInfo.setRegistTime(hiddenDanger.getRegisterCreateTime());//登记时间
+// }
+//
+// CJDangerInfo.setCost(String.valueOf(0));//初始值给0
+// if (ObjectUtils.isNotEmpty(hiddenDanger.getRectifyUserName())){
+// User rectifyUser = trUserService.getUserByLoginName(hiddenDanger.getRectifyUserName());
+// //整改人信息
+// CJDangerInfo.setLiablePerson(rectifyUser.getUserName());//整改责任人
+// CJDangerInfo.setCost(hiddenDanger.getRectifyFund());//资金
+// }
+//
+// if (ObjectUtils.isNotEmpty(hiddenDanger.getAcceptUserName())){
+// //验收人信息
+// CJDangerInfo.setCheckAcceptPerson(hiddenDanger.getAcceptUserName());//验收人
+// CJDangerInfo.setCheckAcceptComment(hiddenDanger.getAcceptOpinion());//验收情况
+// CJDangerInfo.setCheckAcceptTime(hiddenDanger.getAcceptCreateTime());//验收时间
+// }
+//
+// //如果排查任务正常存在，封装任务相关数据
+//// if (Integer.parseInt(hiddenDanger.getDangerSources()) != 2){
+//// HiddenDangerCheck dangerCheckById = trHiddenDangerCheckService.getHiddenDangerCheckById(hiddenDanger.getCheckId());
+////
+//// PreventRiskDangerCheckLog dangerCheckLogByCheckId = preventRiskDangerCheckLogService.getByDangerCheckByCheckId(hiddenDanger.getCheckId());
+//// CJDangerInfo.setCheckRecordId(dangerCheckLogByCheckId.getUuid());//隐患排查任务记录uuid
+//// //找排查点，然后查措施
+//// PreventRiskCheckUnit unit = preventRiskCheckUnitService.getUnitByBaseCheckPointId(hiddenDanger.getCheckPointId());
+//// //查管控措施
+//// PreventRiskControlMeasure controlMeasureById = preventRiskControlMeasureService.getPreventRiskControlMeasureById(unit.getControlMeasureId());
+//// CJDangerInfo.setRiskMeasureId(controlMeasureById.getUuid());//管控措施uuid
+//// CJDangerInfo.setControlMeasures(controlMeasureById.getCheckContent());//控制措施 ,整改措施
+//// }else {
+//// CJDangerInfo.setCheckRecordId(null);
+//// CJDangerInfo.setRiskMeasureId(null);
+//// }
+// CJDangerInfo.setCheckRecordId(null);
+// CJDangerInfo.setRiskMeasureId(null);//默认无任务
+// CJDangerInfo.setDeleted("0");
+// CJDangerInfo.setId(dangerManage.getUuid());
+// CJDangerInfo.setCompanyCode(companyCode);
+// CJDangerInfo.setHazardCode(dangerManage.getHazardCode());
+// CJDangerInfo.setCreateBy(createUser.getUserName());
+// CJDangerInfo.setCreateDate(hiddenDanger.getCreateTime());
+//
+// if (ObjectUtils.isEmpty(updateUser)){
+// CJDangerInfo.setUpdateBy(createUser.getUserName());
+// CJDangerInfo.setUpdateDate(hiddenDanger.getCreateTime());
+// }else {
+// CJDangerInfo.setUpdateBy(updateUser.getUserName());
+// CJDangerInfo.setUpdateDate(hiddenDanger.getUpdateTime());
+// }
+// CJDangerInfo.setHazardCategory("0");
+// if (dangerManage.getId() <= 383){
+// PreventTaskType taskTypeInfo = taskTypeService.getInfoByTaskId(dangerManage.getId());
+// int i = 1;
+// CJDangerInfo.setHazardCategory(taskTypeInfo.getType().toString());
+// }
+// CJDangerInfo.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
+// CJDangerInfo.setReportTime(null);
+// CJDangerInfo.setDataSource((byte) 1);
+// CJDangerInfo.setDangerName(hiddenDanger.getDangerName());
+// CJDangerInfo.setDangerLevel(hiddenDanger.getDangerLevel());
+// CJDangerInfo.setDangerSrc(dangerManage.getDangerSrc().toString());
+// if (hiddenDanger.getRectifyType().equals("1")){
+// CJDangerInfo.setDangerManageType("0");
+// }else {
+// CJDangerInfo.setDangerManageType("1");
+// }
+// CJDangerInfo.setDangerDesc(hiddenDanger.getDangerDescription());
+// CJDangerInfo.setDangerReason(dangerManage.getDangerReason());
+// CJDangerInfo.setDangerManageDeadline(hiddenDanger.getRectifyDeadlineTime());
+// if (ObjectUtils.isNotEmpty(dangerManage.getDangerState())){
+// CJDangerInfo.setDangerState(dangerManage.getDangerState().toString());
+// }
+// CJDangerInfo.setHazardDangerType(dangerManage.getHazardDangerType().toString());
+// CJDangerInfo.setDangerManagerId(dangerManage.getId());
+//
+// CJDangerInfoLists.add(CJDangerInfo);
+// //设置原始数据上报状态
+// handlerReportParam.setId(dangerManage.getId());
+// handlerReportParam.setReportTime(new Date());
+// handlerReportParam.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
+// //修改隐患信息附属表状态
+// preventRiskDangerInfoService.updateDangerInfoReportStatus(handlerReportParam);
+// }
+// }else {
+// logger.info("【双重预防】当前无隐患信息需要处理");
+// }
+//
+// //插入上报昌吉州转换表
+// for (PreventCJReportDangerInfo CJDanger : CJDangerInfoLists) {
+// logger.info("【双重预防】隐患信息插入...");
+// int result = CJDangerInfoService.insert(CJDanger);
+// if (result < 0){
+// throw new AusinessException(E.ADD_FAIL.getCode(), "隐患信息插入失败");
+// }
+// logger.info("【双重预防】隐患信息：数据处理...");
+// }
+// }else {
+// logger.info("隐患信息数据上报已关闭");
+// }
+//
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportCheckRecordFromTaskService.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportCheckRecordFromTaskService.java
index ce877db..c789d00 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportCheckRecordFromTaskService.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportCheckRecordFromTaskService.java
@@ -4,6 +4,7 @@
import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportCheckRecordFromTask;
import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam;
import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
+import io.lettuce.core.dynamic.annotation.Param;
import java.util.List;
@@ -12,6 +13,10 @@
* 插入任务记录
* */
int insert(PreventCJReportCheckRecordFromTask recordFromTasks);
+ /**
+ * 插入任务记录
+ * */
+ int insertRecordList(@Param(value="list") List<PreventCJReportCheckRecordFromTask> recordFromTaskList);
// /**
// * 任务记录-分页查询
// * */
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 69becf0..45a5ff8 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskControlMeasureService.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskControlMeasureService.java
@@ -59,4 +59,6 @@
List<PreventRiskControlMeasure> listRiskControlMeasure();
PreventRiskControlMeasure getPreventRiskControlMeasureByUuid(String riskMeasureId);
+
+ List<PreventRiskControlMeasure> getAllMeasureList();
}
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 b200fb3..5fb76af 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskDangerCheckLogService.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskDangerCheckLogService.java
@@ -33,4 +33,6 @@
PreventRiskDangerCheckLog getByDangerCheckByJobId(Long jobId);
int updateCheckLog(Long checkId, Long mobileCode);
+
+ int updateTaskReportStatusByList(List<Long> taskIds);
}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventTaskTypeService.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventTaskTypeService.java
index c8ab278..450b603 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventTaskTypeService.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventTaskTypeService.java
@@ -10,4 +10,5 @@
List<PreventTaskType> getInfoByJobId(Long jobId);
+ List<PreventTaskType> getAllTaskTypeList();
}
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
index 7386a01..4736903 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportCheckRecordFromTaskServiceImpl.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportCheckRecordFromTaskServiceImpl.java
@@ -30,6 +30,11 @@
return preventCJReportCheckRecordFromTaskRepository.insertRecord(recordFromTasks);
}
+ @Override
+ public int insertRecordList(List<PreventCJReportCheckRecordFromTask> recordFromTaskList) {
+ return preventCJReportCheckRecordFromTaskRepository.insertRecordList(recordFromTaskList);
+ }
+
// /**
// * 任务记录-分页查询
// * */
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 03dcd4c..c1d689d 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
@@ -81,6 +81,11 @@
return preventRiskControlMeasureRepository.getPreventRiskControlMeasureByUuid(riskMeasureId);
}
+ @Override
+ public List<PreventRiskControlMeasure> getAllMeasureList() {
+ return preventRiskControlMeasureRepository.getAllMeasureList();
+ }
+
/**
* 检索需要上报的风险管控措施
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 e665956..6632df1 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
@@ -9,6 +9,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
@Service("PreventRiskDangerCheckLogService")
@@ -68,4 +70,12 @@
public int updateCheckLog(Long checkId, Long mobileCode) {
return preventRiskDangerCheckLogRepository.updateCheckLog(checkId, mobileCode);
}
+
+ @Override
+ public int updateTaskReportStatusByList(List<Long> taskIds) {
+ List<Long> ids = new ArrayList<>();
+ Byte reportStatus = 1;
+ Date reportTime = new Date();
+ return preventRiskDangerCheckLogRepository.updateTaskReportStatusByList(taskIds, reportStatus, reportTime);
+ }
}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventTaskTypeServiceImpl.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventTaskTypeServiceImpl.java
index 77685c4..ff4274c 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventTaskTypeServiceImpl.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventTaskTypeServiceImpl.java
@@ -25,4 +25,9 @@
return taskTypeRepository.getInfoByJobId(jobId);
}
+ @Override
+ public List<PreventTaskType> getAllTaskTypeList() {
+ return taskTypeRepository.getAllTaskTypeList();
+ }
+
}
\ No newline at end of file
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 52f7e32..bc6b887 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
@@ -144,4 +144,6 @@
User getUserByLoginName(String createBy);
User getUserByName(String createBy);
+
+ List<User> getAllUser();
}
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 30bceba..e1b5016 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
@@ -232,4 +232,6 @@
User getUserByLoginName(String createBy);
User getUserByName(String createBy);
+
+ List<User> getAllUser();
}
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 1ec3101..cae6761 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
@@ -576,4 +576,9 @@
public User getUserByName(String createBy) {
return userMapper.getUserByName(createBy);
}
+
+ @Override
+ public List<User> getAllUser() {
+ return userMapper.getAllUser();
+ }
}
diff --git a/src/main/java/com/ruoyi/project/system/user/test.java b/src/main/java/com/ruoyi/project/system/user/test.java
new file mode 100644
index 0000000..a14d992
--- /dev/null
+++ b/src/main/java/com/ruoyi/project/system/user/test.java
@@ -0,0 +1,21 @@
+package com.ruoyi.project.system.user;
+
+import com.ruoyi.framework.shiro.service.PasswordService;
+import org.apache.shiro.crypto.hash.Md5Hash;
+import org.springframework.beans.factory.annotation.Autowired;
+
+public class test {
+
+// @Autowired
+// private PasswordService passwordService;
+//
+// public static void main(String[] args) {
+//
+// String userName = "马文川";
+// String password = "Gkhy@c413";
+// String salt = "33402b";
+//
+// String s = new Md5Hash(userName + password + salt).toHex();
+// System.out.println(s);
+// }
+}
diff --git a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerLedgerController.java b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerLedgerController.java
index 8902ae7..0d131a8 100644
--- a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerLedgerController.java
+++ b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerLedgerController.java
@@ -251,7 +251,7 @@
// //隐患名称
// export.setDangerName(hcp.getDangerName());
//
-// //隐患描述 todo
+// //隐患描述
// export.setDangerDescription(hcp.getDangerDescription());
//
// //隐患级别
diff --git a/src/main/resources/mybatis/doublePrevention/PreventCJReportCheckRecordFromTaskMapper.xml b/src/main/resources/mybatis/doublePrevention/PreventCJReportCheckRecordFromTaskMapper.xml
index feab042..d5c69b1 100644
--- a/src/main/resources/mybatis/doublePrevention/PreventCJReportCheckRecordFromTaskMapper.xml
+++ b/src/main/resources/mybatis/doublePrevention/PreventCJReportCheckRecordFromTaskMapper.xml
@@ -64,4 +64,17 @@
</insert>
+ <insert id="insertRecordList">
+ insert into prevent_cj_report_check_record_from_task
+ (index_id, id, company_code, deleted, create_date, create_by, update_date, update_by,
+ report_status, report_time,data_source, check_task_id, check_status, check_time,
+ create_by_mobile, update_by_mobile, task_id, mobile_code, defend)
+ values
+ <foreach collection="list" item="record" separator=",">
+ (null, #{record.id}, #{record.companyCode}, #{record.deleted}, #{record.createDate}, #{record.createBy}, #{record.updateDate},#{record.updateBy},
+ #{record.reportStatus}, #{record.reportTime}, #{record.dataSource}, #{record.checkTaskId}, #{record.checkStatus}, #{record.checkTime},
+ #{record.createByMobile}, #{record.updateByMobile}, #{record.taskId}, #{record.mobileCode}, #{record.defend})
+ </foreach>
+ </insert>
+
</mapper>
diff --git a/src/main/resources/mybatis/doublePrevention/PreventRiskControlMeasureMapper.xml b/src/main/resources/mybatis/doublePrevention/PreventRiskControlMeasureMapper.xml
index 53cfb7a..59e17f2 100644
--- a/src/main/resources/mybatis/doublePrevention/PreventRiskControlMeasureMapper.xml
+++ b/src/main/resources/mybatis/doublePrevention/PreventRiskControlMeasureMapper.xml
@@ -187,6 +187,11 @@
select * from prevent_risk_control_measure
where delete_status = 0 and uuid = #{riskMeasureId}
</select>
+<!-- List<PreventRiskControlMeasure> getAllMeasureList();-->
+ <select id="getAllMeasureList" resultMap="BaseResultMap">
+ select * from prevent_risk_control_measure
+ where delete_status = 0
+ </select>
diff --git a/src/main/resources/mybatis/doublePrevention/PreventRiskDangerCheckLogMapper.xml b/src/main/resources/mybatis/doublePrevention/PreventRiskDangerCheckLogMapper.xml
index 02c5bff..c47216e 100644
--- a/src/main/resources/mybatis/doublePrevention/PreventRiskDangerCheckLogMapper.xml
+++ b/src/main/resources/mybatis/doublePrevention/PreventRiskDangerCheckLogMapper.xml
@@ -38,7 +38,7 @@
where report_switch = 0 and (update_report_data_time > report_time or report_time is null) and mobile_code is not null
<!-- where report_switch = 0 and (update_report_data_time > report_time or report_time is null) and mobile_code is not null and job_id = 47-->
order by update_report_data_time
- limit 15
+ limit 10
</select>
<!-- int updateEventReportStatus(HandlerReportParam handlerReportParam);-->
@@ -67,6 +67,17 @@
where check_id = #{checkId}
</update>
+<!-- int updateTaskReportStatusByList(List<Long> ids, Byte reportStatus, Date reportTime);-->
+ <update id="updateTaskReportStatusByList" >
+ update prevent_risk_danger_check_log set
+ report_status = #{reportStatus},
+ report_time = #{reportTime}
+ WHERE 1=1 and id in
+ <foreach collection="ids" item="id" index="index" open="(" close=")" separator=",">
+ #{id}
+ </foreach>
+ </update>
+
</mapper>
diff --git a/src/main/resources/mybatis/doublePrevention/PreventTaskTypeMapper.xml b/src/main/resources/mybatis/doublePrevention/PreventTaskTypeMapper.xml
index ec36086..71901c0 100644
--- a/src/main/resources/mybatis/doublePrevention/PreventTaskTypeMapper.xml
+++ b/src/main/resources/mybatis/doublePrevention/PreventTaskTypeMapper.xml
@@ -23,6 +23,10 @@
select * from prevent_task_type where delete_status = 0 and job_id = #{jobId}
</select>
+<!-- List<PreventTaskType> getAllTaskTypeList();-->
+ <select id="getAllTaskTypeList" resultMap="BaseResultMap">
+ select * from prevent_task_type where delete_status = 0
+ </select>
</mapper>
diff --git a/src/main/resources/mybatis/system/UserMapper.xml b/src/main/resources/mybatis/system/UserMapper.xml
index 72a822f..cfe6f30 100644
--- a/src/main/resources/mybatis/system/UserMapper.xml
+++ b/src/main/resources/mybatis/system/UserMapper.xml
@@ -290,4 +290,9 @@
<select id="getUserByName" parameterType="User" resultMap="UserResult">
select * from sys_user where login_name = #{createBy}
</select>
+<!-- List<User> getAllUser();-->
+ <select id="getAllUser" resultMap="UserResult">
+ select * from sys_user
+ where del_flag = 0 and status = 0
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.2