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

feat: 增加显示群主和管理员的功能

Browse Source
This commit is contained in:
Kkuil
2023-10-17 21:10:20 +08:00
parent 7a34169edf
commit d29b43d4c0
9 changed files with 70 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/ChatService.java
View File

@@ -54,7 +54,7 @@ public interface ChatService {
* @param request
* @return
*/
CursorPageBaseResp<ChatMemberResp> getMemberPage(List<Long> memberUidList, CursorPageBaseReq request);
CursorPageBaseResp<ChatMemberResp> getMemberPage(List<Long> memberUidList, MemberReq request);
/**
* 获取消息列表

6
mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/adapter/MemberAdapter.java
View File

@@ -1,7 +1,9 @@
package com.abin.mallchat.custom.chat.service.adapter;
import com.abin.mallchat.common.chat.dao.GroupMemberDao;
import com.abin.mallchat.common.chat.domain.entity.GroupMember;
import com.abin.mallchat.common.chat.domain.enums.GroupRoleEnum;
import com.abin.mallchat.common.chat.service.cache.GroupMemberCache;
import com.abin.mallchat.common.user.domain.entity.User;
import com.abin.mallchat.common.user.domain.entity.UserFriend;
import com.abin.mallchat.common.user.domain.enums.WSBaseResp;
@@ -32,10 +34,8 @@ import static com.abin.mallchat.common.user.domain.vo.response.ws.WSMemberChange
@Component
@Slf4j
public class MemberAdapter {
@Autowired
private UserCache userCache;
public static List<ChatMemberResp> buildMember(List<User> list) {
public static List<ChatMemberResp> buildMember(Long roomId, List<User> list) {
return list.stream().map(a -> {
ChatMemberResp resp = new ChatMemberResp();
resp.setActiveStatus(a.getActiveStatus());

41
mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/impl/ChatServiceImpl.java
View File

@@ -95,7 +95,7 @@ public class ChatServiceImpl implements ChatService {
@Autowired
private RoomGroupCache roomGroupCache;
@Autowired
private MQProducer mqProducer;
private RoomGroupDao roomGroupDao;
/**
* 发送消息
@@ -104,20 +104,20 @@ public class ChatServiceImpl implements ChatService {
@Transactional
public Long sendMsg(ChatMessageReq request, Long uid) {
check(request, uid);
AbstractMsgHandler msgHandler = MsgHandlerFactory.getStrategyNoNull(request.getMsgType());//todo 这里先不扩展，后续再改
AbstractMsgHandler msgHandler = MsgHandlerFactory.getStrategyNoNull(request.getMsgType());// todo 这里先不扩展，后续再改
msgHandler.checkMsg(request, uid);
//同步获取消息的跳转链接标题
// 同步获取消息的跳转链接标题
Message insert = MessageAdapter.buildMsgSave(request, uid);
messageDao.save(insert);
msgHandler.saveMsg(insert, request);
//发布消息发送事件
// 发布消息发送事件
applicationEventPublisher.publishEvent(new MessageSendEvent(this, insert.getId()));
return insert.getId();
}
private void check(ChatMessageReq request, Long uid) {
Room room = roomCache.get(request.getRoomId());
if (room.isHotRoom()) {//全员群跳过校验
if (room.isHotRoom()) {// 全员群跳过校验
return;
}
if (room.isRoomFriend()) {
@@ -145,36 +145,41 @@ public class ChatServiceImpl implements ChatService {
}
@Override
public CursorPageBaseResp<ChatMemberResp> getMemberPage(List<Long> memberUidList, CursorPageBaseReq request) {
public CursorPageBaseResp<ChatMemberResp> getMemberPage(List<Long> memberUidList, MemberReq request) {
Pair<ChatActiveStatusEnum, String> pair = ChatMemberHelper.getCursorPair(request.getCursor());
ChatActiveStatusEnum activeStatusEnum = pair.getKey();
String timeCursor = pair.getValue();
List<ChatMemberResp> resultList = new ArrayList<>();//最终列表
List<ChatMemberResp> resultList = new ArrayList<>();// 最终列表
Boolean isLast = Boolean.FALSE;
if (activeStatusEnum == ChatActiveStatusEnum.ONLINE) {//在线列表
CursorPageBaseResp<User> cursorPage = userDao.getCursorPage(memberUidList, new CursorPageBaseReq(request.getPageSize(), timeCursor), ChatActiveStatusEnum.ONLINE);
resultList.addAll(MemberAdapter.buildMember(cursorPage.getList()));//添加在线列表
resultList.addAll(MemberAdapter.buildMember(request.getRoomId(), cursorPage.getList()));//添加在线列表
if (cursorPage.getIsLast()) {//如果是最后一页,从离线列表再补点数据
activeStatusEnum = ChatActiveStatusEnum.OFFLINE;
Integer leftSize = request.getPageSize() - cursorPage.getList().size();
cursorPage = userDao.getCursorPage(memberUidList, new CursorPageBaseReq(leftSize, null), ChatActiveStatusEnum.OFFLINE);
resultList.addAll(MemberAdapter.buildMember(cursorPage.getList()));//添加离线线列表
resultList.addAll(MemberAdapter.buildMember(request.getRoomId(), cursorPage.getList()));//添加离线线列表
}
timeCursor = cursorPage.getCursor();
isLast = cursorPage.getIsLast();
} else if (activeStatusEnum == ChatActiveStatusEnum.OFFLINE) {//离线列表
CursorPageBaseResp<User> cursorPage = userDao.getCursorPage(memberUidList, new CursorPageBaseReq(request.getPageSize(), timeCursor), ChatActiveStatusEnum.OFFLINE);
resultList.addAll(MemberAdapter.buildMember(cursorPage.getList()));//添加离线线列表
resultList.addAll(MemberAdapter.buildMember(request.getRoomId(), cursorPage.getList()));//添加离线线列表
timeCursor = cursorPage.getCursor();
isLast = cursorPage.getIsLast();
}
//组装结果
// 获取群成员角色ID
List<Long> uidList = resultList.stream().map(ChatMemberResp::getUid).collect(Collectors.toList());
RoomGroup roomGroup = roomGroupDao.getByRoomId(request.getRoomId());
Map<Long, Integer> uidMapRole = groupMemberDao.getMemberMapRole(roomGroup.getId(), uidList);
resultList.forEach(member -> member.setRoleId(uidMapRole.get(member.getUid())));
// 组装结果
return new CursorPageBaseResp<>(ChatMemberHelper.generateCursor(activeStatusEnum, timeCursor), isLast, resultList);
}
@Override
public CursorPageBaseResp<ChatMessageResp> getMsgPage(ChatMessagePageReq request, Long receiveUid) {
//用最后一条消息id，来限制被踢出的人能看见的最大一条消息
// 用最后一条消息id，来限制被踢出的人能看见的最大一条消息
Long lastMsgId = getLastMsgId(request.getRoomId(), receiveUid);
CursorPageBaseResp<Message> cursorPage = messageDao.getCursorPage(request.getRoomId(), request, lastMsgId);
if (cursorPage.isEmpty()) {
@@ -222,16 +227,16 @@ public class ChatServiceImpl implements ChatService {
@Override
public void recallMsg(Long uid, ChatMessageBaseReq request) {
Message message = messageDao.getById(request.getMsgId());
//校验能不能执行撤回
// 校验能不能执行撤回
checkRecall(uid, message);
//执行消息撤回
// 执行消息撤回
recallMsgHandler.recall(uid, message);
}
@Override
@Cacheable(cacheNames = "member", key = "'memberList.'+#req.roomId")
public List<ChatMemberListResp> getMemberList(ChatMessageMemberReq req) {
if (Objects.equals(1L, req.getRoomId())) {//大群聊可看见所有人
if (Objects.equals(1L, req.getRoomId())) {// 大群聊可看见所有人
return userDao.getMemberList()
.stream()
.map(a -> {
@@ -259,7 +264,7 @@ public class ChatServiceImpl implements ChatService {
AssertUtil.isNotEmpty(message, "消息id有误");
AssertUtil.equal(uid, message.getFromUid(), "只能查看自己的消息");
CursorPageBaseResp<Contact> page;
if (request.getSearchType() == 1) {//已读
if (request.getSearchType() == 1) {// 已读
page = contactDao.getReadPage(message, request);
} else {
page = contactDao.getUnReadPage(message, request);
@@ -306,12 +311,12 @@ public class ChatServiceImpl implements ChatService {
return new ArrayList<>();
}
Map<Long, Message> replyMap = new HashMap<>();
//批量查出回复的消息
// 批量查出回复的消息
List<Long> replyIds = messages.stream().map(Message::getReplyMsgId).filter(Objects::nonNull).distinct().collect(Collectors.toList());
if (CollectionUtil.isNotEmpty(replyIds)) {
replyMap = messageDao.listByIds(replyIds).stream().collect(Collectors.toMap(Message::getId, Function.identity()));
}
//查询消息标志
// 查询消息标志
List<MessageMark> msgMark = messageMarkDao.getValidMarkByMsgIdBatch(messages.stream().map(Message::getId).collect(Collectors.toList()));
return MessageAdapter.buildMsgResp(messages, replyMap, msgMark, receiveUid);
}

4
mallchat-custom-server/src/test/java/com/abin/mallchat/custom/ac/CreateTokenTest.java
View File

@@ -17,14 +17,14 @@ public class CreateTokenTest {
@Test
public void create(){
String token = JWT.create()
.withClaim("uid", 10004L) // 只存一个uid信息，其他的自己去redis查
.withClaim("uid", 10276L) // 只存一个uid信息，其他的自己去redis查
.withClaim("createTime", new Date())
.sign(Algorithm.HMAC256("dsfsdfsdfsdfsd")); // signature
log.info("生成的token为 {}",token);
try {
JWTVerifier verifier = JWT.require(Algorithm.HMAC256("dsfsdfsdfsdfsc")).build();
JWTVerifier verifier = JWT.require(Algorithm.HMAC256("dsfsdfsdfsdfsd")).build();
DecodedJWT jwt = verifier.verify(token);
log.info(jwt.getClaims().toString());
} catch (Exception e) {