From 81a6a662b5db806e0824f311a89993d853db9371 Mon Sep 17 00:00:00 2001
From: huangzhen <867127663@qq.com>
Date: Thu, 13 Oct 2022 16:15:46 +0800
Subject: [PATCH] 新增前端获取危险单元名称和编码、加入redis缓存
---
src/main/java/com/ruoyi/doublePrevention/service/RiskService.java | 31 +++++++++++++++++++++++++------
1 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/RiskService.java b/src/main/java/com/ruoyi/doublePrevention/service/RiskService.java
index 78c8ea1..54df987 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/RiskService.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/RiskService.java
@@ -1,7 +1,5 @@
package com.ruoyi.doublePrevention.service;
-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.entity.PreventRiskEvent;
import com.ruoyi.doublePrevention.entity.PreventRiskJobAndMeasure;
@@ -10,10 +8,8 @@
import com.ruoyi.doublePrevention.repository.param.PreventPointAndMeasureParams;
import com.ruoyi.doublePrevention.vo.ResultVO;
import com.ruoyi.project.tr.HiddenDangerCheckJob.domain.HiddenDangerCheckJob;
-import com.ruoyi.project.tr.baseCheckPoint.domain.BaseCheckPoint;
import com.ruoyi.project.tr.hiddenDangerCheck.domain.HiddenDangerCheck;
import com.ruoyi.project.tr.hiddenDangerCheckPoint.domain.HiddenDangerCheckPoint;
-import com.ruoyi.project.tr.riskList.domain.RiskList;
import java.util.List;
@@ -104,7 +100,7 @@
/**
* 保存job管控措施的附属表
*/
- int insertJobAndMeasure(Long jobId);
+ int insertJobAndMeasure(Long jobId, HiddenDangerCheckJob hiddenDangerCheckJob);
/**
* 修改job管控措施的附属表
*/
@@ -126,7 +122,7 @@
* 定时生成排查任务记录时，
* 插入检查点附属表
*/
- void insertCheckAndMeasure(Long id, HiddenDangerCheckPoint hdcp);
+ int insertCheckAndMeasure(Long id, HiddenDangerCheckPoint hdcp);
/**
* 删除定时核查任务
* */
@@ -144,4 +140,27 @@
* 删除隐患上报
*/
int deleteDangerInfo(Long id);
+
+ /**
+ * 隐患判定，如果是隐患，修改为整改中
+ */
+ int updateDangerInfoJudge(HiddenDangerCheckPoint hiddenDangerCheckPoint);
+ /**
+ * 隐患整改信息 - 修改
+ */
+ int updateDangerInfoRectify(HiddenDangerCheckPoint hiddenDangerCheckPoint);
+ /**
+ * 隐患验收 - 保存验收信息
+ */
+ int updateDangerInfoAccept(HiddenDangerCheckPoint hiddenDangerCheckPoint);
+// /**
+// * 全流程隐患上报-附属表信息插入
+// * */
+// int insertAllDangerInfo(Long id, HiddenDangerCheckPoint hdcp);
+
+ /**
+ * @description 获取所有的风险分析单元的编码和姓名
+ */
+ List<PreventRiskUnitCodeAndNameListQueryRespDTO> listRiskUnitCodeAndName();
+
}
--
Gitblit v1.9.2