diff --git a/continew-module-system/src/main/java/top/continew/admin/system/service/MessageLogService.java b/continew-module-system/src/main/java/top/continew/admin/system/service/MessageLogService.java index c464b924..00fe5d8b 100644 --- a/continew-module-system/src/main/java/top/continew/admin/system/service/MessageLogService.java +++ b/continew-module-system/src/main/java/top/continew/admin/system/service/MessageLogService.java @@ -27,14 +27,6 @@ import java.util.List; */ public interface MessageLogService { - /** - * 新增 - * - * @param userIds 用户 ID 列表 - * @param messageId 消息 ID - */ - void addWithMessageId(List userIds, Long messageId); - /** * 新增 * diff --git a/continew-module-system/src/main/java/top/continew/admin/system/service/impl/MessageLogServiceImpl.java b/continew-module-system/src/main/java/top/continew/admin/system/service/impl/MessageLogServiceImpl.java index 5ef39640..764c7315 100644 --- a/continew-module-system/src/main/java/top/continew/admin/system/service/impl/MessageLogServiceImpl.java +++ b/continew-module-system/src/main/java/top/continew/admin/system/service/impl/MessageLogServiceImpl.java @@ -39,24 +39,13 @@ public class MessageLogServiceImpl implements MessageLogService { private final MessageLogMapper baseMapper; - @Override - public void addWithMessageId(List userIdList, Long messageId) { - if (CollUtil.isEmpty(userIdList)) { - return; - } - List list = userIdList.stream() - .map(userId -> new MessageLogDO(userId, messageId, LocalDateTime.now())) - .toList(); - baseMapper.insert(list); - } - @Override public void addWithUserId(List messageIds, Long userId) { if (CollUtil.isEmpty(messageIds)) { return; } List list = messageIds.stream() - .map(messageId -> new MessageLogDO(userId, messageId, LocalDateTime.now())) + .map(messageId -> new MessageLogDO(messageId, userId, LocalDateTime.now())) .toList(); baseMapper.insert(list); } diff --git a/continew-module-system/src/main/java/top/continew/admin/system/service/impl/MessageServiceImpl.java b/continew-module-system/src/main/java/top/continew/admin/system/service/impl/MessageServiceImpl.java index 586b70d4..42d212aa 100644 --- a/continew-module-system/src/main/java/top/continew/admin/system/service/impl/MessageServiceImpl.java +++ b/continew-module-system/src/main/java/top/continew/admin/system/service/impl/MessageServiceImpl.java @@ -67,12 +67,10 @@ public class MessageServiceImpl implements MessageService { @Override public void readMessage(List ids, Long userId) { - if (CollUtil.isEmpty(ids)) { - // 查询当前用户的未读消息 - List list = baseMapper.selectUnreadListByUserId(userId); - ids = list.stream().map(MessageDO::getId).toList(); - } - messageLogService.addWithMessageId(ids, userId); + // 查询当前用户的未读消息 + List list = baseMapper.selectUnreadListByUserId(userId); + List unreadIds = list.stream().map(MessageDO::getId).toList(); + messageLogService.addWithUserId(CollUtil.intersection(unreadIds, ids).stream().toList(), userId); } @Override