feat: 完善后端架构 - 标准化Controller层和Service层
✨ 新功能: - 创建了完整的Service层架构,包含所有业务实体的Service接口和实现类 - 新增8个标准化的Controller类,支持完整的CRUD操作 - 实现了统一的Request/Response模式和分页查询功能 - 创建了认证服务(AuthService)和令牌服务(TokenService) - 添加了Redis配置和认证拦截器 🏗️ 架构优化: - 移除Controller层所有try-catch块,使用全局异常处理机制 - 创建了专门的异常类(AuthException, TokenException, CaptchaException) - 统一了API返回格式,完善了Result类的方法 - 实现了标准的分页查询和参数校验 📦 新增文件: - 8个Controller类: Achievement, Comment, CommunityPost, Conversation, CozeApiCall, EmotionAnalysis, Reward, UserStats - 12个Service接口和对应的实现类 - 标准化的DTO类(Request/Response) - 异常处理类和拦截器 - 测试用例 🔧 重构优化: - 重写了AuthController,移除所有业务逻辑到Service层 - 优化了MessageController,使用标准的Request/Response格式 - 更新了全局异常处理器,支持多种异常类型 - 完善了WebConfig配置,添加认证拦截器 📊 代码统计: - 新增文件: 60+个 - 新增代码行数: 8000+行 - 重构代码行数: 1000+行 - 移除过时接口: 4个
This commit is contained in:
@@ -0,0 +1,283 @@
|
||||
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.response.BaseResponse;
|
||||
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.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.validation.constraints.NotBlank;
|
||||
import java.time.format.DateTimeFormatter;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* 对话控制器
|
||||
*
|
||||
* @author emotion-museum
|
||||
* @date 2025-07-23
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/conversation")
|
||||
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(@Validated 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, @Validated 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);
|
||||
|
||||
return Result.success(pageResult);
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据ID获取对话
|
||||
*/
|
||||
@GetMapping("/{id}")
|
||||
public Result<ConversationResponse> getById(@PathVariable String id) {
|
||||
Conversation conversation = conversationService.getById(id);
|
||||
if (conversation == null) {
|
||||
return Result.notFound("对话不存在");
|
||||
}
|
||||
return Result.success(convertToResponse(conversation));
|
||||
}
|
||||
|
||||
/**
|
||||
* 创建对话
|
||||
*/
|
||||
@PostMapping
|
||||
public Result<ConversationResponse> create(@RequestBody @Validated ConversationCreateRequest request, HttpServletRequest httpRequest) {
|
||||
String clientIp = getClientIp(httpRequest);
|
||||
Conversation conversation = conversationService.createConversation(
|
||||
request.getUserId(),
|
||||
request.getTitle(),
|
||||
request.getType(),
|
||||
clientIp
|
||||
);
|
||||
return Result.success(convertToResponse(conversation));
|
||||
}
|
||||
|
||||
/**
|
||||
* 更新对话
|
||||
*/
|
||||
@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));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除对话
|
||||
*/
|
||||
@DeleteMapping("/{id}")
|
||||
public Result<Void> delete(@PathVariable String id) {
|
||||
boolean deleted = conversationService.removeById(id);
|
||||
if (!deleted) {
|
||||
return Result.error("删除失败");
|
||||
}
|
||||
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("/type/{type}")
|
||||
public Result<List<ConversationResponse>> getByType(@PathVariable String type) {
|
||||
List<Conversation> conversations = conversationService.getByType(type);
|
||||
List<ConversationResponse> responses = conversations.stream()
|
||||
.map(this::convertToResponse)
|
||||
.collect(Collectors.toList());
|
||||
return Result.success(responses);
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据状态查询对话
|
||||
*/
|
||||
@GetMapping("/status/{status}")
|
||||
public Result<List<ConversationResponse>> getByStatus(@PathVariable String status) {
|
||||
List<Conversation> conversations = conversationService.getByStatus(status);
|
||||
List<ConversationResponse> responses = conversations.stream()
|
||||
.map(this::convertToResponse)
|
||||
.collect(Collectors.toList());
|
||||
return Result.success(responses);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询活跃对话
|
||||
*/
|
||||
@GetMapping("/active")
|
||||
public Result<List<ConversationResponse>> getActiveConversations() {
|
||||
List<Conversation> conversations = conversationService.getActiveConversations();
|
||||
List<ConversationResponse> responses = conversations.stream()
|
||||
.map(this::convertToResponse)
|
||||
.collect(Collectors.toList());
|
||||
return Result.success(responses);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询已归档对话
|
||||
*/
|
||||
@GetMapping("/archived")
|
||||
public Result<List<ConversationResponse>> getArchivedConversations() {
|
||||
List<Conversation> conversations = conversationService.getArchivedConversations();
|
||||
List<ConversationResponse> responses = conversations.stream()
|
||||
.map(this::convertToResponse)
|
||||
.collect(Collectors.toList());
|
||||
return Result.success(responses);
|
||||
}
|
||||
|
||||
/**
|
||||
* 归档对话
|
||||
*/
|
||||
@PutMapping("/{id}/archive")
|
||||
public Result<Void> archiveConversation(@PathVariable String id) {
|
||||
boolean archived = conversationService.archiveConversation(id);
|
||||
if (!archived) {
|
||||
return Result.error("归档失败");
|
||||
}
|
||||
return Result.success();
|
||||
}
|
||||
|
||||
/**
|
||||
* 激活对话
|
||||
*/
|
||||
@PutMapping("/{id}/activate")
|
||||
public Result<Void> activateConversation(@PathVariable String id) {
|
||||
boolean activated = conversationService.activateConversation(id);
|
||||
if (!activated) {
|
||||
return Result.error("激活失败");
|
||||
}
|
||||
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));
|
||||
}
|
||||
if (conversation.getLastMessageTime() != null) {
|
||||
response.setLastMessageTime(conversation.getLastMessageTime().format(DATE_TIME_FORMATTER));
|
||||
}
|
||||
return response;
|
||||
}
|
||||
|
||||
/**
|
||||
* 对话创建请求
|
||||
*/
|
||||
@lombok.Data
|
||||
public static class ConversationCreateRequest {
|
||||
@NotBlank(message = "用户ID不能为空")
|
||||
private String userId;
|
||||
|
||||
private String title;
|
||||
private String type;
|
||||
}
|
||||
|
||||
/**
|
||||
* 对话响应类
|
||||
*/
|
||||
@lombok.Data
|
||||
@lombok.EqualsAndHashCode(callSuper = true)
|
||||
public static class ConversationResponse extends BaseResponse {
|
||||
private String userId;
|
||||
private String cozeConversationId;
|
||||
private String title;
|
||||
private String type;
|
||||
private String status;
|
||||
private Integer messageCount;
|
||||
private String lastMessageTime;
|
||||
private String clientIp;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user