From 7e8d51b6a2d2892c8eca2c8cefd91f7d1b6f8f40 Mon Sep 17 00:00:00 2001 From: 16639036659 <577530412@qq.com> Date: 星期二, 11 十月 2022 09:33:29 +0800 Subject: [PATCH] 隐患上报,已经测过 --- src/main/java/com/ruoyi/project/mobile/service/ApiDangerScheduleService.java | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 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..95c1949 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,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; @@ -20,6 +21,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.HashMap; @@ -40,6 +42,9 @@ @Autowired IUserService userService;//用户Service + + @Autowired + private RiskService riskService; /** * 获取定时任务隐患列表 @@ -176,7 +181,9 @@ /** * 定时隐患排查---隐患登记 + * todo-2022 手机端-暂时未改动 */ + @Transactional public ApiResult editPointScheduleDangerRegisterSave(String str, ApiRequestHeader header) { //验证userId,loginName,token,deviceType,deviceId,appType 是否一致 ApiRequestHeader requestHeader = getHeader(header); @@ -212,10 +219,25 @@ hdcp.setCompanyId(user.getCompanyId()); i = hdcpService.insertHiddenDangerCheckPoint(hdcp); + + // todo-2022 此处插入附属表 + //获取Id返回值 + hdcp.getId(); + int result = riskService.insertDangerInfo(hdcp.getId(), hdcp); + if (result< 1){ + throw new RuntimeException("添加隐患附属信息失败"); + } + }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("修改失败"); + } } hdcpService.getTaskCountTotal(Long.valueOf(header.userId));//查询未执行任务总数量并推送 -- Gitblit v1.9.2