接口优化

backend-single/src/main/java/com/emotion/controller/ConversationController.java

@@ -1,22 +1,17 @@
 package com.emotion.controller;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.emotion.common.PageResult;
 import com.emotion.common.Result;
-import com.emotion.dto.request.PageRequest;
 import com.emotion.dto.request.ConversationCreateRequest;
+import com.emotion.dto.request.ConversationPageRequest;
 import com.emotion.dto.response.ConversationResponse;
-import com.emotion.entity.Conversation;
 import com.emotion.service.ConversationService;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
-import java.time.format.DateTimeFormatter;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * 对话控制器
@@ -31,95 +26,51 @@ public class ConversationController {
     @Autowired
     private ConversationService conversationService;
 
-    private static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-
     /**
      * 分页查询对话
      */
-    @GetMapping("/page")
-    public Result<PageResult<ConversationResponse>> getPage(@Valid PageRequest request) {
-        IPage<Conversation> page = conversationService.getPage(request);
-        List<ConversationResponse> responses = page.getRecords().stream()
-                .map(this::convertToResponse)
-                .collect(Collectors.toList());
-        
-        PageResult<ConversationResponse> pageResult = new PageResult<>();
-        pageResult.setCurrent(page.getCurrent());
-        pageResult.setSize(page.getSize());
-        pageResult.setTotal(page.getTotal());
-        pageResult.setPages(page.getPages());
-        pageResult.setRecords(responses);
-        
-        return Result.success(pageResult);
-    }
-
-    /**
-     * 根据用户ID分页查询对话
-     */
-    @GetMapping("/user/{userId}/page")
-    public Result<PageResult<ConversationResponse>> getPageByUserId(@PathVariable String userId,
-            @Valid PageRequest request) {
-        IPage<Conversation> page = conversationService.getPageByUserId(request, userId);
-        List<ConversationResponse> responses = page.getRecords().stream()
-                .map(this::convertToResponse)
-                .collect(Collectors.toList());
-        
-        PageResult<ConversationResponse> pageResult = new PageResult<>();
-        pageResult.setCurrent(page.getCurrent());
-        pageResult.setSize(page.getSize());
-        pageResult.setTotal(page.getTotal());
-        pageResult.setPages(page.getPages());
-        pageResult.setRecords(responses);
-        
+    @GetMapping(value = "/page")
+    public Result<PageResult<ConversationResponse>> getPage(@Valid ConversationPageRequest request) {
+        PageResult<ConversationResponse> pageResult = conversationService.getPageWithResponse(request);
         return Result.success(pageResult);
     }
 
     /**
      * 根据ID获取对话
      */
-    @GetMapping("/{id}")
-    public Result<ConversationResponse> getById(@PathVariable String id) {
-        Conversation conversation = conversationService.getById(id);
-        if (conversation == null) {
+    @GetMapping(value = "/detail")
+    public Result<ConversationResponse> getById(@RequestParam String id) {
+        ConversationResponse response = conversationService.getConversationResponseById(id);
+        if (response == null) {
             return Result.notFound("对话不存在");
         }
-        return Result.success(convertToResponse(conversation));
+        return Result.success(response);
     }
 
     /**
      * 创建对话
      */
-    @PostMapping
+    @PostMapping(value = "/create")
     public Result<ConversationResponse> create(@Valid @RequestBody ConversationCreateRequest request,
             HttpServletRequest httpRequest) {
-        String clientIp = getClientIp(httpRequest);
-        Conversation conversation = conversationService.createConversation(
-                request.getUserId(),
-                request.getTitle(),
-                null // cozeConversationId
-        );
-        return Result.success(convertToResponse(conversation));
+        ConversationResponse response = conversationService.createConversationWithResponse(request, httpRequest);
+        return Result.success(response);
     }
 
     /**
      * 更新对话
      */
-    @PutMapping("/{id}")
-    public Result<ConversationResponse> update(@PathVariable String id, @RequestBody Conversation conversation) {
-        conversation.setId(id);
-        boolean updated = conversationService.updateById(conversation);
-        if (!updated) {
-            return Result.error("更新失败");
-        }
-        Conversation updatedConversation = conversationService.getById(id);
-        return Result.success(convertToResponse(updatedConversation));
+    @PutMapping(value = "/update")
+    public Result<ConversationResponse> update(@RequestBody ConversationCreateRequest request) {
+        ConversationResponse response = conversationService.updateConversationWithResponse(request);
+        return Result.success(response);
     }
 
     /**
      * 删除对话
      */
-    @DeleteMapping("/{id}")
-    public Result<Void> delete(@PathVariable String id) {
+    @DeleteMapping(value = "/delete")
+    public Result<Void> delete(@RequestParam String id) {
         boolean deleted = conversationService.removeById(id);
         if (!deleted) {
             return Result.error("删除失败");
@@ -127,93 +78,35 @@ public class ConversationController {
         return Result.success();
     }
 
-    /**
-     * 根据用户ID查询对话
-     */
-    @GetMapping("/user/{userId}")
-    public Result<List<ConversationResponse>> getByUserId(@PathVariable String userId) {
-        List<Conversation> conversations = conversationService.getByUserId(userId);
-        List<ConversationResponse> responses = conversations.stream()
-                .map(this::convertToResponse)
-                .collect(Collectors.toList());
-        return Result.success(responses);
-    }
-
     /**
      * 获取活跃对话
      */
-    @GetMapping("/active")
+    @GetMapping(value = "/active")
     public Result<List<ConversationResponse>> getActiveConversations() {
-        // 暂时返回空列表，因为接口中没有这个方法
-        return Result.success();
+        List<ConversationResponse> responses = conversationService.getActiveConversationsWithResponse();
+        return Result.success(responses);
     }
 
     /**
      * 获取归档对话
      */
-    @GetMapping("/archived")
+    @GetMapping(value = "/archived")
     public Result<List<ConversationResponse>> getArchivedConversations() {
-        // 暂时返回空列表，因为接口中没有这个方法
+        List<ConversationResponse> responses = conversationService.getArchivedConversationsWithResponse();
+        return Result.success(responses);
+    }
+
+    /**
+     * 更新对话状态
+     */
+    @PutMapping(value = "/status")
+    public Result<Void> updateConversationStatus(
+            @RequestParam String id,
+            @RequestParam String status) {
+        boolean updated = conversationService.updateConversationStatus(id, status);
+        if (!updated) {
+            return Result.error("更新状态失败");
+        }
         return Result.success();
     }
-
-    /**
-     * 归档对话
-     */
-    @PutMapping("/{id}/archive")
-    public Result<Void> archiveConversation(@PathVariable String id) {
-        // 暂时返回成功，因为接口中没有这个方法
-        return Result.success();
-    }
-
-    /**
-     * 激活对话
-     */
-    @PutMapping("/{id}/activate")
-    public Result<Void> activateConversation(@PathVariable String id) {
-        // 暂时返回成功，因为接口中没有这个方法
-        return Result.success();
-    }
-
-    /**
-     * 统计用户对话数量
-     */
-    @GetMapping("/user/{userId}/count")
-    public Result<Long> countByUserId(@PathVariable String userId) {
-        Long count = conversationService.countByUserId(userId);
-        return Result.success(count);
-    }
-
-    /**
-     * 获取客户端IP
-     */
-    private String getClientIp(HttpServletRequest request) {
-        String xForwardedFor = request.getHeader("X-Forwarded-For");
-        if (xForwardedFor != null && !xForwardedFor.isEmpty() && !"unknown".equalsIgnoreCase(xForwardedFor)) {
-            return xForwardedFor.split(",")[0];
-        }
-
-        String xRealIp = request.getHeader("X-Real-IP");
-        if (xRealIp != null && !xRealIp.isEmpty() && !"unknown".equalsIgnoreCase(xRealIp)) {
-            return xRealIp;
-        }
-
-        return request.getRemoteAddr();
-    }
-
-    /**
-     * 转换为响应对象
-     */
-    private ConversationResponse convertToResponse(Conversation conversation) {
-        ConversationResponse response = new ConversationResponse();
-        BeanUtils.copyProperties(conversation, response);
-        response.setId(conversation.getId());
-        if (conversation.getCreateTime() != null) {
-            response.setCreateTime(conversation.getCreateTime().format(DATE_TIME_FORMATTER));
-        }
-        if (conversation.getUpdateTime() != null) {
-            response.setUpdateTime(conversation.getUpdateTime().format(DATE_TIME_FORMATTER));
-        }
-        return response;
-    }
-}
+}