From aa2051a2327c079105110f5424f3a44ffaa0c7bb Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期五, 25 八月 2023 10:11:08 +0800
Subject: [PATCH] 延期整改
---
src/main/java/com/ruoyi/project/mobile/service/ApiDangerScheduleService.java | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 deletions(-)
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 16a6aad..2f9b2f3 100644
--- a/src/main/java/com/ruoyi/project/mobile/service/ApiDangerScheduleService.java
+++ b/src/main/java/com/ruoyi/project/mobile/service/ApiDangerScheduleService.java
@@ -7,7 +7,10 @@
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.security.ShiroUtils;
+import com.ruoyi.doublePrevention.entity.PreventRiskDangerCheckAndMeasure;
+import com.ruoyi.doublePrevention.entity.PreventRiskDangerCheckLog;
import com.ruoyi.doublePrevention.service.RiskService;
+import com.ruoyi.doublePrevention.service.baseService.PreventRiskDangerCheckAndMeasureService;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.project.mobile.domain.ApiRequestHeader;
import com.ruoyi.project.mobile.domain.ApiResult;
@@ -22,6 +25,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
import java.util.ArrayList;
import java.util.HashMap;
@@ -46,6 +50,8 @@
@Autowired
private RiskService riskService;
+ @Autowired
+ private PreventRiskDangerCheckAndMeasureService preventRiskDangerCheckAndMeasureService;
/**
* 获取定时任务隐患列表
*
@@ -97,7 +103,7 @@
/**
- * 定时隐患排查保存 -- todo
+ * 定时隐患排查保存
*/
public ApiResult editDangerScheduleSave(String str, ApiRequestHeader header) {
//验证userId,loginName,token,deviceType,deviceId,appType 是否一致
@@ -137,8 +143,6 @@
}
});
-
-
hiddenDangerCheckService.updateHiddenDangerCheck(hiddenDangerCheck);
hdcpService.getTaskCountTotal(Long.valueOf(header.userId));//查询未执行任务总数量并推送
@@ -169,6 +173,12 @@
hdcp.setScheduleCheckStatus(TrHiddenDangerCheckConstants.CHECK_STATUS_ALREADY_CHECK);//排查状态(已排查)
hdcpService.updateHiddenDangerCheckPoint(hdcp);
+ PreventRiskDangerCheckAndMeasure dangerCheckPointInfo = preventRiskDangerCheckAndMeasureService.getByDangerCheckPointId(hdcp.getId());
+ int result = riskService.updateCheckLog(dangerCheckPointInfo.getCheckId(), hdcp);
+ if (result < 1){
+ return ApiResult.error("隐患排查记录附属表：写入手机识别码错误");
+ }
+
hdcpService.getTaskCountTotal(Long.valueOf(header.userId));//查询未执行任务总数量并推送
return ApiResult.success("定时隐患排查--设置为正常--成功");
@@ -181,7 +191,6 @@
/**
* 定时隐患排查---隐患登记
- * todo-2022 手机端-暂时未改动
*/
@Transactional
public ApiResult editPointScheduleDangerRegisterSave(String str, ApiRequestHeader header) {
@@ -204,7 +213,6 @@
hdcp.setStage(TrHiddenDangerCheckConstants.DANGER_STAGE_PLAN_EXAMINE);//隐患核查阶段(数据进入到隐患核查阶段)
hdcp.setDangerSources(TrHiddenDangerCheckConstants.DANGER_SOURCES_SCHEDULE_PRODUCE); //隐患来源(定时器任务生成)
-
HiddenDangerCheckPoint queryExist = new HiddenDangerCheckPoint();
queryExist.setWhetherDanger(TrHiddenDangerCheckConstants.WHETHER_DANGER_YES);//是否为隐患(是隐患)
queryExist.setCheckPointId(hdcp.getCheckPointId());
@@ -212,7 +220,7 @@
/**
* 本次查询结果 ：如果未上报过隐患，必定为空
- * ？同一个检查任务，同一个排查点，可能多次上报隐患。
+ * 同一个检查任务，同一个排查点，可能多次上报隐患。
* 本次查询未用到id,导致数据不唯一
* */
List<HiddenDangerCheckPoint> queryExistList = hdcpService.selectHiddenDangerCheckPointList(queryExist);
@@ -230,7 +238,6 @@
throw new RuntimeException("添加隐患附属信息失败");
}
- // todo-2022 此处插入附属表
//获取Id返回值
hdcp.getId();
int result = riskService.insertDangerInfo(hdcp.getId(), hdcp);
@@ -238,12 +245,15 @@
throw new RuntimeException("添加隐患附属信息失败");
}
+ PreventRiskDangerCheckAndMeasure dangerCheckPointInfo = preventRiskDangerCheckAndMeasureService.getByDangerCheckPointId(hdcp.getId());
+ riskService.updateCheckLog(dangerCheckPointInfo.getCheckId(), hdcp);
+
}else{
hdcp.setUpdateBy(user.getLoginName());
hdcp.setUpdateTime(DateUtils.getNowDate());
i = hdcpService.updateHiddenDangerCheckPoint(hdcp);
- // todo-2022 此处修改附属表,注释：
+ // todo-2022 此处修改附属表
// int result = riskService.updateDangerInfo(hdcp);
// if (result < 1){
// throw new RuntimeException("修改失败");
@@ -252,6 +262,9 @@
if (result< 1){
throw new RuntimeException("添加隐患附属信息失败");
}
+
+ PreventRiskDangerCheckAndMeasure dangerCheckPointInfo = preventRiskDangerCheckAndMeasureService.getByDangerCheckPointId(hdcp.getId());
+ riskService.updateCheckLog(dangerCheckPointInfo.getCheckId(), hdcp);
}
hdcpService.getTaskCountTotal(Long.valueOf(header.userId));//查询未执行任务总数量并推送
--
Gitblit v1.9.2