From e5c863dd36bb1fcfe5eee9fd0e83950f0230a37d Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 31 Jul 2023 10:55:55 +0800
Subject: [PATCH] uni-push 2.0
---
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/push/service/impl/PushServiceImpl.java | 30 +++++++++++++++++++++++-------
1 files changed, 23 insertions(+), 7 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 260511c..1488920 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
@@ -9,6 +9,7 @@
import lombok.AllArgsConstructor;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.redis.cache.BladeRedis;
+import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.Func;
import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate;
@@ -36,6 +37,8 @@
@Override
public Boolean pushMessageList(List<MessageRecord> messageRecordList) {
+ // 加入测试人员
+// addSendMsgTest(messageRecordList);
PushVO pushVO = new PushVO();
List<String> cIdList = new ArrayList<>();
//相同的消息推送给多用户
@@ -49,6 +52,22 @@
pushVO.setContent(messageRecordList.get(0).getContent());
return pushMessage(pushVO);
+ }
+
+ /**
+ * 新增测试信息
+ * @param messageRecordList
+ */
+ private void addSendMsgTest(List<MessageRecord> messageRecordList) {
+ MessageRecord messageRecord = new MessageRecord();
+ messageRecord.setRecipient("1654164141753593858");
+ messageRecord.setContent(messageRecordList.get(0).getContent());
+ messageRecord.setTheme(messageRecordList.get(0).getTheme());
+ messageRecord.setSender(AuthUtil.getUserId().toString());
+ messageRecord.setSource("智能告警");
+ messageRecord.setStatus(0);
+ // 加入集合
+ messageRecordList.add(messageRecord);
}
@Override
@@ -96,10 +115,10 @@
@Override
public Boolean geTuiPushMessage(PushVO pushVO) {
-
List<String> cIdList = new ArrayList<>();
cIdList.add(getClientIdByUserId(pushVO.getUserId()));
- return geTuiUtils.pushMsg(cIdList, pushVO.getTitle(), pushVO.getContent());
+// return geTuiUtils.pushMsg(cIdList, pushVO.getTitle(), pushVO.getContent());
+ return geTuiUtils.myPushMessage(cIdList, pushVO.getTitle(), pushVO.getContent());
}
/**
@@ -109,17 +128,14 @@
* @return
*/
public String getClientIdByUserId(String userId) {
-
if (Func.isEmpty(userId)) {
throw new ServiceException("请填写用户id!");
}
-
-
return bladeRedis.get(PUSH_CLIENT_ID + userId);
}
/**
- * 消息推送
+ * 2.0云函数消息推送
*
* @param pushVO
* @return
@@ -136,7 +152,7 @@
params.put("content", pushVO.getContent());
// UniCloudReturnRes uniCloudReturnRes = template.getForObject(UNI_CLOUD_PUSH_URL,UniCloudReturnRes.class,params);
UniCloudReturnRes uniCloudReturnRes = template.postForObject(UNI_CLOUD_PUSH_URL, params, UniCloudReturnRes.class);
- return uniCloudReturnRes.getErrCode().equals(0) ? true : false;
+ return uniCloudReturnRes.getErrCode().equals("0") ? true : false;
}
}
--
Gitblit v1.9.3