对话逻辑修复

backend-single/src/main/java/com/emotion/service/impl/MessageServiceImpl.java

@@ -5,14 +5,25 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.emotion.common.BasePageRequest;
+import com.emotion.common.PageResult;
+import com.emotion.dto.request.MessagePageRequest;
+import com.emotion.dto.request.MessageSearchRequest;
+import com.emotion.dto.request.MessageRecentRequest;
+import com.emotion.dto.request.MessageCreateRequest;
+import com.emotion.dto.response.MessageResponse;
 import com.emotion.entity.Message;
 import com.emotion.mapper.MessageMapper;
 import com.emotion.service.MessageService;
+import com.emotion.util.CurrentUserUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 消息服务实现类
@@ -20,9 +31,12 @@ import java.util.List;
  * @author emotion-museum
  * @date 2025-07-24
  */
+@Slf4j
 @Service
 public class MessageServiceImpl extends ServiceImpl<MessageMapper, Message> implements MessageService {
 
+    private static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+
     @Override
     public IPage<Message> getPage(BasePageRequest request) {
         Page<Message> page = new Page<>(request.getCurrent(), request.getSize());
@@ -201,4 +215,124 @@ public class MessageServiceImpl extends ServiceImpl<MessageMapper, Message> impl
         // 获取用户最近的消息，按时间倒序
         return this.baseMapper.getRecentByUserId(userId, limit);
     }
+
+    @Override
+    public PageResult<MessageResponse> getUserMessagesWithPage(MessagePageRequest request) {
+        log.info("获取用户消息分页: current={}, size={}", request.getCurrent(), request.getSize());
+
+        // 从上下文中获取当前用户ID
+        String userId = CurrentUserUtil.requireCurrentUserId();
+        log.info("当前用户ID: {}", userId);
+
+        // 调用原有的分页查询方法
+        IPage<Message> page = getByUserIdWithPage(userId, Math.toIntExact(request.getCurrent()),
+                Math.toIntExact(request.getSize()));
+
+        log.info("查询结果: total={}, records={}", page.getTotal(), page.getRecords().size());
+
+        // 转换为响应对象
+        List<MessageResponse> responses = page.getRecords().stream()
+                .map(this::convertToResponse)
+                .collect(Collectors.toList());
+
+        // 构建分页结果
+        PageResult<MessageResponse> pageResult = new PageResult<>();
+        pageResult.setCurrent(page.getCurrent());
+        pageResult.setSize(page.getSize());
+        pageResult.setTotal(page.getTotal());
+        pageResult.setPages(page.getPages());
+        pageResult.setRecords(responses);
+
+        return pageResult;
+    }
+
+    @Override
+    public List<MessageResponse> searchUserMessages(MessageSearchRequest request) {
+        log.info("搜索用户消息: keyword={}, limit={}", request.getKeyword(), request.getLimit());
+
+        // 从上下文中获取当前用户ID
+        String userId = CurrentUserUtil.requireCurrentUserId();
+        log.info("当前用户ID: {}", userId);
+
+        // 调用原有的搜索方法
+        List<Message> messages = searchByUserIdAndKeyword(userId, request.getKeyword(), request.getLimit());
+        log.info("搜索结果: {} 条消息", messages.size());
+
+        // 转换为响应对象
+        return messages.stream()
+                .map(this::convertToResponse)
+                .collect(Collectors.toList());
+    }
+
+    @Override
+    public List<MessageResponse> getUserRecentMessages(MessageRecentRequest request) {
+        log.info("获取用户最近消息: limit={}", request.getLimit());
+
+        // 从上下文中获取当前用户ID
+        String userId = CurrentUserUtil.requireCurrentUserId();
+        log.info("当前用户ID: {}", userId);
+
+        // 调用原有的获取最近消息方法
+        List<Message> messages = getRecentByUserId(userId, request.getLimit());
+        log.info("查询结果: {} 条最近消息", messages.size());
+
+        // 转换为响应对象
+        return messages.stream()
+                .map(this::convertToResponse)
+                .collect(Collectors.toList());
+    }
+
+    @Override
+    public MessageResponse createMessageFromRequest(MessageCreateRequest request) {
+        log.info("根据请求创建消息: conversationId={}", request.getConversationId());
+
+        // 从上下文中获取当前用户ID
+        String userId = CurrentUserUtil.requireCurrentUserId();
+        log.info("当前用户ID: {}", userId);
+
+        // 构建消息对象
+        Message message = new Message();
+        message.setConversationId(request.getConversationId());
+        message.setCreateBy(userId);
+        message.setContent(request.getContent());
+        message.setType(request.getContentType());
+        message.setSender(request.getSenderType());
+
+        // 调用原有的创建方法
+        Message savedMessage = createMessage(message);
+        log.info("创建消息成功: messageId={}", savedMessage.getId());
+
+        // 转换为响应对象
+        return convertToResponse(savedMessage);
+    }
+
+    @Override
+    public MessageResponse getMessageById(String id) {
+        log.info("根据ID获取消息: id={}", id);
+
+        Message message = getById(id);
+        if (message == null) {
+            log.warn("消息不存在: id={}", id);
+            return null;
+        }
+
+        // 转换为响应对象
+        return convertToResponse(message);
+    }
+
+    /**
+     * 转换为响应对象
+     */
+    private MessageResponse convertToResponse(Message message) {
+        MessageResponse response = new MessageResponse();
+        BeanUtils.copyProperties(message, response);
+        response.setId(message.getId());
+        if (message.getCreateTime() != null) {
+            response.setCreateTime(message.getCreateTime().format(DATE_TIME_FORMATTER));
+        }
+        if (message.getUpdateTime() != null) {
+            response.setUpdateTime(message.getUpdateTime().format(DATE_TIME_FORMATTER));
+        }
+        return response;
+    }
 }