Skip to content

W
wecloud_im_server
Commit cf23f918 by Future
Options

单人消息推送是否包含自己调整

parent ac0fdde9
Showing with 10 additions and 8 deletions
core/src/main/java/com/wecloud/im/service/impl/ImMessageServiceImpl.java
...@@ -761,7 +761,7 @@ public class ImMessageServiceImpl extends BaseServiceImpl<ImMessageMapper, ImMes ...@@ -761,7 +761,7 @@ public class ImMessageServiceImpl extends BaseServiceImpl<ImMessageMapper, ImMes
Map<Long, ImConversation> conversationMapGroupById = new HashMap<>(); Map<Long, ImConversation> conversationMapGroupById = new HashMap<>();
Map<Long, List<ImConversationMembers>> conMembersMapGroupByConId = new HashMap<>(); Map<Long, List<ImConversationMembers>> conMembersMapGroupByConId = new HashMap<>();
beforePublishPrivateMessage(application, sender, toUserIdList, conversationMapGroupById, conMembersMapGroupByConId); beforePublishPrivateMessage(application, sender, toUserIdList, conversationMapGroupById, conMembersMapGroupByConId, param.getIncludeSender());
// 开始发送消息 // 开始发送消息
conversationMapGroupById.forEach((conversationId, conversation) -> { conversationMapGroupById.forEach((conversationId, conversation) -> {
List<ImConversationMembers> membersList = conMembersMapGroupByConId.getOrDefault(conversationId, List<ImConversationMembers> membersList = conMembersMapGroupByConId.getOrDefault(conversationId,
...@@ -810,7 +810,7 @@ public class ImMessageServiceImpl extends BaseServiceImpl<ImMessageMapper, ImMes ...@@ -810,7 +810,7 @@ public class ImMessageServiceImpl extends BaseServiceImpl<ImMessageMapper, ImMes
Map<Long, ImConversation> conversationMapGroupById = new HashMap<>(); Map<Long, ImConversation> conversationMapGroupById = new HashMap<>();
Map<Long, List<ImConversationMembers>> conMembersMapGroupByConId = new HashMap<>(); Map<Long, List<ImConversationMembers>> conMembersMapGroupByConId = new HashMap<>();
beforePublishPrivateMessage(application, sender, toUserIdList, conversationMapGroupById, conMembersMapGroupByConId); beforePublishPrivateMessage(application, sender, toUserIdList, conversationMapGroupById, conMembersMapGroupByConId, param.getIncludeSender());
// 开始发送消息 // 开始发送消息
conversationMapGroupById.forEach((conversationId, conversation) -> { conversationMapGroupById.forEach((conversationId, conversation) -> {
List<ImConversationMembers> membersList = conMembersMapGroupByConId.getOrDefault(conversationId, List<ImConversationMembers> membersList = conMembersMapGroupByConId.getOrDefault(conversationId,
...@@ -860,7 +860,7 @@ public class ImMessageServiceImpl extends BaseServiceImpl<ImMessageMapper, ImMes ...@@ -860,7 +860,7 @@ public class ImMessageServiceImpl extends BaseServiceImpl<ImMessageMapper, ImMes
param.getConversationExt().setChatType(ChatTypeEnum.SYSTEM); param.getConversationExt().setChatType(ChatTypeEnum.SYSTEM);
} }
beforePublishPrivateMessage(application, sender, toUserIdList, param.getConversationExt(), beforePublishPrivateMessage(application, sender, toUserIdList, param.getConversationExt(),
conversationMapGroupById, conMembersMapGroupByConId); conversationMapGroupById, conMembersMapGroupByConId, false);
// 开始发送消息 // 开始发送消息
conversationMapGroupById.forEach((conversationId, conversation) -> { conversationMapGroupById.forEach((conversationId, conversation) -> {
...@@ -911,8 +911,8 @@ public class ImMessageServiceImpl extends BaseServiceImpl<ImMessageMapper, ImMes ...@@ -911,8 +911,8 @@ public class ImMessageServiceImpl extends BaseServiceImpl<ImMessageMapper, ImMes
ImClient sender, ImClient sender,
List<String> toUserIdList, List<String> toUserIdList,
Map<Long, ImConversation> conversationMapGroupById, Map<Long, ImConversation> conversationMapGroupById,
Map<Long, List<ImConversationMembers>> conMembersMapGroupByConId) { Map<Long, List<ImConversationMembers>> conMembersMapGroupByConId, Boolean includeSender) {
this.beforePublishPrivateMessage(application, sender, toUserIdList, null, conversationMapGroupById, conMembersMapGroupByConId); this.beforePublishPrivateMessage(application, sender, toUserIdList, null, conversationMapGroupById, conMembersMapGroupByConId, includeSender);
} }
/** /**
...@@ -932,10 +932,12 @@ public class ImMessageServiceImpl extends BaseServiceImpl<ImMessageMapper, ImMes ...@@ -932,10 +932,12 @@ public class ImMessageServiceImpl extends BaseServiceImpl<ImMessageMapper, ImMes
List<String> toUserIdList, List<String> toUserIdList,
ConversationExtParam conversationExt, ConversationExtParam conversationExt,
Map<Long, ImConversation> conversationMapGroupById, Map<Long, ImConversation> conversationMapGroupById,
Map<Long, List<ImConversationMembers>> conMembersMapGroupByConId) { Map<Long, List<ImConversationMembers>> conMembersMapGroupByConId, Boolean includeSender) {
// 排除发件人自己 if (!includeSender) {
toUserIdList = toUserIdList.stream().filter(userId -> !sender.getClientId().equals(userId)).collect(Collectors.toList()); // 排除发件人自己
toUserIdList = toUserIdList.stream().filter(userId -> !sender.getClientId().equals(userId)).collect(Collectors.toList());
}
Long appId = application.getId(); Long appId = application.getId();
// 获取收件人信息 // 获取收件人信息
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment