open-source/MallChat
1
0
Fork 0
mirror of https://github.com/zongzibinbin/MallChat.git synced 2026-03-25 15:53:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #142 from Kkuil/friend

Browse Source 
fix: 修复艾特用户列表不在群聊之中的问题
This commit is contained in:
zongzibinbin
2023-10-16 21:10:13 +08:00
committed by GitHub
parent 7c21b4127e 7a34169edf
commit e9aea2e96a
2 changed files with 30 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
mallchat-common/src/main/java/com/abin/mallchat/common/chat/dao/GroupMemberDao.java
View File

@@ -3,7 +3,9 @@ package com.abin.mallchat.common.chat.dao;
import com.abin.mallchat.common.chat.domain.entity.GroupMember; import com.abin.mallchat.common.chat.domain.entity.GroupMember;
import com.abin.mallchat.common.chat.domain.enums.GroupRoleEnum; import com.abin.mallchat.common.chat.domain.enums.GroupRoleEnum;
import com.abin.mallchat.common.chat.mapper.GroupMemberMapper; import com.abin.mallchat.common.chat.mapper.GroupMemberMapper;
import com.abin.mallchat.common.chat.service.cache.GroupMemberCache;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;
@@ -20,6 +22,9 @@ import java.util.stream.Collectors;
@Service @Service
public class GroupMemberDao extends ServiceImpl<GroupMemberMapper, GroupMember> { public class GroupMemberDao extends ServiceImpl<GroupMemberMapper, GroupMember> {
@Autowired
private GroupMemberCache groupMemberCache;
public List<Long> getMemberUidList(Long groupId) { public List<Long> getMemberUidList(Long groupId) {
List<GroupMember> list = lambdaQuery() List<GroupMember> list = lambdaQuery()
.eq(GroupMember::getGroupId, groupId) .eq(GroupMember::getGroupId, groupId)
@@ -50,4 +55,16 @@ public class GroupMemberDao extends ServiceImpl<GroupMemberMapper, GroupMember>
.eq(GroupMember::getRole, GroupRoleEnum.LEADER.getType()) .eq(GroupMember::getRole, GroupRoleEnum.LEADER.getType())
.list(); .list();
} }
/**
* 判断用户是否在房间中
*
* @param roomId 房间ID
* @param uidList 用户ID
* @return 是否在群聊中
*/
public Boolean isGroupShip(Long roomId, List<Long> uidList) {
List<Long> memberUidList = groupMemberCache.getMemberUidList(roomId);
return memberUidList.containsAll(uidList);
}
} }

7
mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/strategy/msg/TextMsgHandler.java
View File

@@ -2,6 +2,7 @@ package com.abin.mallchat.custom.chat.service.strategy.msg;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import com.abin.mallchat.common.chat.dao.GroupMemberDao;
import com.abin.mallchat.common.chat.dao.MessageDao; import com.abin.mallchat.common.chat.dao.MessageDao;
import com.abin.mallchat.common.chat.domain.entity.Message; import com.abin.mallchat.common.chat.domain.entity.Message;
import com.abin.mallchat.common.chat.domain.entity.msg.MessageExtra; import com.abin.mallchat.common.chat.domain.entity.msg.MessageExtra;
@@ -49,6 +50,8 @@ public class TextMsgHandler extends AbstractMsgHandler {
private IRoleService iRoleService; private IRoleService iRoleService;
@Autowired @Autowired
private SensitiveWordBs sensitiveWordBs; private SensitiveWordBs sensitiveWordBs;
@Autowired
private GroupMemberDao groupMemberDao;
private static final PrioritizedUrlDiscover URL_TITLE_DISCOVER = new PrioritizedUrlDiscover(); private static final PrioritizedUrlDiscover URL_TITLE_DISCOVER = new PrioritizedUrlDiscover();
@@ -71,6 +74,10 @@ public class TextMsgHandler extends AbstractMsgHandler {
List<Long> atUidList = body.getAtUidList(); List<Long> atUidList = body.getAtUidList();
Map<Long, User> batch = userInfoCache.getBatch(atUidList); Map<Long, User> batch = userInfoCache.getBatch(atUidList);
AssertUtil.equal(atUidList.size(), batch.values().size(), "@用户不存在"); AssertUtil.equal(atUidList.size(), batch.values().size(), "@用户不存在");
// 判断艾特用户是否在群聊中
Boolean isGroupShip = groupMemberDao.isGroupShip(request.getRoomId(), atUidList);
AssertUtil.isTrue(isGroupShip, "艾特用户不在群聊中");
groupMemberDao.isGroupShip(request.getRoomId(), atUidList);
boolean atAll = body.getAtUidList().contains(0L); boolean atAll = body.getAtUidList().contains(0L);
if (atAll) { if (atAll) {
AssertUtil.isTrue(iRoleService.hasPower(uid, RoleEnum.CHAT_MANAGER), "没有权限"); AssertUtil.isTrue(iRoleService.hasPower(uid, RoleEnum.CHAT_MANAGER), "没有权限");