Skip to content

W
wecloud_im_server
Commit 4b5a7368 by Future
Options

方法调整

parent 452b16ef
Showing with 7 additions and 9 deletions
core/src/main/java/com/wecloud/im/service/impl/ImConversationServiceImpl.java
...@@ -277,8 +277,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap ...@@ -277,8 +277,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
imMessageService.save(imMessage); imMessageService.save(imMessage);
// 发送消息 // 发送消息
sendEventMsgToMember(imConversation.getId(), imApplication.getId(), createClient.getClientId(), sendEventMsgToMember(imConversation.getId(), imApplication.getId(), createClient.getClientId(),
client2.getId(), imMessage.getId(), imMessage.getMsgType(), client2.getId(), content, imMessage);
content, Boolean.FALSE, Boolean.TRUE);
} }
} }
ImConversationCreateVo imConversationCreateVo = new ImConversationCreateVo(); ImConversationCreateVo imConversationCreateVo = new ImConversationCreateVo();
...@@ -376,12 +375,10 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap ...@@ -376,12 +375,10 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
// 遍历发送给已在群内的成员 // 遍历发送给已在群内的成员
for (ImConversationMembers conversationMember : membersList) { for (ImConversationMembers conversationMember : membersList) {
sendEventMsgToMember(imClientToConversation.getConversationId(), imApplication.getId(), createClient.getClientId(), sendEventMsgToMember(imClientToConversation.getConversationId(), imApplication.getId(), createClient.getClientId(),
conversationMember.getFkClientId(), imMessage.getId(), imMessage.getMsgType(), conversationMember.getFkClientId(), content, imMessage);
content, Boolean.FALSE, Boolean.TRUE);
} }
sendEventMsgToMember(imClientToConversation.getConversationId(), imApplication.getId(), createClient.getClientId(), sendEventMsgToMember(imClientToConversation.getConversationId(), imApplication.getId(), createClient.getClientId(),
clientToConversation.getId(), imMessage.getId(), imMessage.getMsgType(), clientToConversation.getId(), content, imMessage);
content, Boolean.FALSE, Boolean.TRUE);
} }
// 将群成员数量减 // 将群成员数量减
...@@ -1217,8 +1214,8 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap ...@@ -1217,8 +1214,8 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
// 遍历发送给已在群内的成员 // 遍历发送给已在群内的成员
for (String key : chatRoomMembers.keySet()) { for (String key : chatRoomMembers.keySet()) {
Long fkClientId = Long.valueOf(key.split(RedisUtils.SPLIT)[0]); Long fkClientId = Long.valueOf(key.split(RedisUtils.SPLIT)[0]);
sendEventMsgToMember(param.getChatRoomId(), imApplication.getId(), imClientSender.getClientId(),fkClientId sendEventMsgToMember(param.getChatRoomId(), imApplication.getId(), imClientSender.getClientId(),
content, imMessage); fkClientId, content, imMessage);
} }
imConversationMapper.addMemberCount(imApplication.getId(), param.getChatRoomId(), 1); imConversationMapper.addMemberCount(imApplication.getId(), param.getChatRoomId(), 1);
...@@ -1274,7 +1271,8 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap ...@@ -1274,7 +1271,8 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
// 遍历发送给已在群内的成员 // 遍历发送给已在群内的成员
for (String key : chatRoomMembers.keySet()) { for (String key : chatRoomMembers.keySet()) {
Long fkClientId = Long.valueOf(key.split(RedisUtils.SPLIT)[0]); Long fkClientId = Long.valueOf(key.split(RedisUtils.SPLIT)[0]);
sendEventMsgToMember(imApplication, fkClientId, imMessage, currentClient); sendEventMsgToMember(param.getChatRoomId(), imApplication.getId(), currentClient.getClientId(),
fkClientId, null, imMessage);
} }
return true; return true;
} }
......
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