Commit 7994a913 by Future

创建聊天室

parent 20580f56
...@@ -40,4 +40,7 @@ public class ImConversationCreate extends BaseEntity { ...@@ -40,4 +40,7 @@ public class ImConversationCreate extends BaseEntity {
@NotNull(message = "会话类型不能为空") @NotNull(message = "会话类型不能为空")
private Integer chatType; private Integer chatType;
@ApiModelProperty("客户端平台: 1 web, 2 安卓, 3 ios, 4 pc-win, 5 pc-macOs, 需与生成sign时的值一致")
private Integer platform;
} }
...@@ -1294,14 +1294,14 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap ...@@ -1294,14 +1294,14 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
private ImConversationCreateVo createChatRoom(ImConversationCreate imConversationCreate, ImClient createClient) { private ImConversationCreateVo createChatRoom(ImConversationCreate imConversationCreate, ImClient createClient) {
// 会话id // 会话id
Long imConversationId = SnowflakeUtil.getId(); Long chatRoomId = SnowflakeUtil.getId();
// 创建者 // 创建者
Long creator = createClient.getId(); Long creator = createClient.getId();
// 创建会话 // 创建会话
ImConversation imConversation = new ImConversation(); ImConversation imConversation = new ImConversation();
imConversation.setId(imConversationId); imConversation.setId(chatRoomId);
imConversation.setCreateTime(new Date()); imConversation.setCreateTime(new Date());
imConversation.setLastMessage(null); imConversation.setLastMessage(null);
imConversation.setFkAppid(createClient.getFkAppid()); imConversation.setFkAppid(createClient.getFkAppid());
...@@ -1317,20 +1317,9 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap ...@@ -1317,20 +1317,9 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
imConversationService.save(imConversation); imConversationService.save(imConversation);
// 将创建者自己添加到会话 // 将创建者自己添加到会话
Long imConversationMembersId = SnowflakeUtil.getId(); chatRoomCacheManager.intoRoom(creator, chatRoomId, imConversationCreate.getPlatform());
ImConversationMembers imConversationMembers = new ImConversationMembers();
imConversationMembers.setId(imConversationMembersId);
imConversationMembers.setCreateTime(new Date());
imConversationMembers.setUpdateTime(new Date());
imConversationMembers.setFkAppid(createClient.getFkAppid());
imConversationMembers.setFkConversationId(imConversationId);
imConversationMembers.setFkClientId(creator);
imConversationMembers.setClientId(createClient.getClientId());
imConversationMembers.setRole(GroupRoleEnum.OWNER.getCode());
imConversationMembersService.save(imConversationMembers);
ImConversationCreateVo imConversationCreateVo = new ImConversationCreateVo(); ImConversationCreateVo imConversationCreateVo = new ImConversationCreateVo();
imConversationCreateVo.setId(imConversationId); imConversationCreateVo.setId(chatRoomId);
return imConversationCreateVo; return imConversationCreateVo;
} }
......
...@@ -169,7 +169,6 @@ public class RtcServiceImpl extends UserStateListener implements RtcService { ...@@ -169,7 +169,6 @@ public class RtcServiceImpl extends UserStateListener implements RtcService {
public Boolean leave(LeaveRtcChannelParam leaveRtcChannelParam) { public Boolean leave(LeaveRtcChannelParam leaveRtcChannelParam) {
ImClient currentClient = imClientService.getCurrentClient(); ImClient currentClient = imClientService.getCurrentClient();
this.leave(leaveRtcChannelParam, currentClient); this.leave(leaveRtcChannelParam, currentClient);
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