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

单聊群聊功能提交

Browse Source
This commit is contained in:
zhongzb
2023-07-30 01:20:40 +08:00
parent 05cef16bef
commit 6dd2a27df7
4 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mallchat-common/src/main/java/com/abin/mallchat/common/chat/service/ContactService.java
View File

@@ -25,5 +25,5 @@ public interface ContactService {
Integer getMsgUnReadCount(Message message); Integer getMsgUnReadCount(Message message);
Map<Long, MsgReadInfoDTO> getMsgReadInfo(List<Message> messages); Map<Long, MsgReadInfoDTO> getMsgReadInfo(List<Message> messages, boolean needUnread);
} }

12
mallchat-common/src/main/java/com/abin/mallchat/common/chat/service/impl/ContactServiceImpl.java
View File

@@ -51,17 +51,23 @@ public class ContactServiceImpl implements ContactService {
} }
@Override @Override
public Map<Long, MsgReadInfoDTO> getMsgReadInfo(List<Message> messages) { public Map<Long, MsgReadInfoDTO> getMsgReadInfo(List<Message> messages, boolean needUnread) {
Map<Long, List<Message>> roomGroup = messages.stream().collect(Collectors.groupingBy(Message::getRoomId)); Map<Long, List<Message>> roomGroup = messages.stream().collect(Collectors.groupingBy(Message::getRoomId));
AssertUtil.equal(roomGroup.size(), 1, "只能查相同房间下的消息"); AssertUtil.equal(roomGroup.size(), 1, "只能查相同房间下的消息");
Long roomId = roomGroup.keySet().iterator().next(); Long roomId = roomGroup.keySet().iterator().next();
Integer totalCount = contactDao.getTotalCount(roomId); Integer totalCount = null;
if (needUnread) {
totalCount = contactDao.getTotalCount(roomId);
}
Integer finalTotalCount = totalCount;
return messages.stream().map(message -> { return messages.stream().map(message -> {
MsgReadInfoDTO readInfoDTO = new MsgReadInfoDTO(); MsgReadInfoDTO readInfoDTO = new MsgReadInfoDTO();
readInfoDTO.setMsgId(message.getId()); readInfoDTO.setMsgId(message.getId());
Integer readCount = contactDao.getReadCount(message); Integer readCount = contactDao.getReadCount(message);
readInfoDTO.setReadCount(readCount); readInfoDTO.setReadCount(readCount);
readInfoDTO.setUnReadCount(totalCount - readCount); if (needUnread) {
readInfoDTO.setUnReadCount(finalTotalCount - readCount);
}
return readInfoDTO; return readInfoDTO;
}).collect(Collectors.toMap(MsgReadInfoDTO::getMsgId, Function.identity())); }).collect(Collectors.toMap(MsgReadInfoDTO::getMsgId, Function.identity()));
} }

2
mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/request/ChatMessageReadInfoReq.java
View File

@@ -22,4 +22,6 @@ public class ChatMessageReadInfoReq {
@ApiModelProperty("消息id集合（只查本人）") @ApiModelProperty("消息id集合（只查本人）")
@Size(max = 20) @Size(max = 20)
private List<Long> msgIds; private List<Long> msgIds;
@ApiModelProperty("是否需要查未读数")
private boolean needUnread;
} }

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

@@ -234,7 +234,7 @@ public class ChatServiceImpl implements ChatService {
messages.forEach(message -> { messages.forEach(message -> {
AssertUtil.equal(uid, message.getFromUid(), "只能查询自己发送的消息"); AssertUtil.equal(uid, message.getFromUid(), "只能查询自己发送的消息");
}); });
return contactService.getMsgReadInfo(messages).values(); return contactService.getMsgReadInfo(messages, request.isNeedUnread()).values();
} }
@Override @Override