From 7e7195766eb018b4ba00b2d0663f6dcb11adefc8 Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: Tue, 27 Sep 2022 09:01:38 +0800
Subject: [PATCH] 临时提交-目前改到隐患上报部分
---
src/main/java/com/ruoyi/doublePrevention/service/RiskService.java | 67 ++++++++++++++++++++++++++++++---
1 files changed, 61 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 ca0af3f..78c8ea1 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/RiskService.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/RiskService.java
@@ -2,13 +2,17 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.doublePrevention.entity.PreventRiskCheckUnit;
import com.ruoyi.doublePrevention.entity.PreventRiskControlMeasure;
import com.ruoyi.doublePrevention.entity.PreventRiskEvent;
+import com.ruoyi.doublePrevention.entity.PreventRiskJobAndMeasure;
import com.ruoyi.doublePrevention.entity.dto.req.*;
import com.ruoyi.doublePrevention.entity.dto.resp.*;
import com.ruoyi.doublePrevention.repository.param.PreventPointAndMeasureParams;
import com.ruoyi.doublePrevention.vo.ResultVO;
+import com.ruoyi.project.tr.HiddenDangerCheckJob.domain.HiddenDangerCheckJob;
+import com.ruoyi.project.tr.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;
@@ -18,7 +22,14 @@
* 为设施设备清单附属表添加uuid
* */
int insertRiskUnitUuid(Long id);
-
+ /**
+ * 修改风险清单附属表
+ */
+ int updateRiskUnit(Long riskListId);
+ /**
+ * 删除附属表信息
+ */
+ int deleteRiskUnit(String ids);
/**
* 风险事件-新增
*/
@@ -78,15 +89,59 @@
* 管控措施-分页查询
*/
ResultVO<List<PreventRiskControlMeasurePageQueryRespDTO>> getRiskControlMeasurePage(PreventRiskControlMeasureQueryReqDTO measureQueryReqDTO);
-
+ /**
+ * 查询管控措施 by 基础排查清单ID
+ */
+ List<PreventRiskControlMeasure> getRiskControlMeasureByRiskId(Long riskListId);
/**
* 保存原检查点与管控措施的对应关系
*/
int insertPointAndMeasure(PreventPointAndMeasureParams pointAndMeasureParams);
+ /**
+ * 删除原检查点与管控措施的对应关系
+ */
+ int deletePointAndMeasure(String ids);
+ /**
+ * 保存job管控措施的附属表
+ */
+ int insertJobAndMeasure(Long jobId);
+ /**
+ * 修改job管控措施的附属表
+ */
+ int updateJobAndMeasure(HiddenDangerCheckJob hiddenDangerCheckJob);
+ /**
+ * 删除job管控措施的附属表
+ */
+ int deleteJobAndMeasure(String ids);
+ /**
+ * 查询Job与措施
+ */
+ PreventRiskJobAndMeasure getJobAndMeasure(Long jobId);
+ /**
+ * 定时生成排查任务记录时，
+ * 插入排查记录附属表
+ */
+ int insertDangerCheckLog(Long checkId, HiddenDangerCheck hdc);
+ /**
+ * 定时生成排查任务记录时，
+ * 插入检查点附属表
+ */
+ void insertCheckAndMeasure(Long id, HiddenDangerCheckPoint hdcp);
+ /**
+ * 删除定时核查任务
+ * */
+ int deleteDangerCheck(String ids);
/**
- * @description 根据原检查点查询 原检查点与管控措施对应记录
+ * 新增隐患上报
+ * */
+ int insertDangerInfo(Long id, HiddenDangerCheckPoint hdcp);
+ /**
+ * 修改隐患上报
+ * */
+ int updateDangerInfo(HiddenDangerCheckPoint hiddenDangerCheckPoint);
+ /**
+ * 删除隐患上报
*/
- PreventRiskCheckUnit getRiskUnitByBaseCheckPointId(Long checkPointId);
-
+ int deleteDangerInfo(Long id);
}
--
Gitblit v1.9.2