diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/service/ContactService.java b/mallchat-common/src/main/java/com/abin/mallchat/common/chat/service/ContactService.java index 0e07def..6fd4c7f 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/service/ContactService.java +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/chat/service/ContactService.java @@ -25,5 +25,5 @@ public interface ContactService { Integer getMsgUnReadCount(Message message); - Map getMsgReadInfo(List messages, boolean needUnread); + Map getMsgReadInfo(List messages); } diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/service/impl/ContactServiceImpl.java b/mallchat-common/src/main/java/com/abin/mallchat/common/chat/service/impl/ContactServiceImpl.java index ba40a18..7a68ec4 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/service/impl/ContactServiceImpl.java +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/chat/service/impl/ContactServiceImpl.java @@ -51,23 +51,17 @@ public class ContactServiceImpl implements ContactService { } @Override - public Map getMsgReadInfo(List messages, boolean needUnread) { + public Map getMsgReadInfo(List messages) { Map> roomGroup = messages.stream().collect(Collectors.groupingBy(Message::getRoomId)); AssertUtil.equal(roomGroup.size(), 1, "只能查相同房间下的消息"); Long roomId = roomGroup.keySet().iterator().next(); - Integer totalCount = null; - if (needUnread) { - totalCount = contactDao.getTotalCount(roomId); - } - Integer finalTotalCount = totalCount; + Integer totalCount = contactDao.getTotalCount(roomId); return messages.stream().map(message -> { MsgReadInfoDTO readInfoDTO = new MsgReadInfoDTO(); readInfoDTO.setMsgId(message.getId()); Integer readCount = contactDao.getReadCount(message); readInfoDTO.setReadCount(readCount); - if (needUnread) { - readInfoDTO.setUnReadCount(finalTotalCount - readCount - 1); - } + readInfoDTO.setUnReadCount(totalCount - readCount - 1); return readInfoDTO; }).collect(Collectors.toMap(MsgReadInfoDTO::getMsgId, Function.identity())); } diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/request/ChatMessageReadInfoReq.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/request/ChatMessageReadInfoReq.java index f8688fa..2b1c585 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/request/ChatMessageReadInfoReq.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/request/ChatMessageReadInfoReq.java @@ -22,6 +22,4 @@ public class ChatMessageReadInfoReq { @ApiModelProperty("消息id集合(只查本人)") @Size(max = 20) private List msgIds; - @ApiModelProperty("是否需要查未读数") - private boolean needUnread; } diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/impl/ChatServiceImpl.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/impl/ChatServiceImpl.java index bd1780e..f091726 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/impl/ChatServiceImpl.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/impl/ChatServiceImpl.java @@ -250,7 +250,7 @@ public class ChatServiceImpl implements ChatService { messages.forEach(message -> { AssertUtil.equal(uid, message.getFromUid(), "只能查询自己发送的消息"); }); - return contactService.getMsgReadInfo(messages, request.isNeedUnread()).values(); + return contactService.getMsgReadInfo(messages).values(); } @Override