diff --git a/im-center-server/src/main/java/cn/axzo/im/dao/repository/GroupMemberDao.java b/im-center-server/src/main/java/cn/axzo/im/dao/repository/GroupMemberDao.java index 05136a5..dbbc4e7 100644 --- a/im-center-server/src/main/java/cn/axzo/im/dao/repository/GroupMemberDao.java +++ b/im-center-server/src/main/java/cn/axzo/im/dao/repository/GroupMemberDao.java @@ -27,13 +27,13 @@ public class GroupMemberDao extends ServiceImpl .remove(); } - public Set getGroupPersons(Long tid) { - return getMembersByTid(tid).stream() + public Set getAsPersons(Long tid) { + return getByTid(tid).stream() .map(GroupMember::asPerson) .collect(toSet()); } - public List getMembersByTid(Long tid) { + public List getByTid(Long tid) { return lambdaQuery() .eq(GroupMember::getTid, tid) .list(); @@ -55,7 +55,7 @@ public class GroupMemberDao extends ServiceImpl .remove(); } - public List getMembersByPersons( + public List getByPersons( Long tid, Collection persons) { if (CollectionUtils.isEmpty(persons)) return Collections.emptyList(); diff --git a/im-center-server/src/main/java/cn/axzo/im/group/GroupManager.java b/im-center-server/src/main/java/cn/axzo/im/group/GroupManager.java index 2d093d9..2de4d40 100644 --- a/im-center-server/src/main/java/cn/axzo/im/group/GroupManager.java +++ b/im-center-server/src/main/java/cn/axzo/im/group/GroupManager.java @@ -90,7 +90,7 @@ public class GroupManager { // 同步完成员后再发消息, 因为接收方可能会查询群成员 groupBroadcaster.fireGroupChanged(group, MqEventType.GROUP_CREATED); groupBroadcaster.fireMembersChanged(group, - groupMemberDao.getMembersByTid(nimResponse.getTid()), + groupMemberDao.getByTid(nimResponse.getTid()), MqEventType.GROUP_ADD_MEMBERS); GroupCreateResponse response = new GroupCreateResponse(); response.setTid(nimResponse.getTid()); @@ -124,7 +124,7 @@ public class GroupManager { // sync members 1 groupMemberSyncer.syncMembers(group); // prepare add members - Set prePersons = groupMemberDao.getGroupPersons(group.getTid()); + Set prePersons = groupMemberDao.getAsPersons(group.getTid()); Set addPersons = request.getMembers().stream() .filter(member -> !prePersons.contains(member)) .collect(toSet()); @@ -148,7 +148,7 @@ public class GroupManager { // sync members 2 groupMemberSyncer.syncMembers(group); groupBroadcaster.fireMembersChanged(group, - groupMemberDao.getMembersByPersons(group.getTid(), addPersons), + groupMemberDao.getByPersons(group.getTid(), addPersons), MqEventType.GROUP_ADD_MEMBERS); GroupAddMembersResponse response = new GroupAddMembersResponse(); response.setAccountsNotFound(getAccountNotFoundPersons( @@ -170,7 +170,7 @@ public class GroupManager { // sync members 1 groupMemberSyncer.syncMembers(group); Set groupPersons = groupMemberDao - .getGroupPersons(group.getTid()); + .getAsPersons(group.getTid()); Set removePersons = request.getMembers().stream() .filter(groupPersons::contains) .collect(toSet()); @@ -190,7 +190,7 @@ public class GroupManager { BizAssertions.assertTrue(nimResponse.isSuccess(), "移除群成员失败: {}", nimResponse.getDesc()); // 同步前进行查询, 不然查询不到了 List removeMembers = groupMemberDao - .getMembersByPersons(group.getTid(), removePersons); + .getByPersons(group.getTid(), removePersons); // sync members 2 groupMemberSyncer.syncMembers(group); groupBroadcaster.fireMembersChanged(group, diff --git a/im-center-server/src/main/java/cn/axzo/im/group/controller/GroupController.java b/im-center-server/src/main/java/cn/axzo/im/group/controller/GroupController.java index 4c30a14..d6e70f0 100644 --- a/im-center-server/src/main/java/cn/axzo/im/group/controller/GroupController.java +++ b/im-center-server/src/main/java/cn/axzo/im/group/controller/GroupController.java @@ -64,7 +64,7 @@ public class GroupController implements GroupApi { @Override public ApiResult getMembers(GroupGetMembersRequest request) { - List members = groupMemberDao.getMembersByTid(request.getTid()); + List members = groupMemberDao.getByTid(request.getTid()); GroupGetMembersResponse response = new GroupGetMembersResponse(); response.setMembers(BeanMapper.copyList(members, GroupMemberInfo.class)); return ApiResult.ok(response); diff --git a/im-center-server/src/main/java/cn/axzo/im/group/member/GroupMemberSyncer.java b/im-center-server/src/main/java/cn/axzo/im/group/member/GroupMemberSyncer.java index ab04890..7793c7a 100644 --- a/im-center-server/src/main/java/cn/axzo/im/group/member/GroupMemberSyncer.java +++ b/im-center-server/src/main/java/cn/axzo/im/group/member/GroupMemberSyncer.java @@ -50,7 +50,7 @@ public class GroupMemberSyncer { if (groupInfo == null) return; transactionTemplate.executeWithoutResult(unused -> { List newMembers = parseGroupMembers(group, groupInfo); - List oldMembers = groupMemberDao.getMembersByTid(group.getTid()); + List oldMembers = groupMemberDao.getByTid(group.getTid()); Set newPersons = newMembers.stream().map(GroupMember::asPerson).collect(toSet()); Set oldPersons = oldMembers.stream().map(GroupMember::asPerson).collect(toSet());