完成历史信息查询，并且可以通过内容模糊查询，通过时间查询，通过消息类型查询

# Conflicts:
#	src/main/java/com/bao/dating/controller/PostController.java
#	src/main/java/com/bao/dating/controller/UserController.java
#	src/main/java/com/bao/dating/handler/GlobalExceptionHandler.java
#	src/main/java/com/bao/dating/interceptor/TokenInterceptor.java
#	src/main/java/com/bao/dating/mapper/PostMapper.java
#	src/main/java/com/bao/dating/pojo/dto/UserInfoUpdateDTO.java
#	src/main/java/com/bao/dating/service/UserService.java
#	src/main/java/com/bao/dating/service/impl/PostServiceImpl.java
#	src/main/java/com/bao/dating/service/impl/UserServiceImpl.java

pom.xml

@@ -88,6 +88,12 @@
             <artifactId>spring-boot-starter-aop</artifactId>
         </dependency>
 
+        <!-- WebSocket 起步依赖 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-websocket</artifactId>
+        </dependency>
+
        <!--   阿里云相关依赖     -->
         <dependency>
             <groupId>com.aliyun.oss</groupId>
@@ -165,6 +171,12 @@
             <artifactId>spring-boot-starter-data-redis</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.github.pagehelper</groupId>
+            <artifactId>pagehelper-spring-boot-starter</artifactId>
+            <version>1.4.7</version>
+        </dependency>
+
     </dependencies>
     <dependencyManagement>
         <dependencies>

src/main/java/com/bao/dating/common/Post.java

@@ -1,16 +0,0 @@
-package com.bao.dating.common;
-
-
-import lombok.Data;
-
-import java.time.LocalDateTime;
-/**
- * 动态表
- */
-@Data
-public class Post {
-    private Long post_id;         // 动态ID
-    private String content;  // 动态内容
-    private Long user_id;     // 发布人ID
-    private LocalDateTime created_at; // 创建时间
-}

src/main/java/com/bao/dating/common/result/PageResult.java

@@ -0,0 +1,28 @@
+package com.bao.dating.common.result;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class PageResult<T> {
+    /** 总记录数 */
+    private Long total;
+    /** 当前页码 */
+    private Integer page;
+    /** 每页大小 */
+    private Integer size;
+    /** 总页数 */
+    private Integer pages;
+    /** 当前页数据 */
+    private List<T> records;
+
+    public PageResult(Long total, Integer page, Integer size, List<T> records) {
+        this.total = total;
+        this.page = page;
+        this.size = size;
+        this.records = records;
+        // 计算总页数
+        this.pages = (int) Math.ceil((double) total / size);
+    }
+}

src/main/java/com/bao/dating/config/RedisConfig.java

@@ -14,9 +14,9 @@ import org.springframework.data.redis.serializer.StringRedisSerializer;
 @Configuration
 public class RedisConfig {
     @Bean
-    public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory redisConnectionFactory) {
+    public RedisTemplate redisTemplate(RedisConnectionFactory redisConnectionFactory) {
         // 创建RedisTemplate对象
-        RedisTemplate<String, Object> redisTemplate = new RedisTemplate<>();
+        RedisTemplate redisTemplate = new RedisTemplate<>();
         // 设置redis的连接工厂对象
         redisTemplate.setConnectionFactory(redisConnectionFactory);
 

src/main/java/com/bao/dating/config/WebSocketConfig.java

@@ -0,0 +1,35 @@
+package com.bao.dating.config;
+
+
+import com.bao.dating.controller.websocket.ChatWebSocketHandler;
+import com.bao.dating.interceptor.WsAuthInterceptor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.socket.config.annotation.EnableWebSocket;
+import org.springframework.web.socket.config.annotation.WebSocketConfigurer;
+import org.springframework.web.socket.config.annotation.WebSocketHandlerRegistry;
+
+/**
+ * WebSocket 配置类
+ * @author lenovo
+ */
+@Configuration
+@EnableWebSocket
+public class WebSocketConfig implements WebSocketConfigurer {
+    @Autowired
+    private ChatWebSocketHandler chatWebSocketHandler;
+
+    @Autowired
+    private WsAuthInterceptor wsAuthInterceptor;
+
+    /**
+     * 注册 WebSocket 处理器
+     * @param registry
+     */
+    @Override
+    public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) {
+        registry.addHandler(chatWebSocketHandler, "/ws/chat")
+                .addInterceptors(wsAuthInterceptor)
+                .setAllowedOrigins("*");
+    }
+}

src/main/java/com/bao/dating/controller/ChatController.java

@@ -0,0 +1,42 @@
+package com.bao.dating.controller;
+
+import com.bao.dating.common.Result;
+import com.bao.dating.common.ResultCode;
+import com.bao.dating.common.result.PageResult;
+import com.bao.dating.context.UserContext;
+import com.bao.dating.pojo.dto.ChatHistoryQueryDTO;
+import com.bao.dating.pojo.vo.ChatRecordsVO;
+import com.bao.dating.service.ChatService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 聊天控制器
+ * @author lenovo
+ */
+@Slf4j
+@RestController
+@RequestMapping("/chat")
+public class ChatController {
+    @Autowired
+    private ChatService chatService;
+
+    /**
+     * 获取聊天记录
+     * @param targetUserId 目标用户ID
+     * @param queryDTO 查询参数
+     * @return 聊天记录列表
+     */
+    @GetMapping("/history/{targetUserId}")
+    public Result<PageResult<ChatRecordsVO>> getChatHistory(
+            @PathVariable Long targetUserId,
+            ChatHistoryQueryDTO queryDTO){
+        Long currentUserId = UserContext.getUserId();
+        PageResult<ChatRecordsVO> history = chatService.getChatHistory(currentUserId, targetUserId, queryDTO);
+        return Result.success(ResultCode.SUCCESS, "获取聊天记录成功", history);
+    }
+}

src/main/java/com/bao/dating/controller/websocket/ChatWebSocketHandler.java

@@ -0,0 +1,107 @@
+package com.bao.dating.controller.websocket;
+
+import com.bao.dating.message.WsMessage;
+import com.bao.dating.pojo.dto.ChatRecordSendDTO;
+import com.bao.dating.pojo.vo.ChatRecordsVO;
+import com.bao.dating.service.ChatService;
+import com.bao.dating.session.WsSessionManager;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.web.socket.CloseStatus;
+import org.springframework.web.socket.TextMessage;
+import org.springframework.web.socket.WebSocketSession;
+import org.springframework.web.socket.handler.TextWebSocketHandler;
+
+/**
+ * WebSocket处理器类
+ * @author lenovo
+ */
+@Slf4j
+@Component
+public class ChatWebSocketHandler extends TextWebSocketHandler {
+
+    @Autowired
+    private ObjectMapper objectMapper;
+
+    @Autowired
+    private ChatService chatService;
+
+    @Autowired
+    private WsSessionManager sessionManager;
+
+
+    /**
+     * 用户建立连接（上线）
+     * @param session
+     */
+    @Override
+    public void afterConnectionEstablished(WebSocketSession session) {
+        Long userId = (Long) session.getAttributes().get("userId");
+        sessionManager.addSession(userId, session);
+        log.info("用户 " + userId + " 已上线");
+    }
+
+    /**
+     * 接收并处理消息
+     * @param session
+     * @param message
+     */
+    @Override
+    protected void handleTextMessage(WebSocketSession session, TextMessage message) throws Exception{
+        // 获取当前用户ID
+        Long senderUserId = (Long) session.getAttributes().get("userId");
+        if (senderUserId == null) {
+            log.error("WebSocket session 中未找到 userId");
+            return;
+        }
+        // 解析消息
+        WsMessage<ChatRecordSendDTO > wsMessage =
+                objectMapper.readValue(message.getPayload(),
+                    new TypeReference<WsMessage<ChatRecordSendDTO>>(){});
+
+        // 处理私聊消息
+        if ("chat".equals(wsMessage.getType())) {
+            handlePrivateChat(senderUserId, wsMessage.getData());
+        }
+    }
+
+    /**
+     * 私聊处理
+     */
+    private void handlePrivateChat(Long senderUserId, ChatRecordSendDTO dto) throws Exception {
+
+        // 1. 消息入库 + 会话更新
+        ChatRecordsVO chatRecordsVO = chatService.createSession(senderUserId, dto);
+
+        // 2. 推送给接收方
+        WebSocketSession receiverSession =
+                sessionManager.getSession(dto.getReceiverUserId());
+
+        if (receiverSession != null && receiverSession.isOpen()) {
+            WsMessage<ChatRecordsVO> pushMsg = new WsMessage<>();
+            pushMsg.setType("chat");
+            pushMsg.setData(chatRecordsVO);
+
+            receiverSession.sendMessage(
+                    new TextMessage(objectMapper.writeValueAsString(pushMsg))
+            );
+        }
+    }
+
+
+    /**
+     * 用户断开连接（下线）
+     * @param session
+     * @param status
+     */
+    @Override
+    public void afterConnectionClosed(WebSocketSession session, CloseStatus status){
+        // 下线处理
+        Long userId = (Long) session.getAttributes().get("userId");
+        sessionManager.removeSession(userId);
+        log.info("用户 " + userId + " 已下线");
+    }
+}

src/main/java/com/bao/dating/interceptor/TokenInterceptor.java

@@ -23,7 +23,7 @@ import org.springframework.web.servlet.HandlerInterceptor;
 public class TokenInterceptor implements HandlerInterceptor {
 
     @Autowired
-    private RedisTemplate<String, Object> redisTemplate;
+    private RedisTemplate redisTemplate;
 
     /**
      * 在请求处理之前进行拦截
@@ -68,7 +68,7 @@ public class TokenInterceptor implements HandlerInterceptor {
             }
             
             // 解析 token
-            String userId = JwtUtil.getSubjectFromToken(token);
+            Long userId = Long.valueOf(JwtUtil.getSubjectFromToken(token));
 
             // 从Redis获取存储的token进行比对
             Object redisTokenObj = redisTemplate.opsForValue().get("login:token:" + userId);
@@ -85,7 +85,7 @@ public class TokenInterceptor implements HandlerInterceptor {
 
             log.info("用户: {}", userId);
             // 保存 userId 到 ThreadLocal
-            UserContext.setUserId(Long.valueOf(userId));
+            UserContext.setUserId(userId);
             return true;
         } catch (Exception e) {
             log.error("Token 校验失败: {}", e.getMessage());

src/main/java/com/bao/dating/interceptor/WsAuthInterceptor.java

@@ -0,0 +1,111 @@
+package com.bao.dating.interceptor;
+
+import com.bao.dating.util.JwtUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.http.server.ServerHttpRequest;
+import org.springframework.http.server.ServerHttpResponse;
+import org.springframework.http.server.ServletServerHttpRequest;
+import org.springframework.stereotype.Component;
+import org.springframework.web.socket.WebSocketHandler;
+import org.springframework.web.socket.server.HandshakeInterceptor;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
+/**
+ * WebSocket 认证拦截器
+ */
+@Slf4j
+@Component
+public class WsAuthInterceptor implements HandshakeInterceptor {
+
+    @Autowired
+    private RedisTemplate<String, Object> redisTemplate;
+    /**
+     * 拦截WebSocket连接请求
+     */
+    @Override
+    public boolean beforeHandshake(ServerHttpRequest request, ServerHttpResponse response, WebSocketHandler wsHandler, Map<String, Object> attributes) throws Exception {
+        log.info("开始WebSocket握手认证");
+        
+        // 获取请求参数
+        if (!(request instanceof ServletServerHttpRequest)) {
+            log.error("WebSocket握手失败：非HTTP请求");
+            return false;
+        }
+
+        // 获取HttpServletRequest对象
+        HttpServletRequest servletRequest = ((ServletServerHttpRequest) request).getServletRequest();
+
+        // 从URL参数中获取token
+        String token = servletRequest.getParameter("token");
+        
+        if (StringUtils.isBlank(token)) {
+            log.error("WebSocket握手失败：令牌丢失");
+            return false;
+        }
+
+        try {
+            // 验证 token 是否有效（包括是否过期）
+            if (!JwtUtil.validateToken(token)) {
+                log.error("Token无效或已过期: {}", token);
+                return false;
+            }
+
+            // 检查 token 是否在黑名单中
+            String blacklistKey = "jwt:blacklist:" + token;
+            Object blacklistToken = redisTemplate.opsForValue().get(blacklistKey);
+            if (blacklistToken != null) {
+                log.error("Token已在黑名单中: {}", token);
+                return false;
+            }
+
+            // 验证token并获取用户ID
+            String userIdStr = JwtUtil.getSubjectFromToken(token);
+            
+            if (StringUtils.isBlank(userIdStr) || !userIdStr.matches("\\d+")) {
+                log.error("无效的用户ID格式: {}", userIdStr);
+                return false;
+            }
+            
+            Long userId = Long.valueOf(userIdStr);
+
+            // 从Redis获取存储的token进行比对
+            String redisTokenKey = "login:token:" + userId;
+            Object redisTokenObj = redisTemplate.opsForValue().get(redisTokenKey);
+            String redisToken = redisTokenObj != null ? redisTokenObj.toString() : null;
+            log.info("Redis中存储的token: {}", redisToken != null ? "存在" : "不存在");
+
+            // 验证Redis中的token是否存在且匹配
+            if (redisToken == null || !redisToken.equals(token)) {
+                log.error("登录已失效 - Redis中token不存在或不匹配");
+                return false;
+            }
+
+            log.info("WebSocket认证成功，用户ID: {}", userId);
+            // 将用户ID保存到attributes中
+            attributes.put("userId", userId);
+            return true;
+        }
+        catch (NumberFormatException e) {
+            log.error("用户ID格式转换异常: {}", e.getMessage());
+            return false;
+        }
+        catch (Exception e) {
+            log.error("WebSocket握手失败：{}", e.getMessage(), e);
+            return false;
+        }
+    }
+
+    @Override
+    public void afterHandshake(ServerHttpRequest request, ServerHttpResponse response, WebSocketHandler wsHandler, Exception exception) {
+        if (exception != null) {
+            log.error("WebSocket握手后出现异常：", exception);
+        } else {
+            log.info("WebSocket握手完成");
+        }
+    }
+}

src/main/java/com/bao/dating/mapper/ChatRecordsMapper.java

@@ -0,0 +1,30 @@
+package com.bao.dating.mapper;
+
+
+import com.bao.dating.pojo.dto.ChatHistoryQueryDTO;
+import com.bao.dating.pojo.entity.ChatRecords;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Mapper
+public interface ChatRecordsMapper {
+    /**
+     * 插入聊天记录
+     */
+    int insert(ChatRecords chatRecords);
+
+    /**
+     * 根据用户ID和接收方用户ID查询聊天记录
+     */
+    List<ChatRecords> selectByUsersAndConditions(
+            @Param("currentUserId") Long currentUserId,
+            @Param("targetUserId") Long targetUserId,
+            @Param("messageContent") String messageContent,
+            @Param("startTime") LocalDateTime startTime,
+            @Param("endTime") LocalDateTime endTime,
+            @Param("messageType") Integer messageType
+    );
+}

src/main/java/com/bao/dating/mapper/ChatSessionsMapper.java

@@ -0,0 +1,39 @@
+package com.bao.dating.mapper;
+
+
+import com.bao.dating.pojo.entity.ChatRecords;
+import com.bao.dating.pojo.entity.ChatSessions;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+@Mapper
+public interface ChatSessionsMapper {
+    /**
+     * 如果发送方不存在会话则创建
+     * @param chatSessions 会话
+     * @return 影响行数
+     */
+    int insertIfNotExistsForSender(ChatSessions chatSessions);
+
+    /**
+     * 如果接收方不存在会话则创建
+     * @param chatSessions 会话
+     * @return 影响行数
+     */
+    int insertIfNotExistsForReceiver(ChatSessions chatSessions);
+
+    /**
+     *  更新发送方的会话信息
+     *  @param chatSessions 会话
+     *  @return 影响行数
+     */
+    int updateSessionForSender(ChatSessions chatSessions);
+
+    /**
+     *  更新接收方的会话信息
+     *  @param chatSessions 会话
+     *  @return 影响行数
+     */
+    int updateSessionForReceiver(ChatSessions chatSessions);
+
+}

src/main/java/com/bao/dating/message/WsMessage.java

@@ -0,0 +1,17 @@
+package com.bao.dating.message;
+
+import lombok.Data;
+
+/**
+ * WebSocket 消息
+ * @author KilLze
+ */
+@Data
+public class WsMessage<T> {
+
+    /** 消息类型：chat / read / system */
+    private String type;
+
+    /** 消息体 */
+    private T data;
+}

src/main/java/com/bao/dating/pojo/dto/ChatHistoryQueryDTO.java

@@ -0,0 +1,23 @@
+package com.bao.dating.pojo.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDate;
+
+/**
+ * 聊天记录查询参数
+ * @author KilLze
+ */
+@Data
+public class ChatHistoryQueryDTO {
+    private Integer page;
+    private Integer size;
+    private Long targetUserId;
+    private String messageContent;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
+    private LocalDate date;
+    private Integer messageType;
+}

src/main/java/com/bao/dating/pojo/dto/ChatRecordSendDTO.java

@@ -0,0 +1,17 @@
+package com.bao.dating.pojo.dto;
+
+import lombok.Data;
+
+/**
+ * 聊天记录发送数据传输对象
+ * @author KilLze
+ */
+@Data
+public class ChatRecordSendDTO {
+    /** 接收者用户ID */
+    private Long receiverUserId;
+    /** 消息内容 */
+    private String messageContent;
+    /** 消息类型 （1-文本消息，2-文件消息） */
+    private Integer messageType;
+}

src/main/java/com/bao/dating/pojo/dto/ChatRecordsDTO.java

@@ -0,0 +1,32 @@
+package com.bao.dating.pojo.dto;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * 聊天记录数据传输对象
+ * @author KilLze
+ */
+@Data
+public class ChatRecordsDTO {
+
+    /** 聊天记录ID */
+    private Long chatId;
+    /** 发送者用户ID */
+    private Long senderUserId;
+    /** 接收者用户ID */
+    private Long receiverUserId;
+    /** 消息内容 */
+    private String messageContent;
+    /** 消息类型 （1-文本消息，2-文件消息） */
+    private Integer messageType;
+    /** 阅读状态 （0-未读，1-已读） */
+    private Integer readStatus;
+    /** 阅读时间 */
+    private LocalDateTime readTime;
+    /** 发送时间 */
+    private LocalDateTime sendTime;
+    /** 消息状态 （1-正常，2-已撤回，3-已删除） */
+    private Integer messageStatus;
+}

src/main/java/com/bao/dating/pojo/dto/ChatSessionCreateDTO.java

@@ -0,0 +1,20 @@
+package com.bao.dating.pojo.dto;
+
+import lombok.Data;
+
+/**
+ * 创建会话数据传输对象
+ * @author KilLze
+ */
+@Data
+public class ChatSessionCreateDTO {
+
+    /** 所属用户ID */
+    private Long userId;
+
+    /** 目标用户ID */
+    private Long targetUserId;
+
+    /** 会话名称 */
+    private String sessionName;
+}

src/main/java/com/bao/dating/pojo/dto/ChatSessionUpdateDTO.java

@@ -0,0 +1,23 @@
+package com.bao.dating.pojo.dto;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * 会话更新数据传输对象
+ * @author KilLze
+ */
+@Data
+public class ChatSessionUpdateDTO {
+    /** 会话ID */
+    private Long sessionId;
+    /** 最后一条消息ID （关联chat_records.chat_id） */
+    private Long lastMessageId;
+    /** 最后一条消息内容 */
+    private String lastMessageContent;
+    /** 最后一条消息时间 */
+    private LocalDateTime lastMessageTime;
+    /** 未读消息数量 */
+    private Integer unreadCount;
+}

src/main/java/com/bao/dating/pojo/dto/UserNicknameDTO.java

@@ -0,0 +1,13 @@
+package com.bao.dating.pojo.dto;
+
+import lombok.Data;
+
+/**
+ * 用户昵称数据传输对象
+ * @author KilLze
+ */
+@Data
+public class UserNicknameDTO {
+    private Long userId;
+    private String nickname;
+}

src/main/java/com/bao/dating/pojo/entity/ChatRecords.java

@@ -0,0 +1,35 @@
+package com.bao.dating.pojo.entity;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * 聊天记录表
+ * @author lenovo
+ */
+@Data
+public class ChatRecords {
+    /** 聊天记录ID */
+    private Long chatId;
+    /** 发送者用户ID */
+    private Long senderUserId;
+    /** 接收者用户ID */
+    private Long receiverUserId;
+    /** 消息内容 */
+    private String messageContent;
+    /** 消息类型 （1-文本消息，2-文件消息） */
+    private Integer messageType;
+    /** 阅读状态 （0-未读，1-已读） */
+    private Integer readStatus;
+    /** 阅读时间 */
+    private LocalDateTime readTime;
+    /** 发送时间 */
+    private LocalDateTime sendTime;
+    /** 消息状态 （1-正常，2-已撤回，3-已删除） */
+    private Integer messageStatus;
+    /** 创建时间 */
+    private LocalDateTime createdAt;
+    /** 更新时间 */
+    private LocalDateTime updatedAt;
+}

src/main/java/com/bao/dating/pojo/entity/ChatSessions.java

@@ -0,0 +1,40 @@
+package com.bao.dating.pojo.entity;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * 会话表
+ * @author KilLze
+ */
+@Data
+public class ChatSessions {
+    /** 会话ID */
+    private Long sessionId;
+    /** 所属用户ID */
+    private Long userId;
+    /** 目标用户ID */
+    private Long targetUserId;
+    /** 会话名称 */
+    private String sessionName;
+    /** 最后一条消息ID （关联chat_records.chat_id） */
+    private Long lastMessageId;
+    /** 最后一条消息内容 */
+    private String lastMessageContent;
+    /** 最后一条消息时间 */
+    private LocalDateTime lastMessageTime;
+    /** 未读消息数量 */
+    private Integer unreadCount;
+    /** 会话状态 （1-正常，2-已隐藏，3-已删除） */
+    private Integer sessionStatus;
+    /** 置顶状态 （0-未置顶，1-已置顶） */
+    private Integer topStatus;
+    /** 免打扰状态 （0-正常提醒，1-免打扰） */
+    private Integer muteStatus;
+    /** 创建时间 */
+    private LocalDateTime createdAt;
+    /** 更新时间 */
+    private LocalDateTime updatedAt;
+
+}

src/main/java/com/bao/dating/pojo/vo/ChatRecordsVO.java

@@ -0,0 +1,29 @@
+package com.bao.dating.pojo.vo;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * 聊天记录返回数据
+ * @author KilLze
+ */
+@Data
+public class ChatRecordsVO {
+    /** 聊天记录ID */
+    private Long chatId;
+    /** 发送者用户ID */
+    private Long senderUserId;
+    /** 接收者用户ID */
+    private Long receiverUserId;
+    /** 消息内容 */
+    private String messageContent;
+    /** 消息类型 （1-文本消息，2-文件消息） */
+    private Integer messageType;
+    /** 阅读状态 （0-未读，1-已读） */
+    private Integer readStatus;
+    /** 发送时间 */
+    private LocalDateTime sendTime;
+    /** 消息状态 （1-正常，2-已撤回，3-已删除） */
+    private Integer messageStatus;
+}

src/main/java/com/bao/dating/pojo/vo/ChatSessionDetailVO.java

@@ -0,0 +1,19 @@
+package com.bao.dating.pojo.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 聊天会话详情
+ * @author KilLze
+ */
+@Data
+public class ChatSessionDetailVO {
+
+    /** 会话信息 */
+    private ChatSessionsVO session;
+
+    /** 聊天记录列表 */
+    private List<ChatRecordsVO> records;
+}

src/main/java/com/bao/dating/pojo/vo/ChatSessionsVO.java

@@ -0,0 +1,34 @@
+package com.bao.dating.pojo.vo;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * 会话信息
+ * @author KilLze
+ */
+@Data
+public class ChatSessionsVO {
+
+    /** 会话ID */
+    private Long sessionId;
+    /** 当前用户ID */
+    private Long userId;
+    /** 对方用户ID */
+    private Long targetUserId;
+    /** 会话名称 */
+    private String sessionName;
+    /** 最后一条消息内容 */
+    private String lastMessageContent;
+    /** 最后一条消息时间 */
+    private LocalDateTime lastMessageTime;
+    /** 未读消息数量 */
+    private Integer unreadCount;
+    /** 会话状态 */
+    private Integer sessionStatus;
+    /** 置顶状态 */
+    private Integer topStatus;
+    /** 免打扰状态 */
+    private Integer muteStatus;
+}

src/main/java/com/bao/dating/service/ChatService.java

@@ -0,0 +1,29 @@
+package com.bao.dating.service;
+
+import com.bao.dating.common.result.PageResult;
+import com.bao.dating.pojo.dto.ChatHistoryQueryDTO;
+import com.bao.dating.pojo.dto.ChatRecordSendDTO;
+import com.bao.dating.pojo.vo.ChatRecordsVO;
+
+/**
+ * 聊天服务
+ * @author lenovo
+ */
+public interface ChatService {
+    /**
+     * 消息入库，如果会话不存在则创建会话
+     * @param senderUserId 发送方用户ID
+     * @param dto 发送参数
+     * @return 聊天记录VO
+     */
+    ChatRecordsVO createSession(Long senderUserId, ChatRecordSendDTO dto);
+
+    /**
+     * 获取聊天记录
+     * @param currentUserId 发送方用户ID
+     * @param targetUserId 接收方用户ID
+     * @param queryDTO 查询参数
+     * @return 聊天记录VO列表
+     */
+    PageResult<ChatRecordsVO> getChatHistory(Long currentUserId, Long targetUserId, ChatHistoryQueryDTO queryDTO);
+}

src/main/java/com/bao/dating/service/UserService.java

@@ -2,6 +2,7 @@ package com.bao.dating.service;
 
 import com.bao.dating.pojo.dto.UserInfoUpdateDTO;
 import com.bao.dating.pojo.dto.UserLoginDTO;
+import com.bao.dating.pojo.dto.UserNicknameDTO;
 import com.bao.dating.pojo.vo.UserInfoVO;
 import com.bao.dating.pojo.vo.UserLoginVO;
 import org.springframework.web.multipart.MultipartFile;
@@ -52,4 +53,11 @@ public interface UserService {
      * @return 更新后的用户信息
      */
     UserInfoVO updateUserInfo(UserInfoUpdateDTO userInfoUpdateDTO);
+
+    /**
+     * 根据用户ID查询用户昵称
+     * @param userId 用户ID
+     * @return 用户
+     */
+    UserNicknameDTO getUserNicknameById(Long userId);
 }

src/main/java/com/bao/dating/service/impl/ChatServiceImpl.java

@@ -0,0 +1,170 @@
+package com.bao.dating.service.impl;
+
+import com.bao.dating.common.result.PageResult;
+import com.bao.dating.mapper.ChatRecordsMapper;
+import com.bao.dating.mapper.ChatSessionsMapper;
+import com.bao.dating.pojo.dto.ChatHistoryQueryDTO;
+import com.bao.dating.pojo.dto.ChatRecordSendDTO;
+import com.bao.dating.pojo.dto.UserNicknameDTO;
+import com.bao.dating.pojo.entity.ChatRecords;
+import com.bao.dating.pojo.entity.ChatSessions;
+import com.bao.dating.pojo.vo.ChatRecordsVO;
+import com.bao.dating.service.ChatService;
+import com.bao.dating.service.UserService;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.util.List;
+import java.util.stream.Collectors;
+
+
+/**
+ * 聊天服务实现类
+ * @author lenovo
+ */
+@Slf4j
+@Service
+public class ChatServiceImpl implements ChatService {
+    @Autowired
+    private ChatRecordsMapper chatRecordsMapper;
+
+    @Autowired
+    private ChatSessionsMapper chatSessionsMapper;
+
+    @Autowired
+    private UserService userService;
+
+    /**
+     * 消息入库，如果会话不存在则创建会话
+     * @param senderUserId 发送者用户ID
+     * @param dto 消息
+     * @return 聊天记录
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public ChatRecordsVO createSession(Long senderUserId, ChatRecordSendDTO dto) {
+        ChatRecords record = new ChatRecords();
+        record.setSenderUserId(senderUserId);
+        record.setReceiverUserId(dto.getReceiverUserId());
+        record.setMessageContent(dto.getMessageContent());
+        record.setMessageType(dto.getMessageType());
+        record.setReadStatus(0);
+        record.setMessageStatus(1);
+        record.setSendTime(LocalDateTime.now());
+
+        // 插入消息记录
+        chatRecordsMapper.insert(record);
+
+        // 创建接收方会话
+        ChatSessions sessions = new ChatSessions();
+        sessions.setUserId(senderUserId);
+        sessions.setTargetUserId(dto.getReceiverUserId());
+        // 获取接收方昵称作为发送方会话名称
+        try {
+            UserNicknameDTO receiverNicknameInfo = userService.getUserNicknameById(dto.getReceiverUserId());
+            if (receiverNicknameInfo != null && receiverNicknameInfo.getNickname() != null) {
+                sessions.setSessionName(receiverNicknameInfo.getNickname());
+            } else {
+                log.warn("接收用户ID获取用户信息时出现错误: {} , 使用默认id", dto.getReceiverUserId());
+                sessions.setSessionName("用户" + dto.getReceiverUserId());
+            }
+        } catch (Exception e) {
+            log.error("接收用户ID获取用户信息时出现错误: {} , 使用默认id", dto.getReceiverUserId(), e);
+            sessions.setSessionName("用户" + dto.getReceiverUserId());
+        }
+        sessions.setLastMessageId(record.getChatId());
+        sessions.setLastMessageContent(record.getMessageContent());
+        sessions.setLastMessageTime(record.getSendTime());
+
+        chatSessionsMapper.insertIfNotExistsForSender(sessions);
+        chatSessionsMapper.updateSessionForSender(sessions);
+
+        // 创建接收方会话
+        sessions.setUserId(dto.getReceiverUserId());
+        sessions.setTargetUserId(senderUserId);
+        try {
+            UserNicknameDTO senderNicknameInfo = userService.getUserNicknameById(senderUserId);
+            if (senderNicknameInfo != null && senderNicknameInfo.getNickname() != null) {
+                sessions.setSessionName(senderNicknameInfo.getNickname());
+            } else {
+                log.warn("接收用户ID获取用户信息时出现错误: {} , 使用默认id", senderUserId);
+                sessions.setSessionName("用户" + senderUserId);
+            }
+        } catch (Exception e) {
+            log.error("接收用户ID获取用户信息时出现错误: {} , 使用默认id", senderUserId, e);
+            sessions.setSessionName("用户" + senderUserId);
+        }
+
+        chatSessionsMapper.insertIfNotExistsForReceiver(sessions);
+        chatSessionsMapper.updateSessionForReceiver(sessions);
+
+
+
+        // 3. 返回 VO
+        ChatRecordsVO vo = new ChatRecordsVO();
+        BeanUtils.copyProperties(record, vo);
+        return vo;
+    }
+
+    /**
+     * 获取聊天记录
+     * @param currentUserId 当前用户ID
+     * @param targetUserId 目标用户ID
+     * @param queryDTO 查询参数
+     * @return 聊天记录列表
+     */
+    @Override
+    public PageResult<ChatRecordsVO> getChatHistory(Long currentUserId, Long targetUserId, ChatHistoryQueryDTO queryDTO) {
+        Integer page = queryDTO.getPage();
+        if (page == null || page < 1) {
+            page = 1;
+        }
+        Integer size = queryDTO.getSize();
+        if (size == null || size < 1 || size > 100) {
+            size = 50;
+        }
+
+        LocalDateTime startTime = null;
+        LocalDateTime endTime = null;
+        if (queryDTO.getDate() != null) {
+            startTime = queryDTO.getDate().atStartOfDay();
+            endTime = queryDTO.getDate().atTime(LocalTime.MAX);
+        }
+
+        // 分页
+        PageHelper.startPage(page, size);
+
+        // 查询
+        List<ChatRecords> recordsList = chatRecordsMapper.selectByUsersAndConditions(
+                currentUserId,
+                targetUserId,
+                queryDTO.getMessageContent(),
+                startTime,
+                endTime,
+                queryDTO.getMessageType()
+        );
+
+        // 使用 PageInfo 封装查询结果
+        PageInfo<ChatRecords> pageInfo = new PageInfo<>(recordsList);
+
+        // 转换为 VO
+        List<ChatRecordsVO> voList = recordsList.stream()
+                .map(record -> {
+                    ChatRecordsVO vo = new ChatRecordsVO();
+                    BeanUtils.copyProperties(record, vo);
+                    return vo;
+                })
+                .collect(Collectors.toList());
+
+        // 使用 PageInfo 的信息创建 PageResult
+        return new PageResult<>(pageInfo.getTotal(), pageInfo.getPageNum(), pageInfo.getPageSize(), voList);
+    }
+
+}

src/main/java/com/bao/dating/service/impl/UserServiceImpl.java

@@ -10,6 +10,7 @@ import com.bao.dating.context.UserContext;
 import com.bao.dating.mapper.UserMapper;
 import com.bao.dating.pojo.dto.UserInfoUpdateDTO;
 import com.bao.dating.pojo.dto.UserLoginDTO;
+import com.bao.dating.pojo.dto.UserNicknameDTO;
 import com.bao.dating.pojo.entity.User;
 import com.bao.dating.pojo.vo.UserInfoVO;
 import com.bao.dating.pojo.vo.UserLoginVO;
@@ -311,4 +312,23 @@ public class UserServiceImpl implements UserService {
         BeanUtils.copyProperties(updatedUser, userInfoVO);
         return userInfoVO;
     }
+
+    /**
+     * 根据用户ID获取用户昵称
+     *
+     * @param userId 用户ID
+     * @return 用户昵称
+     */
+    @Override
+    public UserNicknameDTO getUserNicknameById(Long userId) {
+        // 查询数据库获取昵称
+        User user = userMapper.selectByUserId(userId);
+        if (user == null) {
+            throw new RuntimeException("没有此用户");
+        }
+        UserNicknameDTO dto = new UserNicknameDTO();
+        dto.setUserId(user.getUserId());
+        dto.setNickname(user.getNickname());
+        return dto;
+    }
 }

src/main/java/com/bao/dating/session/WsSessionManager.java

@@ -0,0 +1,51 @@
+package com.bao.dating.session;
+
+import org.springframework.stereotype.Component;
+import org.springframework.web.socket.WebSocketSession;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * WebSocketSession 管理类
+ * @author KilLze
+ */
+@Component
+public class WsSessionManager {
+
+    private final Map<Long, WebSocketSession> SESSION_MAP = new ConcurrentHashMap<>();
+    /**
+     * 添加 WebSocketSession
+     * @param userId 用户ID
+     * @param session WebSocketSession
+     */
+    public void addSession(Long userId, WebSocketSession session) {
+        SESSION_MAP.put(userId, session);
+    }
+
+    /**
+     * 移除 WebSocketSession
+     * @param userId 用户ID
+     */
+    public void removeSession(Long userId) {
+        SESSION_MAP.remove(userId);
+    }
+
+    /**
+     * 获取 WebSocketSession
+     * @param userId 用户ID
+     * @return WebSocketSession
+     */
+    public WebSocketSession getSession(Long userId) {
+        return SESSION_MAP.get(userId);
+    }
+
+    /**
+     * 判断用户是否在线
+     * @param userId 用户ID
+     * @return true-在线，false-离线
+     */
+    public boolean isOnline(Long userId) {
+        return SESSION_MAP.containsKey(userId);
+    }
+}

src/main/java/com/bao/dating/util/MD5Util.java

@@ -9,7 +9,7 @@ import java.security.NoSuchAlgorithmException;
  * @author KilLze
  */
 public class MD5Util {
-    
+
     /**
      * 对字符串进行MD5加密
      * @param input 待加密的字符串
@@ -19,7 +19,7 @@ public class MD5Util {
         if (input == null || input.isEmpty()) {
             return null;
         }
-        
+
         try {
             MessageDigest md = MessageDigest.getInstance("MD5");
             byte[] digest = md.digest(input.getBytes());
@@ -28,7 +28,7 @@ public class MD5Util {
             throw new RuntimeException("MD5算法不可用", e);
         }
     }
-    
+
     /**
      * 对字符串进行MD5加密（带盐值）
      * @param input 待加密的字符串
@@ -44,7 +44,7 @@ public class MD5Util {
         }
         return encrypt(input + salt);
     }
-    
+
     /**
      * 验证字符串与MD5值是否匹配
      * @param input 原始字符串
@@ -57,7 +57,7 @@ public class MD5Util {
         }
         return encrypt(input).equalsIgnoreCase(md5Hash);
     }
-    
+
     /**
      * 验证字符串与MD5值是否匹配（带盐值）
      * @param input 原始字符串
@@ -74,7 +74,7 @@ public class MD5Util {
         }
         return encryptWithSalt(input, salt).equalsIgnoreCase(md5Hash);
     }
-    
+
     /**
      * 将字节数组转换为十六进制字符串
      * @param bytes 字节数组
@@ -88,6 +88,3 @@ public class MD5Util {
         return sb.toString();
     }
 }
-
-
-

src/main/resources/com/bao/dating/mapper/ChatRecordsMapper.xml

@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.bao.dating.mapper.ChatRecordsMapper">
+
+    <!-- 插入聊天记录 -->
+    <insert id="insert" useGeneratedKeys="true" keyProperty="chatId">
+        INSERT INTO chat_records
+        (
+            sender_user_id,
+            receiver_user_id,
+            message_content,
+            message_type,
+            read_status,
+            send_time,
+            message_status,
+            created_at,
+            updated_at
+        )
+        VALUES
+            (
+                #{senderUserId},
+                #{receiverUserId},
+                #{messageContent},
+                #{messageType},
+                #{readStatus},
+                #{sendTime},
+                #{messageStatus},
+                NOW(),
+                NOW()
+            )
+    </insert>
+
+    <!-- 根据两个用户ID及可选条件查询聊天记录 (按发送时间倒序) - PageHelper 会自动处理分页 -->
+    <select id="selectByUsersAndConditions" resultType="com.bao.dating.pojo.entity.ChatRecords">
+        SELECT
+        chat_id, sender_user_id, receiver_user_id, message_content, message_type,
+        read_status, read_time, send_time, message_status, created_at, updated_at
+        FROM chat_records
+        WHERE (
+            (sender_user_id = #{currentUserId} AND receiver_user_id = #{targetUserId})
+            OR (sender_user_id = #{targetUserId} AND receiver_user_id = #{currentUserId})
+        )
+        AND message_status = 1
+        <!-- 动态条件 -->
+        <if test="messageContent != null and messageContent != ''">
+            AND message_content LIKE CONCAT('%', #{messageContent}, '%')
+        </if>
+        <if test="startTime != null">
+            AND send_time >= #{startTime}
+        </if>
+        <if test="endTime != null">
+            AND send_time &lt;= #{endTime}
+        </if>
+        <if test="messageType != null">
+            AND message_type = #{messageType}
+        </if>
+        ORDER BY send_time DESC
+    </select>
+</mapper>

src/main/resources/com/bao/dating/mapper/ChatSessionsMapper.xml

@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.bao.dating.mapper.ChatSessionsMapper">
+
+    <!-- 如果发送方不存在会话则创建 -->
+    <insert id="insertIfNotExistsForSender" parameterType="com.bao.dating.pojo.entity.ChatSessions">
+        INSERT INTO chat_sessions
+        (user_id, target_user_id, session_name, last_message_id, last_message_content, last_message_time,
+         unread_count, session_status, top_status, mute_status, created_at, updated_at)
+        SELECT
+            #{userId}, #{targetUserId}, #{sessionName}, #{lastMessageId}, #{lastMessageContent}, #{lastMessageTime},
+            0, 1, 0, 0, NOW(), NOW()
+        FROM DUAL
+        WHERE NOT EXISTS (
+            SELECT 1 FROM chat_sessions
+            WHERE user_id = #{userId} AND target_user_id = #{targetUserId}
+        );
+    </insert>
+
+    <!-- 如果接收方不存在会话则创建 -->
+    <insert id="insertIfNotExistsForReceiver" parameterType="com.bao.dating.pojo.entity.ChatSessions">
+        INSERT INTO chat_sessions
+        (user_id, target_user_id, session_name, last_message_id, last_message_content, last_message_time,
+         unread_count, session_status, top_status, mute_status, created_at, updated_at)
+        SELECT
+            #{userId}, #{targetUserId}, #{sessionName}, #{lastMessageId}, #{lastMessageContent}, #{lastMessageTime},
+            0, 1, 0, 0, NOW(), NOW()
+        FROM DUAL
+        WHERE NOT EXISTS (
+            SELECT 1 FROM chat_sessions
+            WHERE user_id = #{userId} AND target_user_id = #{targetUserId}
+        )
+    </insert>
+
+    <!-- 更新发送方的会话信息 -->
+    <update id="updateSessionForSender" parameterType="com.bao.dating.pojo.entity.ChatSessions">
+        UPDATE chat_sessions
+        SET
+        last_message_id = #{lastMessageId},
+        last_message_content = #{lastMessageContent},
+        last_message_time = #{lastMessageTime},
+        unread_count = 0,
+        updated_at = NOW()
+        WHERE user_id = #{userId}
+        AND target_user_id = #{targetUserId};
+    </update>
+
+    <!-- 更新接收方的会话信息 -->
+    <update id="updateSessionForReceiver" parameterType="com.bao.dating.pojo.entity.ChatSessions">
+        UPDATE chat_sessions
+        SET
+            last_message_id = #{lastMessageId},
+            last_message_content = #{lastMessageContent},
+            last_message_time = #{lastMessageTime},
+            unread_count = unread_count + 1,
+            updated_at = NOW()
+        WHERE user_id = #{userId}
+          AND target_user_id = #{targetUserId}
+    </update>
+
+</mapper>