✨ feat(im): 优化 pullPrivateMessageList 接口的实现

YunaiV
1 parent d6d90b2b
Showing 5 changed files with 29 additions and 19 deletions
yudao-module-im/yudao-module-im-biz/pom.xml
yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/controller/admin/message/ImPrivateMessageController.java
yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/dal/mysql/message/ImPrivateMessageMapper.java
yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/service/message/ImPrivateMessageService.java
yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/service/message/ImPrivateMessageServiceImpl.java
@@ -23,6 +23,11 @@
             <artifactId>yudao-module-im-api</artifactId>
             <version>${revision}</version>
         </dependency>
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-module-system</artifactId>
+            <version>${revision}</version>
+        </dependency>
  
         <!-- Web 相关 -->
         <dependency>
@@ -43,9 +43,9 @@ public class ImPrivateMessageController {
     @Operation(summary = "拉取私聊消息（增量）")
     @Parameter(name = "minId", description = "最小消息 id", required = true, example = "0")
     @Parameter(name = "size", description = "拉取数量", required = true, example = "100")
-    public CommonResult<List<ImPrivateMessageRespVO>> pullPrivateMessages(@RequestParam("minId") Long minId,
-                                                                   @RequestParam("size") Integer size) {
-        List<ImPrivateMessageDO> messages = privateMessageService.pullPrivateMessages(getLoginUserId(), minId, size);
+    public CommonResult<List<ImPrivateMessageRespVO>> pullPrivateMessageList(@RequestParam("minId") Long minId,
+                                                                             @RequestParam("size") Integer size) {
+        List<ImPrivateMessageDO> messages = privateMessageService.pullPrivateMessageList(getLoginUserId(), minId, size);
         return success(BeanUtils.toBean(messages, ImPrivateMessageRespVO.class));
     }
  
@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.im.dal.mysql.message;
  
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX;
 import cn.iocoder.yudao.module.im.dal.dataobject.message.ImPrivateMessageDO;
 import org.apache.ibatis.annotations.Mapper;
  
@@ -24,18 +25,15 @@ public interface ImPrivateMessageMapper extends BaseMapperX&lt;ImPrivateMessageDO&gt; 
      * @return 消息列表
      */
     default List<ImPrivateMessageDO> selectListByMinId(Long userId, Long minId, Integer size) {
-        return selectList(new LambdaQueryWrapperX<ImPrivateMessageDO>()
-                .and(w -> w.eq(ImPrivateMessageDO::getSenderId, userId)
-                        .or()
-                        .eq(ImPrivateMessageDO::getReceiverId, userId))
-                .gt(ImPrivateMessageDO::getId, minId)
-                .orderByAsc(ImPrivateMessageDO::getId)
-                .last("LIMIT " + size));
+        QueryWrapperX<ImPrivateMessageDO> wrapper = new QueryWrapperX<>();
+        wrapper.and(w -> w.eq("sender_id", userId)
+                        .or().eq("receiver_id", userId))
+                .gt("id", minId)
+                .orderByAsc("id");
+        wrapper.limitN(size);
+        return selectList(wrapper);
     }
  
-    /**
-     * 根据 senderId 和 clientMessageId 查询（幂等校验）
-     */
     default ImPrivateMessageDO selectBySenderIdAndClientMessageId(Long senderId, String clientMessageId) {
         return selectOne(new LambdaQueryWrapperX<ImPrivateMessageDO>()
                 .eq(ImPrivateMessageDO::getSenderId, senderId)
@@ -29,7 +29,7 @@ public interface ImPrivateMessageService {
      * @param size   拉取数量
      * @return 消息列表
      */
-    List<ImPrivateMessageDO> pullPrivateMessages(Long userId, Long minId, Integer size);
+    List<ImPrivateMessageDO> pullPrivateMessageList(Long userId, Long minId, Integer size);
  
     /**
      * 标记私聊消息已读
@@ -81,29 +81,36 @@ public class ImPrivateMessageServiceImpl implements ImPrivateMessageService {
     }
  
     @Override
-    public List<ImPrivateMessageDO> pullPrivateMessages(Long userId, Long minId, Integer size) {
+    public List<ImPrivateMessageDO> pullPrivateMessageList(Long userId, Long minId, Integer size) {
         if (size > MAX_PULL_SIZE) {
             throw exception(MESSAGE_PULL_SIZE_EXCEEDED);
         }
-        return privateMessageMapper.selectListByMinId(userId, minId, size);
+        List<ImPrivateMessageDO> messages = privateMessageMapper.selectListByMinId(userId, minId, size);
+        log.info("[pullPrivateMessageList][userId({}) minId({}) size({}) result({})]",
+                userId, minId, size, messages.size());
+        return messages;
     }
  
-    // DONE @芋艿：已 review，逻辑正确
+    // TODO @AI：应该是将 friendId 改成 receiverId，毕竟消息是发给对方的
     @Override
     public void readPrivateMessages(Long userId, Long friendId) {
         // 1. 批量更新消息状态为已读
+        // TODO @AI：先查询；然后在 update；避免锁的问题；
+        // TODO @AI：注意，update 的时候，也要 id in、status =，最后 updateObj 传入；避免并发问题；
         int updated = privateMessageMapper.updateStatusToRead(userId, friendId);
         if (updated == 0) {
             return; // 没有需要更新的消息
         }
-        // 2. 发送 READ 事件给自己的其他终端（多端同步）
+
+        // TODO @AI：继续 async ！
+        // 2.1 发送 READ 事件给自己的其他终端（多端同步）
         ImMessageReadMessage readMessage = new ImMessageReadMessage()
                 .setFriendId(friendId.toString())
                 .setMessageScene("private");
         webSocketMessageSender.sendObject(UserTypeEnum.ADMIN.getValue(), userId,
                 ImMessageReadMessage.TYPE, readMessage);
  
-        // 3. 发送 RECEIPT 事件给对方（已读回执）
+        // 2.2 发送 RECEIPT 事件给对方（已读回执）
         ImMessageReceiptMessage receiptMessage = new ImMessageReceiptMessage()
                 .setUserId(userId.toString())
                 .setMessageScene("private");