From a116c6276cbb4a8279e126aa3c237a5498a88a88 Mon Sep 17 00:00:00 2001
From: wangxulei <727869402@qq.com>
Date: Tue, 31 Dec 2024 16:40:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9F=A5=E8=AF=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/dd/admin/business/api/AuthApi.java    |  3 -
 .../dd/admin/business/chat/domain/ChatVo.java |  5 ++
 .../business/chat/mapper/ChatMapper.java      |  3 +-
 .../business/chat/mapper/xml/ChatMapper.xml   | 61 ++++++++++---------
 .../business/chat/service/ChatService.java    |  2 +-
 .../chat/service/impl/ChatServiceImpl.java    |  4 +-
 6 files changed, 41 insertions(+), 37 deletions(-)

diff --git a/src/main/java/com/dd/admin/business/api/AuthApi.java b/src/main/java/com/dd/admin/business/api/AuthApi.java
index 256a3f4..1c05e12 100644
--- a/src/main/java/com/dd/admin/business/api/AuthApi.java
+++ b/src/main/java/com/dd/admin/business/api/AuthApi.java
@@ -216,10 +216,8 @@ public class AuthApi {
     @OperLog(operModule = "获取关注目标作者的所有粉丝",operType = OperType.QUERY,operDesc = "获取关注目标作者的所有粉丝")
     public ResultBean getFollowMes(String authorId) {
         String myId = String.valueOf(request.getAttribute("authorId"));
-
         //关注我的列表
         List<FollowVo> followMes = followService.selectFollowMeList(authorId,myId);
-
         return ResultBean.success(followMes);
     }
 
@@ -229,7 +227,6 @@ public class AuthApi {
     @OperLog(operModule = "getMyFollows",operType = OperType.QUERY,operDesc = "获取关注目标作者的所有粉丝")
     public ResultBean getMyFollows(String authorId) {
         String myId = String.valueOf(request.getAttribute("authorId"));
-
         //关注我的列表
         List<FollowVo> myFollows = followService.selectMyFollowList(authorId,myId);
         return ResultBean.success(myFollows);
diff --git a/src/main/java/com/dd/admin/business/chat/domain/ChatVo.java b/src/main/java/com/dd/admin/business/chat/domain/ChatVo.java
index ae9d138..dab4898 100644
--- a/src/main/java/com/dd/admin/business/chat/domain/ChatVo.java
+++ b/src/main/java/com/dd/admin/business/chat/domain/ChatVo.java
@@ -15,6 +15,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.format.annotation.DateTimeFormat;
 
 /**
@@ -73,4 +74,8 @@ public class ChatVo {
 
     private String fromAvatar;
     private String toAvatar;
+
+    private String authorId;
+    private String authorName;
+    private String authorAvatar;
 }
diff --git a/src/main/java/com/dd/admin/business/chat/mapper/ChatMapper.java b/src/main/java/com/dd/admin/business/chat/mapper/ChatMapper.java
index 1325eee..0621ccf 100644
--- a/src/main/java/com/dd/admin/business/chat/mapper/ChatMapper.java
+++ b/src/main/java/com/dd/admin/business/chat/mapper/ChatMapper.java
@@ -25,5 +25,6 @@ public interface ChatMapper extends BaseMapper<Chat> {
     IPage<ChatVo> selectChatPage(Page<ChatVo> page, @Param("chatDto") ChatDto chatDto);
     ChatVo selectChat(@Param("chatId") String chatId);
     List<ChatVo> selectChatDetail(@Param("chatDto") ChatDto chatDto);
-    List<ChatVo> selectChatList(@Param("toId")String toId);
+    //查询我的聊天记录列表 当我作为收发方都需要考虑
+    List<ChatVo> selectChatList(@Param("authorId")String authorId);
 }
diff --git a/src/main/java/com/dd/admin/business/chat/mapper/xml/ChatMapper.xml b/src/main/java/com/dd/admin/business/chat/mapper/xml/ChatMapper.xml
index 2be236f..8cfd0c2 100644
--- a/src/main/java/com/dd/admin/business/chat/mapper/xml/ChatMapper.xml
+++ b/src/main/java/com/dd/admin/business/chat/mapper/xml/ChatMapper.xml
@@ -60,35 +60,36 @@
     </select>
     <select id="selectChatList" resultType="com.dd.admin.business.chat.domain.ChatVo"
             parameterType="java.lang.String">
-                   SELECT
-                    c.*
-                    FROM
-                        (
-                            SELECT
-                       DISTINCT a.FROM_ID,
-                                a.CHAT_ID,
-                                a.FROM_NAME,
-                                a.TO_ID,
-                                a.TO_NAME,
-                                a.MESSAGE_TYPE,
-                                a.MESSAGE_STATUS,
-                                a.CONTENT,
-                                a.RESOURCE_URL,
-                                a.DELETED,
-                                a.CREATE_TIME,
-                                a.IP_ADDRESS,
-                                a.IP_REAL_ADDRESS,
-                                b.AVATAR_URL
-                    AS fromAvatar
-                            FROM
-                                business_chat a
-                            LEFT JOIN business_author b ON a.FROM_ID = b.AUTHOR_ID
-                            WHERE
-                                a.TO_ID = #{toId}
-                            ORDER BY
-                                a.create_time DESC
-                        ) c
-                    GROUP BY
-                        c.TO_ID = #{toId}
+        select * from (
+            SELECT
+                a.FROM_ID AS authorId,
+                a.FROM_NAME AS authorName,
+                b.AVATAR_URL AS authorAvatar,
+                a.content,
+                a.create_time
+            FROM
+                business_chat a
+                    LEFT JOIN
+                business_author b ON a.FROM_ID = b.AUTHOR_ID
+            WHERE
+                a.TO_ID = #{authorId}
+            UNION ALL
+            SELECT
+                a.TO_ID AS authorId,
+                a.TO_NAME AS authorName,
+                b.AVATAR_URL AS authorAvatar,
+                a.content,
+                a.create_time
+            FROM
+                business_chat a
+                    LEFT JOIN
+                business_author b ON a.TO_ID = b.AUTHOR_ID
+            WHERE
+                a.FROM_ID = #{authorId}
+                ORDER BY
+                create_time DESC
+            ) a1
+            GROUP BY a1.authorId
+
     </select>
 </mapper>
diff --git a/src/main/java/com/dd/admin/business/chat/service/ChatService.java b/src/main/java/com/dd/admin/business/chat/service/ChatService.java
index cd3e824..714653d 100644
--- a/src/main/java/com/dd/admin/business/chat/service/ChatService.java
+++ b/src/main/java/com/dd/admin/business/chat/service/ChatService.java
@@ -24,6 +24,6 @@ public interface ChatService extends IService<Chat> {
     ChatVo selectChat(String chatId);
     //-列表
     List<ChatVo> selectChatDetail(ChatDto chatDto);
-    List<ChatVo> selectChatList(String toId);
+    List<ChatVo> selectChatList(String authorId);
 
 }
diff --git a/src/main/java/com/dd/admin/business/chat/service/impl/ChatServiceImpl.java b/src/main/java/com/dd/admin/business/chat/service/impl/ChatServiceImpl.java
index 1ab3266..f174042 100644
--- a/src/main/java/com/dd/admin/business/chat/service/impl/ChatServiceImpl.java
+++ b/src/main/java/com/dd/admin/business/chat/service/impl/ChatServiceImpl.java
@@ -40,7 +40,7 @@ public class ChatServiceImpl extends ServiceImpl<ChatMapper, Chat> implements Ch
     }
 
     @Override
-    public List<ChatVo> selectChatList(String toId) {
-        return baseMapper.selectChatList(toId);
+    public List<ChatVo> selectChatList(String authorId) {
+        return baseMapper.selectChatList(authorId);
     }
 }