事件消息重复获取问题处理

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

@@ -535,27 +535,26 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
         }
         }
         // 删除所有成员
         // 删除所有成员
         imConversationMembersService.deleteByConversationId(param.getConversationId());
         imConversationMembersService.deleteByConversationId(param.getConversationId());
+        // 保存事件消息
+        ImMessage imMessage = new ImMessage();
+        Map<String, Object> content = new HashMap<>();
+        content.put("operator", currentClient.getClientId());
+        imMessage.setContent(JsonUtils.encodeJson(content));
+        //  保存消息至消息表
+        imMessage.setId(SnowflakeUtil.getId());
+        imMessage.setMsgType(MsgTypeEnum.CONVERSATION_DISBAND.getUriCode());
+        imMessage.setCreateTime(new Date());
+        imMessage.setFkAppid(currentClient.getFkAppid());
+        imMessage.setSender(currentClient.getId());
+        imMessage.setWithdraw(false);
+        imMessage.setEvent(true);
+        imMessage.setSystemFlag(false);
+        imMessage.setSendStatus(2);
+        imMessage.setFkConversationId(param.getConversationId());
+        imMessageService.save(imMessage);
         for (ImConversationMembers member : membersList) {
         for (ImConversationMembers member : membersList) {
             // 不关心事件是否发送成功
             // 不关心事件是否发送成功
             try {
             try {
-                // 保存事件消息
-                ImMessage imMessage = new ImMessage();
-                Map<String, Object> content = new HashMap<>();
-                content.put("operator", currentClient.getClientId());
-                content.put("passivityOperator", member.getClientId());
-                imMessage.setContent(JsonUtils.encodeJson(content));
-                //  保存消息至消息表
-                imMessage.setId(SnowflakeUtil.getId());
-                imMessage.setMsgType(MsgTypeEnum.CONVERSATION_DISBAND.getUriCode());
-                imMessage.setCreateTime(new Date());
-                imMessage.setFkAppid(currentClient.getFkAppid());
-                imMessage.setSender(currentClient.getId());
-                imMessage.setWithdraw(false);
-                imMessage.setEvent(true);
-                imMessage.setSystemFlag(false);
-                imMessage.setSendStatus(2);
-                imMessage.setFkConversationId(param.getConversationId());
-                imMessageService.save(imMessage);
                 // 给所有成员下发事件消息
                 // 给所有成员下发事件消息
                 ImClient imClientReceiver = imClientService.getOne(new QueryWrapper<ImClient>().lambda()
                 ImClient imClientReceiver = imClientService.getOne(new QueryWrapper<ImClient>().lambda()
                         .eq(ImClient::getFkAppid, currentClient.getFkAppid())
                         .eq(ImClient::getFkAppid, currentClient.getFkAppid())
@@ -795,30 +794,30 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
         if (membersList.isEmpty()) {
         if (membersList.isEmpty()) {
             throw new BusinessException("群聊成员列表为空");
             throw new BusinessException("群聊成员列表为空");
         }
         }
+
+        // 保存事件消息
+        ImMessage imMessage = new ImMessage();
+        Map<String, Object> content = new HashMap<>();
+        content.put("operator", currentClient.getClientId());
+        imMessage.setContent(JsonUtils.encodeJson(content));
+        //  保存消息至消息表
+        imMessage.setId(SnowflakeUtil.getId());
+        Integer msgType = MutedEnum.NO.getCode().equals(param.getMutedType()) ?
+                MsgTypeEnum.CONVERSATION_MUTED_CANCEL.getUriCode()
+                : MsgTypeEnum.CONVERSATION_MUTED.getUriCode();
+        imMessage.setMsgType(msgType);
+        imMessage.setCreateTime(new Date());
+        imMessage.setFkAppid(currentClient.getFkAppid());
+        imMessage.setSender(currentClient.getId());
+        imMessage.setWithdraw(false);
+        imMessage.setEvent(true);
+        imMessage.setSystemFlag(false);
+        imMessage.setSendStatus(2);
+        imMessage.setFkConversationId(param.getConversationId());
+        imMessageService.save(imMessage);
         for (ImConversationMembers member : membersList) {
         for (ImConversationMembers member : membersList) {
             // 不关心事件是否发送成功
             // 不关心事件是否发送成功
             try {
             try {
-                // 保存事件消息
-                ImMessage imMessage = new ImMessage();
-                Map<String, Object> content = new HashMap<>();
-                content.put("operator", currentClient.getClientId());
-                content.put("passivityOperator", member.getClientId());
-                imMessage.setContent(JsonUtils.encodeJson(content));
-                //  保存消息至消息表
-                imMessage.setId(SnowflakeUtil.getId());
-                Integer msgType = MutedEnum.NO.getCode().equals(param.getMutedType()) ?
-                        MsgTypeEnum.CONVERSATION_MUTED_CANCEL.getUriCode()
-                        : MsgTypeEnum.CONVERSATION_MUTED.getUriCode();
-                imMessage.setMsgType(msgType);
-                imMessage.setCreateTime(new Date());
-                imMessage.setFkAppid(currentClient.getFkAppid());
-                imMessage.setSender(currentClient.getId());
-                imMessage.setWithdraw(false);
-                imMessage.setEvent(true);
-                imMessage.setSystemFlag(false);
-                imMessage.setSendStatus(2);
-                imMessage.setFkConversationId(param.getConversationId());
-                imMessageService.save(imMessage);
                 // 给所有成员下发事件消息
                 // 给所有成员下发事件消息
                 ImClient imClientReceiver = imClientService.getOne(new QueryWrapper<ImClient>().lambda()
                 ImClient imClientReceiver = imClientService.getOne(new QueryWrapper<ImClient>().lambda()
                         .eq(ImClient::getFkAppid, currentClient.getFkAppid())
                         .eq(ImClient::getFkAppid, currentClient.getFkAppid())