From 56c84cd7fb04407536eb0135162313029828a81f Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期一, 11 十二月 2023 10:14:41 +0800
Subject: [PATCH] 暂时提交

---
 src/main/java/com/ruoyi/project/mobile/service/ApiDangerScheduleService.java |   55 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 52 insertions(+), 3 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 d2876cf..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,6 +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;
@@ -20,6 +24,8 @@
 import org.slf4j.LoggerFactory;
 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;
@@ -41,6 +47,11 @@
     @Autowired
     IUserService userService;//用户Service
 
+    @Autowired
+    private RiskService riskService;
+
+    @Autowired
+    private PreventRiskDangerCheckAndMeasureService preventRiskDangerCheckAndMeasureService;
     /**
      * 获取定时任务隐患列表
      *
@@ -132,8 +143,6 @@
                 }
             });
 
-
-
             hiddenDangerCheckService.updateHiddenDangerCheck(hiddenDangerCheck);
 
             hdcpService.getTaskCountTotal(Long.valueOf(header.userId));//查询未执行任务总数量并推送
@@ -164,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("定时隐患排查--设置为正常--成功");
@@ -177,6 +192,7 @@
     /**
      * 定时隐患排查---隐患登记
      */
+    @Transactional
     public ApiResult editPointScheduleDangerRegisterSave(String str, ApiRequestHeader header) {
         //验证userId,loginName,token,deviceType,deviceId,appType 是否一致
         ApiRequestHeader requestHeader = getHeader(header);
@@ -197,13 +213,19 @@
             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());
             queryExist.setCheckId(hdcp.getCheckId());
+
+            /**
+             * 本次查询结果 :如果未上报过隐患,必定为空
+             *      同一个检查任务,同一个排查点,可能多次上报隐患。
+             *      本次查询未用到id,导致数据不唯一
+             * */
             List<HiddenDangerCheckPoint> queryExistList =  hdcpService.selectHiddenDangerCheckPointList(queryExist);
             int i=0;
+            //如果隐患信息已经存在,就新插入一条;如果不存在,就修改隐患信息
             if(queryExistList.size()>0){
                 hdcp.setId(null);
                 hdcp.setCheckTime(DateUtils.getNowDate());
@@ -212,10 +234,37 @@
 
                 hdcp.setCompanyId(user.getCompanyId());
                 i = hdcpService.insertHiddenDangerCheckPoint(hdcp);
+                if (i< 1){
+                    throw new RuntimeException("添加隐患附属信息失败");
+                }
+
+                //获取Id返回值
+                hdcp.getId();
+                int result = riskService.insertDangerInfo(hdcp.getId(), hdcp);
+                if (result< 1){
+                    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 此处修改附属表
+//                int result = riskService.updateDangerInfo(hdcp);
+//                if (result < 1){
+//                    throw new RuntimeException("修改失败");
+//                }
+                int result = riskService.insertDangerInfo(hdcp.getId(), hdcp);
+                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