系统通知推送

core/src/main/java/com/wecloud/im/action/NormalChatAction.java

@@ -35,7 +35,10 @@ import com.wecloud.im.service.ImMessageService;
 import com.wecloud.im.ws.enums.MsgTypeEnum;
 import com.wecloud.im.ws.enums.MsgTypeEnum;
 import com.wecloud.im.ws.enums.WsResponseCmdEnum;
 import com.wecloud.im.ws.enums.WsResponseCmdEnum;
 import com.wecloud.im.ws.model.WsResponse;
 import com.wecloud.im.ws.model.WsResponse;
+import com.wecloud.im.ws.model.request.PushVO;
 import com.wecloud.im.ws.sender.ChannelSender;
 import com.wecloud.im.ws.sender.ChannelSender;
+import com.wecloud.pushserver.client.model.constant.MqConstant;
+import com.wecloud.pushserver.client.model.dto.PushDTO;
 import com.wecloud.utils.JsonUtils;
 import com.wecloud.utils.JsonUtils;
 import com.wecloud.utils.SnowflakeUtil;
 import com.wecloud.utils.SnowflakeUtil;
 import io.geekidea.springbootplus.framework.common.api.ApiCode;
 import io.geekidea.springbootplus.framework.common.api.ApiCode;
@@ -184,7 +187,7 @@ public class NormalChatAction {
         // 多线程处理消息下发
         // 多线程处理消息下发
         for (ImConversationMembers member : membersList) {
         for (ImConversationMembers member : membersList) {
             SendMsgThreadPool.SEND_MSG_THREAD_POOL_EXECUTOR.execute(() -> {
             SendMsgThreadPool.SEND_MSG_THREAD_POOL_EXECUTOR.execute(() -> {
-                this.sendMsgToMember(member, imClientSender, imMessageOnlineSend);
+                this.sendMsgToMember(imApplication, member, imClientSender, imMessageOnlineSend, data.getPush());
             });
             });
         }
         }
 
 
@@ -192,7 +195,7 @@ public class NormalChatAction {
         response(reqId, imMessageOnlineSend.getMsgId(), request.getSenderChannel());
         response(reqId, imMessageOnlineSend.getMsgId(), request.getSenderChannel());
     }
     }
 
 
-    private void sendMsgToMember(ImConversationMembers member, ImClient imClientSender, ImMessageOnlineSend imMessageOnlineSend) {
+    private void sendMsgToMember(ImApplication imApplication, ImConversationMembers member, ImClient imClientSender, ImMessageOnlineSend imMessageOnlineSend, PushVO push) {
         if (member.getFkClientId().equals(imClientSender.getId())) {
         if (member.getFkClientId().equals(imClientSender.getId())) {
             // 不给自己发
             // 不给自己发
             return;
             return;
@@ -200,13 +203,13 @@ public class NormalChatAction {
         // 在线用户直接发消息
         // 在线用户直接发消息
         Boolean sendSuccess = sendMsgForOnline(member.getFkClientId(), imMessageOnlineSend);
         Boolean sendSuccess = sendMsgForOnline(member.getFkClientId(), imMessageOnlineSend);
 
 
-//            if (!sendSuccess && !member.getDoNotDisturb()) {
-//                // 异步推送系统通知消息
-//                PushDTO pushDTO = mqSender.buildPushDto(data.getPush(), member.getFkClientId(), member.getClientId(), imApplication);
-//                if (pushDTO != null) {
-//                    mqSender.orderSend(MqConstant.Topic.IM_ORDER_MSG_TOPIC, MqConstant.Tag.IM_ORDER_MSG_TAG, pushDTO);
-//                }
-//            }
+        if (!sendSuccess && !member.getDoNotDisturb()) {
+            // 异步推送系统通知消息
+            PushDTO pushDTO = mqSender.buildPushDto(push, member.getFkClientId(), member.getClientId(), imApplication);
+            if (pushDTO != null) {
+                mqSender.orderSend(MqConstant.Topic.IM_ORDER_MSG_TOPIC, MqConstant.Tag.IM_ORDER_MSG_TAG, pushDTO);
+            }
+        }
     }
     }
 
 
     /**
     /**