From 9015e720487b737743232b0b3aa464c2ac9e8d17 Mon Sep 17 00:00:00 2001
From: heheng <heheng@123456>
Date: 星期五, 15 十一月 2024 17:31:24 +0800
Subject: [PATCH] 修改请求地址
---
src/main/java/com/ruoyi/project/mobile/service/ApiHiddenDangerCheckService.java | 48 +++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 43 insertions(+), 5 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 24c379c..dc21e5c 100644
--- a/src/main/java/com/ruoyi/project/mobile/service/ApiHiddenDangerCheckService.java
+++ b/src/main/java/com/ruoyi/project/mobile/service/ApiHiddenDangerCheckService.java
@@ -7,7 +7,9 @@
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.security.ShiroUtils;
+import com.ruoyi.doublePrevention.entity.PreventRiskDangerInfo;
import com.ruoyi.doublePrevention.service.RiskService;
+import com.ruoyi.doublePrevention.service.baseService.PreventRiskDangerCheckAndMeasureService;
import com.ruoyi.doublePrevention.service.baseService.PreventRiskDangerConfirmLogService;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.project.mobile.domain.ApiRequestHeader;
@@ -47,6 +49,9 @@
@Autowired
IHiddenDangerCheckPointService hdcpService;//隐患检查点Service
+
+ @Autowired
+ private PreventRiskDangerCheckAndMeasureService riskDangerCheckAndMeasureService;//隐患检查点Service
@Autowired
IUserService userService;//用户Service
@@ -119,6 +124,14 @@
return ApiResult.success("传输hiddenDangerCheckType有误", new ArrayList<HiddenDangerCheck>());
}
List<HiddenDangerCheckPoint> resultList = hdcpService.selectHiddenDangerCheckPointList(hdcp);
+ for (HiddenDangerCheckPoint dangerCheckPoint : resultList) {
+ PreventRiskDangerInfo dangerInfo = riskService.getDangerInfoByDangerCheckPointId(dangerCheckPoint.getId());
+ if (ObjectUtils.isNotEmpty(dangerInfo)){
+ if (ObjectUtils.isNotEmpty(dangerInfo.getReportTime())){
+ dangerCheckPoint.setReportTime(dangerInfo.getReportTime());
+ }
+ }
+ }
return ApiResult.success("请求数据成功", resultList);
}
} catch (Exception e) {
@@ -171,6 +184,7 @@
/**
* 隐患核查--保存
*/
+ @Transactional
public ApiResult editDangerExamineSave(String str, ApiRequestHeader header) {
//验证userId,loginName,token,deviceType,deviceId,appType 是否一致
ApiRequestHeader requestHeader = getHeader(header);
@@ -180,7 +194,7 @@
try {
Map<String, String> map = new ObjectMapper().readValue(str, HashMap.class);
HiddenDangerCheckPoint hdcp = new ObjectMapper().readValue(str, HiddenDangerCheckPoint.class);
- // todo-2023 此处最终核查
+ // todo-2023
hdcp.setUpdateBy(header.loginName);
hdcp.setUpdateTime(DateUtils.getNowDate());
hdcp.setExamineCreateTime(DateUtils.getNowDate());//设置核查时间
@@ -220,6 +234,7 @@
/**
* 隐患整改--保存
*/
+ @Transactional
public ApiResult editDangerRectifySave(String str, ApiRequestHeader header) {
//验证userId,loginName,token,deviceType,deviceId,appType 是否一致
ApiRequestHeader requestHeader = getHeader(header);
@@ -252,6 +267,7 @@
/**
* 整改延期--保存
*/
+ @Transactional
public ApiResult rectifyTimeOutSave(String str, ApiRequestHeader header) {
//验证userId,loginName,token,deviceType,deviceId,appType 是否一致
ApiRequestHeader requestHeader = getHeader(header);
@@ -278,6 +294,7 @@
/**
* 隐患验收--保存
*/
+ @Transactional
public ApiResult editDangerAcceptSave(String str, ApiRequestHeader header) {
//验证userId,loginName,token,deviceType,deviceId,appType 是否一致
ApiRequestHeader requestHeader = getHeader(header);
@@ -285,18 +302,22 @@
return ApiResult.errorToken("验证userId,loginName,token,deviceType,deviceId,appType 不一致");
}
try {
+ new ObjectMapper().readValue(str, HiddenDangerCheckPoint.class);
HiddenDangerCheckPoint hdcp = new ObjectMapper().readValue(str, HiddenDangerCheckPoint.class);
hdcp.setUpdateBy(header.loginName);
hdcp.setUpdateTime(DateUtils.getNowDate());
+ if (ObjectUtils.isEmpty(hdcp.getAcceptCreateTime())){
+ throw new RuntimeException("请填写验收时间");
+ }
if (!StringUtils.isEmpty(hdcp.getAcceptResult())) {
//验收结果 (0不通过 打回上一级整改阶段 1通过)
if ("0".equals(hdcp.getAcceptResult())) {
- hdcp.setAcceptCreateTime(DateUtils.getNowDate());//设置验收时间
+ hdcp.setAcceptCreateTime(hdcp.getAcceptCreateTime());//设置验收时间
hdcp.setStage(TrHiddenDangerCheckConstants.DANGER_STAGE_PLAN_RECTIFY);//隐患整改阶段(数据进入到隐患整改阶段)
hdcp.setRectifyStatus(TrHiddenDangerCheckConstants.RECTIFY_STATUS_NOT_RECTIFY);//整改状态(未整改)
hdcp.setAcceptStatus(TrHiddenDangerCheckConstants.ACCEPT_STATUS_ALREADY_ACCEPT_NOT_PASS);//验收状态(验收未通过)
} else if ("1".equals(hdcp.getAcceptResult())) {
- hdcp.setAcceptCreateTime(DateUtils.getNowDate());//设置验收时间
+ hdcp.setAcceptCreateTime(hdcp.getAcceptCreateTime());//设置验收时间
hdcp.setAcceptStatus(TrHiddenDangerCheckConstants.ACCEPT_STATUS_ALREADY_ACCEPT_PASS);//验收状态(验收通过)
}
}
@@ -370,7 +391,7 @@
/**
- * 隐患计划执行中---设置为记录正常 // todo
+ * 隐患计划执行中---设置为记录正常
*/
public ApiResult editPointSetNormal(String str, ApiRequestHeader header) {
//验证userId,loginName,token,deviceType,deviceId,appType 是否一致
@@ -406,6 +427,12 @@
}
try {
HiddenDangerCheckPoint hdcp = new ObjectMapper().readValue(str, HiddenDangerCheckPoint.class);
+ if (ObjectUtils.isEmpty(hdcp.getCheckPerson())){
+ throw new RuntimeException("检查人不能为空");
+ }
+ if (ObjectUtils.isEmpty(hdcp.getFindTime())){
+ throw new RuntimeException("发现时间不能为空");
+ }
hdcp.setRegisterCreateTime(DateUtils.getNowDate());//设置隐患登记上报创建时间
hdcp.setRegisterUserId(Long.valueOf(header.userId));//设置隐患登记上报创建人ID
User user = userService.selectUserById(Long.valueOf(header.userId));
@@ -459,6 +486,10 @@
try {
HiddenDangerCheckPoint hdcp = new ObjectMapper().readValue(str, HiddenDangerCheckPoint.class);
HiddenDangerCheckPoint hiddenDangerCheckPoint = hdcpService.selectHiddenDangerCheckPointById(hdcp.getId());
+ PreventRiskDangerInfo dangerInfo = riskService.getDangerInfoByDangerCheckPointId(hiddenDangerCheckPoint.getId());
+ if (ObjectUtils.isNotEmpty(dangerInfo.getReportTime())){
+ hiddenDangerCheckPoint.setReportTime(dangerInfo.getReportTime());
+ }
return ApiResult.success("隐患查看--成功",hiddenDangerCheckPoint);
} catch (Exception e) {
return ApiResult.error("异常");
@@ -553,7 +584,14 @@
}
}
}
-
+ for (HiddenDangerCheckPoint dangerCheckPoint : resultList) {
+ PreventRiskDangerInfo dangerInfo = riskService.getDangerInfoByDangerCheckPointId(dangerCheckPoint.getId());
+ if (ObjectUtils.isNotEmpty(dangerInfo)){
+ if (ObjectUtils.isNotEmpty(dangerInfo.getReportTime())){
+ dangerCheckPoint.setReportTime(dangerInfo.getReportTime());
+ }
+ }
+ }
resultMap.put("resultList", resultList);
//companyId下总的数据统计
--
Gitblit v1.9.2