From 1e9bc06b7b189bdd11398cd6246965dfa91f451c Mon Sep 17 00:00:00 2001
From: "xie.bx" <Blue_Xie@epam.com>
Date: Wed, 23 Nov 2022 18:13:39 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E8=AF=95=E6=89=8B=E6=9C=BA=E7=AB=AF?=
 =?UTF-8?q?=E5=BD=95=E9=9F=B3=E5=A4=B1=E8=B4=A5=E7=9A=84=E5=8E=9F=E5=9B=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/GroupMessageServiceImpl.java |  6 ++++
 .../processor/GroupMessageProcessor.java      | 28 +++++++++----------
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/im-platform/src/main/java/com/bx/implatform/service/impl/GroupMessageServiceImpl.java b/im-platform/src/main/java/com/bx/implatform/service/impl/GroupMessageServiceImpl.java
index 2b5769c..d24c9df 100644
--- a/im-platform/src/main/java/com/bx/implatform/service/impl/GroupMessageServiceImpl.java
+++ b/im-platform/src/main/java/com/bx/implatform/service/impl/GroupMessageServiceImpl.java
@@ -74,6 +74,8 @@ public class GroupMessageServiceImpl extends ServiceImpl<GroupMessageMapper, Gro
         msg.setSendId(userId);
         msg.setSendTime(new Date());
         this.save(msg);
+        // 不用发给自己
+        userIds = userIds.stream().filter(id->userId!=id).collect(Collectors.toList());
         // 群发
         GroupMessageInfo  msgInfo = BeanUtils.copyProperties(msg, GroupMessageInfo.class);
         imClient.sendGroupMessage(userIds,msgInfo);
@@ -112,6 +114,8 @@ public class GroupMessageServiceImpl extends ServiceImpl<GroupMessageMapper, Gro
         this.updateById(msg);
         // 群发
         List<Long> userIds = groupMemberService.findUserIdsByGroupId(msg.getGroupId());
+        // 不用发给自己
+        userIds = userIds.stream().filter(uid->userId.equals(uid)).collect(Collectors.toList());
         GroupMessageInfo  msgInfo = BeanUtils.copyProperties(msg, GroupMessageInfo.class);
         msgInfo.setType(MessageType.TIP.code());
         String content = String.format("'%s'撤回了一条消息",member.getAliasName());
@@ -140,6 +144,7 @@ public class GroupMessageServiceImpl extends ServiceImpl<GroupMessageMapper, Gro
             QueryWrapper<GroupMessage> wrapper = new QueryWrapper();
             wrapper.lambda().eq(GroupMessage::getGroupId,member.getGroupId())
                     .gt(GroupMessage::getSendTime,member.getCreatedTime())
+                    .ne(GroupMessage::getSendId, userId)
                     .ne(GroupMessage::getStatus, MessageStatus.RECALL.code());
             if(maxReadedId!=null){
                 wrapper.lambda().gt(GroupMessage::getId,maxReadedId);
@@ -198,4 +203,5 @@ public class GroupMessageServiceImpl extends ServiceImpl<GroupMessageMapper, Gro
         return messageInfos;
     }
 
+
 }
diff --git a/im-server/src/main/java/com/bx/imserver/netty/processor/GroupMessageProcessor.java b/im-server/src/main/java/com/bx/imserver/netty/processor/GroupMessageProcessor.java
index b506551..2451779 100644
--- a/im-server/src/main/java/com/bx/imserver/netty/processor/GroupMessageProcessor.java
+++ b/im-server/src/main/java/com/bx/imserver/netty/processor/GroupMessageProcessor.java
@@ -34,21 +34,19 @@ public class GroupMessageProcessor extends  MessageProcessor<IMRecvInfo<GroupMes
             try {
                 ChannelHandlerContext channelCtx = UserChannelCtxMap.getChannelCtx(recvId);
                 if(channelCtx != null){
-                    // 自己发的消息不用推送
-                    if(recvId != messageInfo.getSendId()){
-                        // 推送消息到用户
-                        IMSendInfo sendInfo = new IMSendInfo();
-                        sendInfo.setCmd(IMCmdType.GROUP_MESSAGE.code());
-                        sendInfo.setData(messageInfo);
-                        channelCtx.channel().writeAndFlush(sendInfo);
-                        // 消息发送成功确认
-                        String key = RedisKey.IM_RESULT_GROUP_QUEUE;
-                        SendResult sendResult = new SendResult();
-                        sendResult.setRecvId(recvId);
-                        sendResult.setStatus(IMSendStatus.SUCCESS);
-                        sendResult.setMessageInfo(messageInfo);
-                        redisTemplate.opsForList().rightPush(key,sendResult);
-                    }
+                    // 推送消息到用户
+                    IMSendInfo sendInfo = new IMSendInfo();
+                    sendInfo.setCmd(IMCmdType.GROUP_MESSAGE.code());
+                    sendInfo.setData(messageInfo);
+                    channelCtx.channel().writeAndFlush(sendInfo);
+                    // 消息发送成功确认
+                    String key = RedisKey.IM_RESULT_GROUP_QUEUE;
+                    SendResult sendResult = new SendResult();
+                    sendResult.setRecvId(recvId);
+                    sendResult.setStatus(IMSendStatus.SUCCESS);
+                    sendResult.setMessageInfo(messageInfo);
+                    redisTemplate.opsForList().rightPush(key,sendResult);
+
                 }else {
                     // 消息发送失败确认
                     String key = RedisKey.IM_RESULT_GROUP_QUEUE;