From 81a6a662b5db806e0824f311a89993d853db9371 Mon Sep 17 00:00:00 2001
From: huangzhen <867127663@qq.com>
Date: 星期四, 13 十月 2022 16:15:46 +0800
Subject: [PATCH] 新增前端获取危险单元名称和编码、加入redis缓存
---
src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
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 60d35d7..31fa462 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java
@@ -974,8 +974,8 @@
* 插入检查点附属表
*/
@Override
- public void insertCheckAndMeasure(Long id, HiddenDangerCheckPoint hdcp) {
-
+ public int insertCheckAndMeasure(Long id, HiddenDangerCheckPoint hdcp) {
+ System.out.println("进入核查点保存方法");
PreventRiskDangerCheckAndMeasure checkAndMeasure = new PreventRiskDangerCheckAndMeasure();
//根据检查点信息，查询对应管控措施
@@ -983,23 +983,26 @@
if (checkUnit == null){
throw new RuntimeException("基础检查点不存在");
}
-
+ System.out.println("通过一次检验");
PreventRiskControlMeasure controlMeasure = riskControlMeasureService.getPreventRiskControlMeasureById(checkUnit.getControlMeasureId());
if (controlMeasure == null){
throw new RuntimeException("管控措施已经被删除");
}
-
+ System.out.println("通过二次检验");
//封装数据
checkAndMeasure.setCheckId(hdcp.getCheckId());
checkAndMeasure.setDangerCheckPointId(id);
checkAndMeasure.setBaseCheckPointId(hdcp.getCheckPointId());
checkAndMeasure.setControlMeasureId(controlMeasure.getId());
checkAndMeasure.setCheckContent(controlMeasure.getCheckContent());
- checkAndMeasure.setCheckResult(null);
-
+ checkAndMeasure.setCheckResult((byte) 4);
+ System.out.println("数据封装完成");
//写入核查任务检查点与管控措施信息
- preventRiskDangerCheckAndMeasureService.insertCheckAndMeasure(checkAndMeasure);
-
+ int result = preventRiskDangerCheckAndMeasureService.insertCheckAndMeasure(checkAndMeasure);
+ if (result <1){
+ return StatusEnum.EXEC_FAIL.getCode();
+ }
+ return StatusEnum.EXEC_SUCCESS.getCode();
}
/**
* todo-2022 填报时的操作
@@ -1262,6 +1265,9 @@
@Override
public List<PreventRiskUnitCodeAndNameListQueryRespDTO> listRiskUnitCodeAndName() {
List<PreventRiskList> riskLists = preventRiskListService.listRiskUnitCodeAndName();
+ if (riskLists == null){
+ return null;
+ }
List<PreventRiskUnitCodeAndNameListQueryRespDTO> listQueryRespDTOs= riskLists.stream().map((riskList)->{
PreventRiskUnitCodeAndNameListQueryRespDTO listQueryRespDTO = new PreventRiskUnitCodeAndNameListQueryRespDTO();
BeanUtils.copyProperties(riskList,listQueryRespDTO);
--
Gitblit v1.9.2