From 1b3180c31750f0a22840ec56df03d7fa59a57a4e Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Wed, 11 Oct 2023 23:28:57 +0800
Subject: [PATCH] unipush 推送告警信息修改，告警内容读取修改
---
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/push/service/impl/PushServiceImpl.java | 38 +++++++++++++++++---------------------
1 files changed, 17 insertions(+), 21 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/push/service/impl/PushServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/push/service/impl/PushServiceImpl.java
index 33d26e6..9110057 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/push/service/impl/PushServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/push/service/impl/PushServiceImpl.java
@@ -15,6 +15,7 @@
import org.springframework.web.client.RestTemplate;
import java.util.*;
+import java.util.concurrent.atomic.AtomicReference;
@Service
@AllArgsConstructor
@@ -37,32 +38,27 @@
// 加入测试人员
addSendMsgTest(messageRecordList);
List<String> cIdList = new ArrayList<>();
+ AtomicReference<Boolean> push = new AtomicReference<>(false);
//相同的消息推送给多用户
messageRecordList.forEach(messageRecord -> {
//获取用户cId
String clientId = getClientIdByUserId(messageRecord.getRecipient());
- cIdList.add(clientId);
+ if (null!=clientId && !clientId.equals("")) {
+ cIdList.add(clientId);
+ PushVO pushVO = new PushVO();
+ pushVO.setCIds(cIdList);
+ pushVO.setTitle(messageRecord.getTheme());
+ pushVO.setContent(messageRecord.getContent());
+
+ HashMap<String, Object> payload = new HashMap<>();
+ payload.put("title",messageRecord.getTheme());
+ payload.put("content", messageRecord.getContent());
+ payload.put("payload", "test");
+ pushVO.setPayload(payload);
+ push.set(pushMessage(pushVO));
+ }
});
-
- //uni-push 一次推送最多500名用户，所以分批推送
- List<List<String>> groupList = groupListByQuantity(cIdList, 400);
- Boolean push = false;
- for(List<String> cids :groupList){
- PushVO pushVO = new PushVO();
-
- pushVO.setCIds(cids);
- pushVO.setTitle(messageRecordList.get(0).getTheme());
- pushVO.setContent(messageRecordList.get(0).getContent());
-
- HashMap<String, Object> payload = new HashMap<>();
- payload.put("title", messageRecordList.get(0).getTheme());
- payload.put("content", messageRecordList.get(0).getContent());
- payload.put("payload", "test");
- pushVO.setPayload(payload);
- push = pushMessage(pushVO);
- }
-
- return push;
+ return push.get();
}
/**
--
Gitblit v1.9.3