wangli/im-center
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

REQ-3345: 移除群成员

Browse Source
This commit is contained in:
yanglin 2025-02-08 16:19:27 +08:00
parent 332fc19dd0
commit 95125c4aae
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
im-center-api/src/main/java/cn/axzo/im/center/api/vo/req/GroupCreateRequest.java
View File

@ -72,7 +72,7 @@ public class GroupCreateRequest {
}
@JsonIgnore @JSONField(serialize = false, deserialize = false)
public Set<PersonAccountAttribute> getOwnerAndMembers() {
public Set<PersonAccountAttribute> getPeople() {
Set<PersonAccountAttribute> ownerAndMembers = new HashSet<>(members);
ownerAndMembers.add(owner);
return ownerAndMembers;

6
im-center-server/src/main/java/cn/axzo/im/group/GroupManager.java
View File

@ -63,14 +63,14 @@ public class GroupManager {
@Transactional
public GroupCreateResponse createGroup(GroupCreateRequest request) {
BizAssertions.assertTrue(request.getOwnerAndMembers().size() > 1, "群成员数量(含群主)不能少于2");
BizAssertions.assertTrue(request.getPeople().size() > 1, "群成员数量(含群主)不能少于2");
groupSupport.log(0L, "create-group:preparing", request);
ImAccounts imAccounts = accountService.getOrCreateImAccounts(request.getOwnerAndMembers());
ImAccounts imAccounts = accountService.getOrCreateImAccounts(request.getPeople());
String owner = imAccounts.findAccount(request.getOwner()).orElse(null);
BizAssertions.assertNotNull(owner, "群主没有IM账号, 无法创建群. {}", request.getOwner());
Group group = groupSupport.buildNewGroup(request, imAccounts);
BizAssertions.assertTrue(group.addMoreMembers(
request.getOwnerAndMembers().size()), "无法创建群, 群成员数量超过上限" + group.getMemberLimit());
request.getPeople().size()), "无法创建群, 群成员数量超过上限" + group.getMemberLimit());
try {
groupDao.save(group);
} catch (DuplicateKeyException e) {

2
im-center-server/src/main/java/cn/axzo/im/group/GroupSupport.java
View File

@ -38,7 +38,7 @@ public class GroupSupport {
group.setType(request.getGroupType());
group.setBizGroupInfo(request.bizGroupInfoOrEmpty());
group.setAvatar(request.getAvatar());
group.setMemberCount((long) request.getOwnerAndMembers().size());
group.setMemberCount((long) request.getPeople().size());
Long memberLimit = request.getMemberLimit();
if (memberLimit == null)
memberLimit = (long) groupProps.getDefaultMemberLimit();