From 73d5cb4c8b3def02dda3addb09469713cc878ba1 Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期二, 06 六月 2023 08:53:33 +0800
Subject: [PATCH] 临时提交
---
src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerExamineController.java | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerExamineController.java b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerExamineController.java
index c872946..122da57 100644
--- a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerExamineController.java
+++ b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerExamineController.java
@@ -5,6 +5,7 @@
import com.ruoyi.common.constant.TrHiddenDangerCheckConstants;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.security.ShiroUtils;
+import com.ruoyi.doublePrevention.service.RiskService;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
@@ -47,6 +48,10 @@
@Autowired
JpushService jpushService;
+
+
+ @Autowired
+ private RiskService riskService;
@GetMapping()
public String dangerExamine() {
@@ -142,10 +147,19 @@
hiddenDangerCheckPoint.setWhetherDanger(TrHiddenDangerCheckConstants.WHETHER_DANGER_NOT);//是否为隐患(正常)
}
}
+
int i = hiddenDangerCheckPointService.updateHiddenDangerCheckPoint(hiddenDangerCheckPoint);
if(hiddenDangerCheckPoint.getRectifyDeadlineTime()!=null) {
rectifyRemindJPush(hiddenDangerCheckPoint);
}
+
+ // todo-2022 此处插入附属表
+// HiddenDangerCheckPoint hiddenDangerCheckPointById = hiddenDangerCheckPointService.getHiddenDangerCheckPointById(hiddenDangerCheckPoint.getId());
+ int result = riskService.insertDangerInfo(hiddenDangerCheckPoint.getId(), hiddenDangerCheckPoint);
+ if (result< 1){
+ throw new RuntimeException("添加隐患附属信息失败");
+ }
+
hiddenDangerCheckPointService.getTaskCountTotal(getSysUser().getUserId());//查询未执行任务总数量并推送
return toAjax(i);
}
@@ -167,13 +181,8 @@
extrasMap.put("methodType", "goToRectify");
extrasMap.put("hiddenDangerCheckPoint", JSONObject.toJSONString(whole));
-
-
//大文本通知栏样式
jpushService.sendPushByAndroidBigText(title, content, 1, content, extrasMap, whole.getRectifyUserId().toString());
-
-
-
}
--
Gitblit v1.9.2