From 93c783e6ddf2731eab9cf264a7882632c8ce955f Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 10 Jul 2023 17:30:50 +0800
Subject: [PATCH] 初次超汛限告警新增站内信信息发送
---
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/NoticeHandle.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/NoticeHandle.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/NoticeHandle.java
index 67c50b5..1749d56 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/NoticeHandle.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/NoticeHandle.java
@@ -19,12 +19,15 @@
import cn.gistack.sm.sjztmd.feign.IAttResManagePersonClient;
import cn.gistack.sm.sjztmd.vo.PersonVO;
import cn.gistack.system.feign.ISysClient;
+import cn.gistack.system.user.entity.User;
+import cn.gistack.system.user.feign.IUserClient;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.nacos.shaded.com.google.gson.JsonObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.api.R;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
@@ -58,6 +61,9 @@
@Autowired
private IMessageClient messageClient;
+ @Autowired
+ private IUserClient userClient;
+
/**
@@ -81,6 +87,7 @@
SmsTemplate smsTemplate = smsTemplateService.getOne(new QueryWrapper<SmsTemplate>().eq("template_id",templateId).eq("is_deleted",0));
if (null != smsTemplate) {
SmsRequestTemplate smsRequestTemplate = new SmsRequestTemplate();
+ smsRequestTemplate.setAlarmRule(alarmRule);
// 设置模板信息
smsRequestTemplate.setSmsTemplate(smsTemplate);
// 解析模板并设置 title
@@ -454,7 +461,7 @@
messageRecord.setTheme(alarmRule.getRuleName());
messageRecord.setSender(AuthUtil.getUserId().toString());
messageRecord.setSource("智能告警");
- messageRecord.setStatus(2);
+ messageRecord.setStatus(0);
// 设置告警记录信息
AlarmRecordDetail alarmRecordDetail = new AlarmRecordDetail();
@@ -490,7 +497,9 @@
messageRecordList.add(messageRecord);
}
// 保存告警记录详情信息
- saveMessageRecord(messageRecordList);
+ if (smsRequestTemplate.getIsSendStation()) {
+ saveMessageRecord(messageRecordList);
+ }
Map<String, Object> map = new HashMap<>(2);
// 返回
return map;
@@ -501,6 +510,12 @@
* @param messageRecordList
*/
public void saveMessageRecord(List<MessageRecord> messageRecordList) {
+ // 遍历，查询对应的用户id
+ for (MessageRecord messageRecord : messageRecordList) {
+ // 通过手机号获取用户id信息
+ R<List<User>> listR = userClient.userInfoByPhone("000000", messageRecord.getRecipient());
+ messageRecord.setRecipient(listR.getData().get(0).getId().toString());
+ }
// 保存记录
messageClient.saveMessageRecord(messageRecordList);
// 发起通知
--
Gitblit v1.9.3