From dd9fa3d0f2b0ef782fffc3771819346a2dbbb1a9 Mon Sep 17 00:00:00 2001 From: wong <106998207@qq.com> Date: Thu, 15 Jan 2026 14:24:50 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BC=93=E5=AD=98=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chukebao/controller/MessageController.php | 159 +++++++----------- 1 file changed, 64 insertions(+), 95 deletions(-) diff --git a/Server/application/chukebao/controller/MessageController.php b/Server/application/chukebao/controller/MessageController.php index 3f8c9cfe..0f6b939a 100644 --- a/Server/application/chukebao/controller/MessageController.php +++ b/Server/application/chukebao/controller/MessageController.php @@ -7,7 +7,6 @@ use app\chukebao\model\FriendSettings; use library\ResponseHelper; use think\Db; use think\facade\Env; -use think\facade\Cache; use app\common\service\AuthService; class MessageController extends BaseController @@ -31,105 +30,75 @@ class MessageController extends BaseController return ResponseHelper::error('请先登录'); } - // 缓存键 - $cacheKeyFriends = 'message_list_friends_' . $accountId; - $cacheKeyChatrooms = 'message_list_chatrooms_' . $accountId; - $cacheKeyMessages = 'message_list_messages_' . $accountId; + // 直接查询好友ID列表 + $ids = Db::table('s2_wechat_friend') + ->where(['accountId' => $accountId, 'isDeleted' => 0]) + ->column('id'); + $friendIds = empty($ids) ? [0] : $ids; // 避免 IN 查询为空 + + // 直接查询好友信息 + $friends = Db::table('s2_wechat_friend') + ->where(['accountId' => $accountId, 'isDeleted' => 0]) + ->column('id,nickname,avatar,conRemark,labels,groupId,wechatAccountId,wechatId,extendFields,phone,region,isTop'); + + // 直接查询群聊信息 + $chatrooms = Db::table('s2_wechat_chatroom') + ->where(['accountId' => $accountId, 'isDeleted' => 0]) + ->column('id,nickname,chatroomAvatar,chatroomId,isTop'); + + // 获取群聊ID列表 + $chatroomIds = array_keys($chatrooms); + if (empty($chatroomIds)) { + $chatroomIds = [0]; + } - // 缓存时间：好友和群聊信息5分钟，消息列表30秒 - $cacheTimeFriends = 300; // 5分钟 - $cacheTimeChatrooms = 300; // 5分钟 - $cacheTimeMessages = 30; // 30秒 - - // 从缓存获取好友ID列表 - $friendIds = Cache::get($cacheKeyFriends . '_ids'); - if ($friendIds === false) { - $ids = Db::table('s2_wechat_friend') - ->where(['accountId' => $accountId, 'isDeleted' => 0]) - ->column('id'); - $friendIds = empty($ids) ? [0] : $ids; // 避免 IN 查询为空 - Cache::set($cacheKeyFriends . '_ids', $friendIds, $cacheTimeFriends); + // 1. 查询群聊最新消息 + $chatroomMessages = []; + if (!empty($chatroomIds) && $chatroomIds[0] != 0) { + $chatroomIdsStr = implode(',', array_map('intval', $chatroomIds)); + $chatroomLatestQuery = " + SELECT wc.id as chatroomId, m.id, m.content, m.wechatChatroomId, m.createTime, m.wechatTime, m.wechatAccountId, + wc.nickname, wc.chatroomAvatar as avatar, wc.chatroomId, wc.isTop, 2 as msgType + FROM s2_wechat_chatroom wc + INNER JOIN ( + SELECT wechatChatroomId, MAX(wechatTime) as maxTime, MAX(id) as maxId + FROM s2_wechat_message + WHERE type = 2 AND wechatChatroomId IN ({$chatroomIdsStr}) + GROUP BY wechatChatroomId + ) latest ON wc.id = latest.wechatChatroomId + INNER JOIN s2_wechat_message m ON m.wechatChatroomId = latest.wechatChatroomId + AND m.wechatTime = latest.maxTime AND m.id = latest.maxId + WHERE wc.accountId = {$accountId} AND wc.isDeleted = 0 + "; + $chatroomMessages = Db::query($chatroomLatestQuery); } - // 从缓存获取好友信息 - $friends = Cache::get($cacheKeyFriends); - if ($friends === false) { - $friends = Db::table('s2_wechat_friend') - ->where(['accountId' => $accountId, 'isDeleted' => 0]) - ->column('id,nickname,avatar,conRemark,labels,groupId,wechatAccountId,wechatId,extendFields,phone,region,isTop'); - Cache::set($cacheKeyFriends, $friends, $cacheTimeFriends); + // 2. 查询好友最新消息 + $friendMessages = []; + if (!empty($friendIds) && $friendIds[0] != 0) { + $friendIdsStr = implode(',', array_map('intval', $friendIds)); + $friendLatestQuery = " + SELECT m.wechatFriendId, m.id, m.content, m.createTime, m.wechatTime, + f.wechatAccountId, 1 as msgType, 0 as isTop + FROM s2_wechat_message m + INNER JOIN ( + SELECT wechatFriendId, MAX(wechatTime) as maxTime, MAX(id) as maxId + FROM s2_wechat_message + WHERE type = 1 AND wechatFriendId IN ({$friendIdsStr}) + GROUP BY wechatFriendId + ) latest ON m.wechatFriendId = latest.wechatFriendId + AND m.wechatTime = latest.maxTime AND m.id = latest.maxId + INNER JOIN s2_wechat_friend f ON f.id = m.wechatFriendId + WHERE m.type = 1 AND m.wechatFriendId IN ({$friendIdsStr}) + "; + $friendMessages = Db::query($friendLatestQuery); } - // 从缓存获取群聊信息 - $chatrooms = Cache::get($cacheKeyChatrooms); - if ($chatrooms === false) { - $chatrooms = Db::table('s2_wechat_chatroom') - ->where(['accountId' => $accountId, 'isDeleted' => 0]) - ->column('id,nickname,chatroomAvatar,chatroomId,isTop'); - Cache::set($cacheKeyChatrooms, $chatrooms, $cacheTimeChatrooms); - } - - // 优化：分别查询群聊和好友的最新消息，使用缓存 - // 从缓存获取最新消息列表（短时间缓存，保证消息实时性） - $allMessages = Cache::get($cacheKeyMessages); - if ($allMessages === false) { - // 获取群聊ID列表 - $chatroomIds = array_keys($chatrooms); - if (empty($chatroomIds)) { - $chatroomIds = [0]; - } - - // 1. 查询群聊最新消息 - $chatroomMessages = []; - if (!empty($chatroomIds) && $chatroomIds[0] != 0) { - $chatroomIdsStr = implode(',', array_map('intval', $chatroomIds)); - $chatroomLatestQuery = " - SELECT wc.id as chatroomId, m.id, m.content, m.wechatChatroomId, m.createTime, m.wechatTime, m.wechatAccountId, - wc.nickname, wc.chatroomAvatar as avatar, wc.chatroomId, wc.isTop, 2 as msgType - FROM s2_wechat_chatroom wc - INNER JOIN ( - SELECT wechatChatroomId, MAX(wechatTime) as maxTime, MAX(id) as maxId - FROM s2_wechat_message - WHERE type = 2 AND wechatChatroomId IN ({$chatroomIdsStr}) - GROUP BY wechatChatroomId - ) latest ON wc.id = latest.wechatChatroomId - INNER JOIN s2_wechat_message m ON m.wechatChatroomId = latest.wechatChatroomId - AND m.wechatTime = latest.maxTime AND m.id = latest.maxId - WHERE wc.accountId = {$accountId} AND wc.isDeleted = 0 - "; - $chatroomMessages = Db::query($chatroomLatestQuery); - } - - // 2. 查询好友最新消息 - $friendMessages = []; - if (!empty($friendIds) && $friendIds[0] != 0) { - $friendIdsStr = implode(',', array_map('intval', $friendIds)); - $friendLatestQuery = " - SELECT m.wechatFriendId, m.id, m.content, m.createTime, m.wechatTime, - f.wechatAccountId, 1 as msgType, 0 as isTop - FROM s2_wechat_message m - INNER JOIN ( - SELECT wechatFriendId, MAX(wechatTime) as maxTime, MAX(id) as maxId - FROM s2_wechat_message - WHERE type = 1 AND wechatFriendId IN ({$friendIdsStr}) - GROUP BY wechatFriendId - ) latest ON m.wechatFriendId = latest.wechatFriendId - AND m.wechatTime = latest.maxTime AND m.id = latest.maxId - INNER JOIN s2_wechat_friend f ON f.id = m.wechatFriendId - WHERE m.type = 1 AND m.wechatFriendId IN ({$friendIdsStr}) - "; - $friendMessages = Db::query($friendLatestQuery); - } - - // 合并结果并排序 - $allMessages = array_merge($chatroomMessages, $friendMessages); - usort($allMessages, function ($a, $b) { - return $b['wechatTime'] <=> $a['wechatTime']; - }); - - // 存入缓存 - Cache::set($cacheKeyMessages, $allMessages, $cacheTimeMessages); - } + // 合并结果并排序 + $allMessages = array_merge($chatroomMessages, $friendMessages); + usort($allMessages, function ($a, $b) { + return $b['wechatTime'] <=> $a['wechatTime']; + }); // 计算总数 $totalCount = count($allMessages);