一对一聊天开发完成

ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SocketMessageVo.java

@@ -4,6 +4,7 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.ruoyi.common.annotation.ExcelDictFormat;
 import com.ruoyi.common.convert.ExcelDictConvert;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import lombok.Data;
 import java.util.Date;
 
@@ -58,5 +59,10 @@ public class SocketMessageVo {
     @ExcelProperty(value = "备注")
     private String remark;
 
+    /**
+     * 用户数据
+     */
+    private SysUser user;
+
 
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SocketContactServiceImpl.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ruoyi.system.domain.SocketMessage;
+import com.ruoyi.system.domain.vo.SocketMessageVo;
 import com.ruoyi.system.mapper.SocketMessageMapper;
 import com.ruoyi.system.mapper.SysUserMapper;
 import com.ruoyi.system.service.ISysUserService;
@@ -25,6 +26,7 @@ import com.ruoyi.system.service.ISocketContactService;
 import java.util.List;
 import java.util.Map;
 import java.util.Collection;
+import java.util.stream.Collectors;
 
 /**
  * 通信目录Service业务层处理
@@ -56,7 +58,14 @@ public class SocketContactServiceImpl implements ISocketContactService {
                                 .eq(SocketMessage::getUserId, socketContactVo.getUserId())
                 );
 
-        socketContactVo.setMessages(socketMessageMapper.selectVoList(socketMessageLambdaQueryWrapper));
+        socketContactVo.setUser(sysUserMapper.selectUserById(socketContactVo.getContactUserId()));
+        List<SocketMessageVo> socketMessageVos = socketMessageMapper.selectVoList(socketMessageLambdaQueryWrapper);
+        socketMessageVos.stream()
+                        .peek(item->{
+                            SysUser sysUser = sysUserMapper.selectUserById(item.getUserId());
+                            item.setUser(sysUser);
+                        }).collect(Collectors.toList());
+        socketContactVo.setMessages(socketMessageVos);
         return socketContactVo;
     }