From 23707e9f7f9268316367feebe6149afd95266ffb Mon Sep 17 00:00:00 2001
From: 郑永安 <zyazyz250@sina.com>
Date: 星期三, 30 八月 2023 13:41:52 +0800
Subject: [PATCH] 修改根目录
---
src/main/java/com/ruoyi/project/mobile/service/ApiHiddenDangerCheckService.java | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 51 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/mobile/service/ApiHiddenDangerCheckService.java b/src/main/java/com/ruoyi/project/mobile/service/ApiHiddenDangerCheckService.java
index 8d108f0..dbc9a29 100644
--- a/src/main/java/com/ruoyi/project/mobile/service/ApiHiddenDangerCheckService.java
+++ b/src/main/java/com/ruoyi/project/mobile/service/ApiHiddenDangerCheckService.java
@@ -7,6 +7,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.RiskService;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.project.mobile.domain.ApiRequestHeader;
import com.ruoyi.project.mobile.domain.ApiResult;
@@ -19,6 +20,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.connection.ReactiveListCommands;
import org.springframework.stereotype.Service;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.GetMapping;
@@ -45,6 +47,9 @@
@Autowired
IUserService userService;//用户Service
+
+ @Autowired
+ private RiskService riskService;
/**
* 获取隐患列表
@@ -141,6 +146,14 @@
hdcpService.getTaskCountTotal(Long.valueOf(header.userId));//查询未执行任务总数量并推送
+ // todo-2022 此处插入附属表
+// HiddenDangerCheckPoint hiddenDangerCheckPointById = hiddenDangerCheckPointService.getHiddenDangerCheckPointById(hiddenDangerCheckPoint.getId());
+ int result = riskService.insertDangerInfo(hdcp.getId(), hdcp);
+ if (result< 1){
+ throw new RuntimeException("添加隐患附属信息失败");
+ }
+
+
return ApiResult.success("隐患核查保存成功");
} catch (Exception e) {
return ApiResult.error("异常");
@@ -168,7 +181,37 @@
hdcpService.getTaskCountTotal(Long.valueOf(header.userId));//查询未执行任务总数量并推送
+ // todo-2022 隐患信息附属表
+ int result = riskService.updateDangerInfoRectify(hdcp);
+ if (result < 1){
+ throw new RuntimeException("整改信息保存失败");
+ }
return ApiResult.success("隐患整改保存成功");
+ } catch (Exception e) {
+ return ApiResult.error("异常");
+ }
+ }
+
+ /**
+ * 整改延期--保存
+ */
+ public ApiResult rectifyTimeOutSave(String str, ApiRequestHeader header) {
+ //验证userId,loginName,token,deviceType,deviceId,appType 是否一致
+ ApiRequestHeader requestHeader = getHeader(header);
+ if (!(header.equals(requestHeader))) {
+ return ApiResult.errorToken("验证userId,loginName,token,deviceType,deviceId,appType 不一致");
+ }
+ try {
+ HiddenDangerCheckPoint hdcp = new ObjectMapper().readValue(str, HiddenDangerCheckPoint.class);
+ hdcp.setUpdateBy(header.loginName);
+ hdcp.setUpdateTime(DateUtils.getNowDate());
+
+ int result = hdcpService.rectifyTimeOut(hdcp.getId(), hdcp.getRectifyDeadlineTime());
+ if (result < 1) {
+ return ApiResult.error("延期失败");
+ }
+
+ return ApiResult.success("延期成功");
} catch (Exception e) {
return ApiResult.error("异常");
}
@@ -203,6 +246,12 @@
hdcpService.updateHiddenDangerCheckPoint(hdcp);
hdcpService.getTaskCountTotal(Long.valueOf(header.userId));//查询未执行任务总数量并推送
+
+ // todo-2022 验收通过,修改为已验收状态
+ int result = riskService.updateDangerInfoAccept(hdcp);
+ if (result < 1){
+ throw new RuntimeException("隐患验收信息保存失败");
+ }
return ApiResult.success("隐患验收保存成功");
} catch (Exception e) {
@@ -264,7 +313,7 @@
/**
- * 隐患计划执行中---设置为记录正常
+ * 隐患计划执行中---设置为记录正常 // todo
*/
public ApiResult editPointSetNormal(String str, ApiRequestHeader header) {
//验证userId,loginName,token,deviceType,deviceId,appType 是否一致
@@ -692,4 +741,5 @@
return map;
}
+
}
--
Gitblit v1.9.2