From 3ef558939b98101ef4911b5961542bc6dc03b654 Mon Sep 17 00:00:00 2001
From: lzh <liuzhanhong>
Date: Sat, 18 Mar 2023 00:12:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mallplus/unipush/UniPushService.java      | 38 ++++++++++++++++---
 1 file changed, 33 insertions(+), 5 deletions(-)

diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/unipush/UniPushService.java b/mallplus-admin/src/main/java/com/zscat/mallplus/unipush/UniPushService.java
index ca6ee2a..1207a87 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/unipush/UniPushService.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/unipush/UniPushService.java
@@ -12,6 +12,8 @@ import com.getui.push.v2.sdk.dto.req.message.PushMessage;
 import com.getui.push.v2.sdk.dto.req.message.android.GTNotification;
 import com.getui.push.v2.sdk.dto.res.TaskIdDTO;
 import com.zscat.mallplus.ums.entity.SysMessage;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
@@ -22,6 +24,8 @@ import java.util.Map;
 @Component
 public class UniPushService {
 
+    private static final Logger L = LoggerFactory.getLogger(UniPushService.class);
+
     // @Value("${unipush.appid:UBUIDJ8NQm50rGJsB6LYx1}")
     // private String appid;
 
@@ -206,15 +210,39 @@ public class UniPushService {
     private static String imgUrlwl = "http://mall.yyundong.com/wl.png";
 
     public void sendPush(SysMessage mess, List<String> cids) {
-        String code = mess.getCode();
-        if ("系统消息".equals(code)) {
-            sendTzMsg(mess);
-        } else {
-            sendUserMsg(mess, cids);
+        // String code = mess.getCode();
+        // if ("系统消息".equals(code)) {
+        //     sendTzMsg(mess);
+        // } else {
+        //     sendUserMsg(mess, cids);
+        // }
+
+        if (cids == null || cids.isEmpty())
+            return;
+
+        PushMessage pushMessage = createPushMessage(mess);
+        int size = cids.size();
+        for (int i = 0; i < size; i++) {
+            sendSingleMsg(pushMessage, cids.get(i), i);
         }
 
     }
 
+    private void sendSingleMsg(PushMessage pushMessage, String cid, int index) {
+        PushDTO<Audience> pushDTO = new PushDTO<Audience>();
+        pushDTO.setRequestId("" + System.currentTimeMillis() + index);
+        pushDTO.setPushMessage(pushMessage);
+        Audience audience = new Audience();
+        audience.addCid(cid);
+        pushDTO.setAudience(audience);
+        ApiResult<Map<String, Map<String, String>>> apiResult = pushApi.pushToSingleByCid(pushDTO);
+        if (apiResult.isSuccess()) {
+            System.out.println(apiResult.getData());
+        } else {
+            L.warn("推送信息失败：code:{}, msg: {}", apiResult.getCode(), apiResult.getMsg());
+        }
+    }
+
     private void sendUserMsg(SysMessage mess, List<String> cids) {
 
         if (cids == null || cids.isEmpty())