From 1dd5d8f8a616f5cf3caa7828d46989c7d3dcafc4 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Thu, 19 Oct 2023 15:01:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/push/controller/PushController.java | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/push/controller/PushController.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/push/controller/PushController.java
index 24ae508..66e4b85 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/push/controller/PushController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/push/controller/PushController.java
@@ -27,7 +27,7 @@
}
/**
- * 通过用户id推送消息，用于测试
+ * 通过用户id推送消息，用于2.0测试
* @param pushVO
* @return
*/
@@ -35,6 +35,19 @@
public R pushMessage(PushVO pushVO){
return R.data(pushService.pushMessageByUserId(pushVO));
}
+
+ /**
+ * 通过用户id推送消息，用于2.0测试（多人）
+ * @param pushVO
+ * @return
+ */
+ @PostMapping("/pushMessageByUserList")
+ public R pushMessageByUserList(PushVO pushVO){
+ return R.data(pushService.pushMessageByUserList(pushVO));
+ }
+
+
+
/**
* 清空redis中的缓存
@@ -56,4 +69,15 @@
return R.data(pushService.pushMessageOnLaunch(userId));
}
+ /**
+ * 集成的个推sdk消息推送
+ * @param pushVO
+ * @return
+ */
+ @PostMapping("/geTuiPushMessage")
+ public R geTuiPushMessage(PushVO pushVO){
+ return R.data(pushService.geTuiPushMessage(pushVO));
+ }
+
+
}
--
Gitblit v1.9.3