From 91b70d5ad2ada85cf00b25f7b9ecd9cf980bf138 Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: 星期一, 12 八月 2024 16:42:44 +0800
Subject: [PATCH] 优化:websocket接收消息

---
 ard-work/src/main/java/com/ruoyi/call/service/impl/ArdCallSessionUserServiceImpl.java |   20 ++++++++++++++++++--
 1 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/call/service/impl/ArdCallSessionUserServiceImpl.java b/ard-work/src/main/java/com/ruoyi/call/service/impl/ArdCallSessionUserServiceImpl.java
index 709b588..7f67aed 100644
--- a/ard-work/src/main/java/com/ruoyi/call/service/impl/ArdCallSessionUserServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/call/service/impl/ArdCallSessionUserServiceImpl.java
@@ -44,6 +44,8 @@
     private ArdCallUnreadMessagesMapper ardCallUnreadMessagesMapper;
     @Resource
     private IArdCallGroupService ardCallGroupService;
+    @Resource
+    private ISysUserService sysUserService;
 
     /**
      * 鏌ヨ浼氳瘽鐢ㄦ埛涓棿琛�
@@ -69,7 +71,14 @@
             }
             //鑾峰彇鏈�鍚庝竴鏉℃秷鎭疄浣�
             ArdCallHistory ardCallHistory = ardCallHistoryMapper.selectLastArdCallHistory(ardCallSessionUser.getSessionId());
-            ardCallSessionUser.setArdCallHistory(ardCallHistory);
+            if (ardCallHistory != null) {
+                SysUser sysUser = sysUserService.selectUserById(ardCallHistory.getUserId());
+                if (sysUser != null) {
+                    ardCallHistory.setNickName(sysUser.getNickName());
+                    ardCallHistory.setAvatar(sysUser.getAvatar());
+                }
+                ardCallSessionUser.setArdCallHistory(ardCallHistory);
+            }
             //缇よ亰targetNickName鏀逛负缇ゅ悕绉�
             if (ardCallSessionUser.getType().equals("1")) {
                 ArdCallGroup ardCallGroup = ardCallGroupService.selectArdCallGroupById(ardCallSessionUser.getTargetId());
@@ -100,7 +109,14 @@
             }
             //鑾峰彇鏈�鍚庝竴鏉℃秷鎭疄浣�
             ArdCallHistory ardCallHistory = ardCallHistoryMapper.selectLastArdCallHistory(callSessionUser.getSessionId());
-            callSessionUser.setArdCallHistory(ardCallHistory);
+            if(ardCallHistory != null) {
+                SysUser sysUser = sysUserService.selectUserById(ardCallHistory.getUserId());
+                if (sysUser != null) {
+                    ardCallHistory.setNickName(sysUser.getNickName());
+                    ardCallHistory.setAvatar(sysUser.getAvatar());
+                }
+                callSessionUser.setArdCallHistory(ardCallHistory);
+            }
             //缇よ亰targetNickName鏀逛负缇ゅ悕绉�
             if (callSessionUser.getType().equals("1")) {
                 ArdCallGroup ardCallGroup = ardCallGroupService.selectArdCallGroupById(callSessionUser.getTargetId());

--
Gitblit v1.9.3