机器人消息推送

core/src/main/java/com/wecloud/im/service/impl/ImMessageServiceImpl.java

@@ -643,10 +643,11 @@ public class ImMessageServiceImpl extends BaseServiceImpl<ImMessageMapper, ImMes
                     continue;
                     continue;
                 }
                 }
                 // 在线用户直接发消息
                 // 在线用户直接发消息
-                sendMsgForOnline(members.getFkClientId(), imMessageOnlineSend);
-
-                // 离线消息推送
-                pushMsgToOfflineMembers(application, members, param.getPushContent(), param.getPushExt());
+                Boolean sendResult = sendMsgForOnline(members.getFkClientId(), imMessageOnlineSend);
+                if (!sendResult) {
+                    // 离线消息推送
+                    pushMsgToOfflineMembers(application, members, param.getPushContent(), param.getPushExt());
+                }
             }
             }
         }
         }
 
 
@@ -783,12 +784,12 @@ public class ImMessageServiceImpl extends BaseServiceImpl<ImMessageMapper, ImMes
                 // 入库 保存收件箱
                 // 入库 保存收件箱
                 saveImInbox(application, conversation.getId(), imMessageOnlineSend.getMsgId(),
                 saveImInbox(application, conversation.getId(), imMessageOnlineSend.getMsgId(),
                         members, SnowflakeUtil.getId());
                         members, SnowflakeUtil.getId());
-
                 // 在线用户直接发消息
                 // 在线用户直接发消息
-                sendMsgForOnline(members.getFkClientId(), imMessageOnlineSend);
-
-                // 离线消息推送
-                pushMsgToOfflineMembers(application, members, param.getPushContent(), param.getPushExt());
+                Boolean sendResult = sendMsgForOnline(members.getFkClientId(), imMessageOnlineSend);
+                if (!sendResult) {
+                    // 离线消息推送
+                    pushMsgToOfflineMembers(application, members, param.getPushContent(), param.getPushExt());
+                }
             }
             }
 
 
         });
         });
@@ -886,10 +887,11 @@ public class ImMessageServiceImpl extends BaseServiceImpl<ImMessageMapper, ImMes
                         members, SnowflakeUtil.getId());
                         members, SnowflakeUtil.getId());
 
 
                 // 在线用户直接发消息
                 // 在线用户直接发消息
-                sendMsgForOnline(members.getFkClientId(), imMessageOnlineSend);
-
-                // 离线消息推送
-                pushMsgToOfflineMembers(application, members, param.getPushContent(), param.getPushExt());
+                Boolean sendResult = sendMsgForOnline(members.getFkClientId(), imMessageOnlineSend);
+                if (!sendResult) {
+                    // 离线消息推送
+                    pushMsgToOfflineMembers(application, members, param.getPushContent(), param.getPushExt());
+                }
             }
             }
 
 
         });
         });
@@ -1117,7 +1119,7 @@ public class ImMessageServiceImpl extends BaseServiceImpl<ImMessageMapper, ImMes
      * @param receiverClientId
      * @param receiverClientId
      * @param imMessageOnlineSend
      * @param imMessageOnlineSend
      */
      */
-    private void sendMsgForOnline(Long receiverClientId, ImMessageOnlineSend imMessageOnlineSend) {
+    private Boolean sendMsgForOnline(Long receiverClientId, ImMessageOnlineSend imMessageOnlineSend) {
         //  封装要推给接收方的消息
         //  封装要推给接收方的消息
         WsResponse<ImMessageOnlineSend> responseModel = new WsResponse<>();
         WsResponse<ImMessageOnlineSend> responseModel = new WsResponse<>();
         responseModel.setCmd(WsResponseCmdEnum.ONLINE_MSG.getCmdCode());
         responseModel.setCmd(WsResponseCmdEnum.ONLINE_MSG.getCmdCode());
@@ -1126,7 +1128,7 @@ public class ImMessageServiceImpl extends BaseServiceImpl<ImMessageMapper, ImMes
         responseModel.setMsg(result.getMessage());
         responseModel.setMsg(result.getMessage());
         responseModel.setData(imMessageOnlineSend);
         responseModel.setData(imMessageOnlineSend);
         responseModel.setReqId(null);
         responseModel.setReqId(null);
-        channelSender.sendMsg(responseModel, receiverClientId);
+        return channelSender.sendMsg(responseModel, receiverClientId);
     }
     }
 
 
     /**
     /**
@@ -1141,6 +1143,9 @@ public class ImMessageServiceImpl extends BaseServiceImpl<ImMessageMapper, ImMes
      */
      */
     private void pushMsgToOfflineMembers(ImApplication application, ImConversationMembers members,
     private void pushMsgToOfflineMembers(ImApplication application, ImConversationMembers members,
                                          String pushContent, PushExtParam pushExt) {
                                          String pushContent, PushExtParam pushExt) {
+        if (members.getDoNotDisturb()) {
+            return;
+        }
         // 不是静默推送
         // 不是静默推送
         PushVO pushVO = new PushVO();
         PushVO pushVO = new PushVO();
         pushVO.setData(JSONObject.parseObject(pushContent, HashMap.class));
         pushVO.setData(JSONObject.parseObject(pushContent, HashMap.class));