From 46c129d5e59ed92f3d6a51e96bd5713372f3e0a1 Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期二, 12 九月 2023 10:33:01 +0800
Subject: [PATCH] 临时提交
---
src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerReportController.java | 9 +++++++++
src/main/java/com/ruoyi/project/mobile/service/ApiDangerReportService.java | 9 +++++++++
2 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/mobile/service/ApiDangerReportService.java b/src/main/java/com/ruoyi/project/mobile/service/ApiDangerReportService.java
index ae5d2e7..8cb38e3 100644
--- a/src/main/java/com/ruoyi/project/mobile/service/ApiDangerReportService.java
+++ b/src/main/java/com/ruoyi/project/mobile/service/ApiDangerReportService.java
@@ -6,6 +6,7 @@
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.security.ShiroUtils;
+import com.ruoyi.doublePrevention.service.baseService.PreventRiskDangerConfirmLogService;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
@@ -43,6 +44,9 @@
@Autowired
IUserService userService;//用户Service
+
+ @Autowired
+ private PreventRiskDangerConfirmLogService confirmLogService;
/**
* 获取隐患上报列表
@@ -196,6 +200,11 @@
}
hdcpService.updateHiddenDangerCheckPoint(hdcp);
+ int result = confirmLogService.saveConfirmLog(hdcp);
+ if (result < 1){
+ return ApiResult.error("操作失败");
+ }
+
hdcpService.getTaskCountTotal(Long.valueOf(header.userId));//查询未执行任务总数量并推送
return ApiResult.success("判定成功");
diff --git a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerReportController.java b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerReportController.java
index 96eab59..d1b446f 100644
--- a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerReportController.java
+++ b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerReportController.java
@@ -8,6 +8,7 @@
import com.ruoyi.doublePrevention.entity.PreventRiskDangerInfo;
import com.ruoyi.doublePrevention.entity.dto.resp.PreventRiskUnitCodeAndNameListQueryRespDTO;
import com.ruoyi.doublePrevention.service.RiskService;
+import com.ruoyi.doublePrevention.service.baseService.PreventRiskDangerConfirmLogService;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
@@ -57,6 +58,9 @@
@Autowired
private RiskService riskService;
+
+ @Autowired
+ private PreventRiskDangerConfirmLogService confirmLogService;
@GetMapping()
public String hiddenDangerCheck(ModelMap mmap) {
@@ -466,6 +470,11 @@
}
int i = hiddenDangerCheckPointService.updateHiddenDangerCheckPoint(hiddenDangerCheckPoint);
+ int result = confirmLogService.saveConfirmLog(hiddenDangerCheckPoint);
+ if (result < 1){
+ return AjaxResult.error("操作失败");
+ }
+
hiddenDangerCheckPointService.getTaskCountTotal(getSysUser().getUserId());//查询未执行任务总数量并推送
return toAjax(i);
--
Gitblit v1.9.2