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:
@@ -1,220 +1,173 @@
|
||||
package com.emotion.controller;
|
||||
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
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.Message;
|
||||
import com.emotion.service.IMessageService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import com.emotion.service.MessageService;
|
||||
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 java.time.LocalDateTime;
|
||||
import java.util.HashMap;
|
||||
import javax.validation.constraints.NotBlank;
|
||||
import java.time.format.DateTimeFormatter;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* 消息控制器
|
||||
*
|
||||
*
|
||||
* @author emotion-museum
|
||||
* @date 2025-07-23
|
||||
*/
|
||||
@Slf4j
|
||||
@RestController
|
||||
@RequestMapping("/api/message")
|
||||
@RequestMapping("/message")
|
||||
public class MessageController {
|
||||
|
||||
|
||||
@Autowired
|
||||
private IMessageService messageService;
|
||||
|
||||
private MessageService messageService;
|
||||
|
||||
private static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
|
||||
|
||||
/**
|
||||
* 保存消息
|
||||
* 分页查询消息
|
||||
*/
|
||||
@PostMapping("/save")
|
||||
public Result<Message> saveMessage(@RequestBody Map<String, String> request) {
|
||||
try {
|
||||
String conversationId = request.get("conversationId");
|
||||
String content = request.get("content");
|
||||
String type = request.get("type");
|
||||
String sender = request.get("sender");
|
||||
|
||||
if (content == null || content.trim().isEmpty()) {
|
||||
return Result.error("消息内容不能为空");
|
||||
}
|
||||
|
||||
if (sender == null || sender.trim().isEmpty()) {
|
||||
return Result.error("发送者不能为空");
|
||||
}
|
||||
|
||||
Message message = messageService.saveMessage(conversationId, content, type, sender);
|
||||
if (message != null) {
|
||||
return Result.success(message);
|
||||
} else {
|
||||
return Result.error("保存消息失败");
|
||||
}
|
||||
|
||||
} catch (Exception e) {
|
||||
log.error("保存消息失败", e);
|
||||
return Result.error("保存消息失败：" + e.getMessage());
|
||||
}
|
||||
@GetMapping("/page")
|
||||
public Result<PageResult<MessageResponse>> getPage(@Validated PageRequest request) {
|
||||
IPage<Message> page = messageService.getPage(request);
|
||||
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 Result.success(pageResult);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 根据会话ID分页查询消息
|
||||
*/
|
||||
@GetMapping("/conversation/{conversationId}/page")
|
||||
public Result<PageResult<MessageResponse>> getPageByConversationId(@PathVariable String conversationId, @Validated PageRequest request) {
|
||||
IPage<Message> page = messageService.getPageByConversationId(request, conversationId);
|
||||
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 Result.success(pageResult);
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据ID获取消息
|
||||
*/
|
||||
@GetMapping("/{id}")
|
||||
public Result<MessageResponse> getById(@PathVariable String id) {
|
||||
Message message = messageService.getById(id);
|
||||
if (message == null) {
|
||||
return Result.notFound("消息不存在");
|
||||
}
|
||||
return Result.success(convertToResponse(message));
|
||||
}
|
||||
|
||||
/**
|
||||
* 创建消息
|
||||
*/
|
||||
@PostMapping
|
||||
public Result<MessageResponse> create(@RequestBody @Validated MessageCreateRequest request) {
|
||||
Message message = messageService.createMessage(
|
||||
request.getConversationId(),
|
||||
request.getUserId(),
|
||||
request.getContent(),
|
||||
request.getContentType(),
|
||||
request.getSenderType(),
|
||||
request.getSenderId()
|
||||
);
|
||||
return Result.success(convertToResponse(message));
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据会话ID查询消息
|
||||
*/
|
||||
@GetMapping("/conversation/{conversationId}")
|
||||
public Result<IPage<Message>> getMessagesByConversationId(
|
||||
@PathVariable String conversationId,
|
||||
@RequestParam(defaultValue = "1") Integer current,
|
||||
@RequestParam(defaultValue = "20") Integer size) {
|
||||
try {
|
||||
Page<Message> page = new Page<>(current, size);
|
||||
IPage<Message> result = messageService.getByConversationId(page, conversationId);
|
||||
return Result.success(result);
|
||||
} catch (Exception e) {
|
||||
log.error("查询会话消息失败", e);
|
||||
return Result.error("查询会话消息失败：" + e.getMessage());
|
||||
}
|
||||
public Result<List<MessageResponse>> getByConversationId(@PathVariable String conversationId) {
|
||||
List<Message> messages = messageService.getByConversationId(conversationId);
|
||||
List<MessageResponse> responses = messages.stream()
|
||||
.map(this::convertToResponse)
|
||||
.collect(Collectors.toList());
|
||||
return Result.success(responses);
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据发送者分页查询消息
|
||||
*/
|
||||
@GetMapping("/sender/{sender}")
|
||||
public Result<IPage<Message>> getMessagesBySender(
|
||||
@PathVariable String sender,
|
||||
@RequestParam(defaultValue = "1") Integer current,
|
||||
@RequestParam(defaultValue = "20") Integer size) {
|
||||
try {
|
||||
Page<Message> page = new Page<>(current, size);
|
||||
IPage<Message> result = messageService.getBySender(page, sender);
|
||||
return Result.success(result);
|
||||
} catch (Exception e) {
|
||||
log.error("查询发送者消息失败", e);
|
||||
return Result.error("查询发送者消息失败：" + e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询会话的最后一条消息
|
||||
*/
|
||||
@GetMapping("/last/{conversationId}")
|
||||
public Result<Message> getLastMessage(@PathVariable String conversationId) {
|
||||
try {
|
||||
Message message = messageService.getLastMessageByConversationId(conversationId);
|
||||
return Result.success(message);
|
||||
} catch (Exception e) {
|
||||
log.error("查询最后一条消息失败", e);
|
||||
return Result.error("查询最后一条消息失败：" + e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 统计会话消息数量
|
||||
*/
|
||||
@GetMapping("/count/{conversationId}")
|
||||
public Result<Long> countMessages(@PathVariable String conversationId) {
|
||||
try {
|
||||
Long count = messageService.countByConversationId(conversationId);
|
||||
return Result.success(count);
|
||||
} catch (Exception e) {
|
||||
log.error("统计消息数量失败", e);
|
||||
return Result.error("统计消息数量失败：" + e.getMessage());
|
||||
}
|
||||
@GetMapping("/conversation/{conversationId}/count")
|
||||
public Result<Long> countByConversationId(@PathVariable String conversationId) {
|
||||
Long count = messageService.countByConversationId(conversationId);
|
||||
return Result.success(count);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 更新消息状态
|
||||
* 转换为响应对象
|
||||
*/
|
||||
@PutMapping("/{messageId}/status")
|
||||
public Result<Boolean> updateStatus(@PathVariable String messageId,
|
||||
@RequestBody Map<String, String> request) {
|
||||
try {
|
||||
String status = request.get("status");
|
||||
if (status == null || status.trim().isEmpty()) {
|
||||
return Result.error("状态不能为空");
|
||||
}
|
||||
|
||||
boolean success = messageService.updateStatus(messageId, status);
|
||||
return Result.success(success);
|
||||
} catch (Exception e) {
|
||||
log.error("更新消息状态失败", e);
|
||||
return Result.error("更新消息状态失败：" + e.getMessage());
|
||||
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;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 标记消息为已读
|
||||
* 消息创建请求
|
||||
*/
|
||||
@PutMapping("/{messageId}/read")
|
||||
public Result<Boolean> markAsRead(@PathVariable String messageId) {
|
||||
try {
|
||||
boolean success = messageService.updateReadStatus(messageId, 1);
|
||||
return Result.success(success);
|
||||
} catch (Exception e) {
|
||||
log.error("标记消息已读失败", e);
|
||||
return Result.error("标记消息已读失败：" + e.getMessage());
|
||||
}
|
||||
@lombok.Data
|
||||
public static class MessageCreateRequest {
|
||||
@NotBlank(message = "会话ID不能为空")
|
||||
private String conversationId;
|
||||
|
||||
@NotBlank(message = "用户ID不能为空")
|
||||
private String userId;
|
||||
|
||||
@NotBlank(message = "消息内容不能为空")
|
||||
private String content;
|
||||
|
||||
private String contentType;
|
||||
private String senderType;
|
||||
private String senderId;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 批量标记会话消息为已读
|
||||
* 消息响应类
|
||||
*/
|
||||
@PutMapping("/conversation/{conversationId}/read")
|
||||
public Result<Boolean> markConversationAsRead(@PathVariable String conversationId) {
|
||||
try {
|
||||
boolean success = messageService.markConversationMessagesAsRead(conversationId);
|
||||
return Result.success(success);
|
||||
} catch (Exception e) {
|
||||
log.error("批量标记消息已读失败", e);
|
||||
return Result.error("批量标记消息已读失败：" + e.getMessage());
|
||||
}
|
||||
@lombok.Data
|
||||
@lombok.EqualsAndHashCode(callSuper = true)
|
||||
public static class MessageResponse extends BaseResponse {
|
||||
private String conversationId;
|
||||
private String content;
|
||||
private String type;
|
||||
private String sender;
|
||||
private Integer isRead;
|
||||
private String aiReply;
|
||||
private String emotionAnalysis;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取消息统计信息
|
||||
*/
|
||||
@GetMapping("/stats")
|
||||
public Result<Map<String, Object>> getMessageStats(
|
||||
@RequestParam(required = false) String conversationId,
|
||||
@RequestParam(required = false) String sender) {
|
||||
try {
|
||||
Map<String, Object> stats = new HashMap<>();
|
||||
|
||||
if (conversationId != null && !conversationId.trim().isEmpty()) {
|
||||
Long conversationCount = messageService.countByConversationId(conversationId);
|
||||
stats.put("conversationMessageCount", conversationCount);
|
||||
|
||||
Message lastMessage = messageService.getLastMessageByConversationId(conversationId);
|
||||
stats.put("lastMessage", lastMessage);
|
||||
}
|
||||
|
||||
if (sender != null && !sender.trim().isEmpty()) {
|
||||
Long senderCount = messageService.countBySender(sender);
|
||||
stats.put("senderMessageCount", senderCount);
|
||||
}
|
||||
|
||||
stats.put("timestamp", System.currentTimeMillis());
|
||||
|
||||
return Result.success(stats);
|
||||
} catch (Exception e) {
|
||||
log.error("获取消息统计失败", e);
|
||||
return Result.error("获取消息统计失败：" + e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除会话的所有消息
|
||||
*/
|
||||
@DeleteMapping("/conversation/{conversationId}")
|
||||
public Result<Boolean> deleteConversationMessages(@PathVariable String conversationId) {
|
||||
try {
|
||||
boolean success = messageService.deleteByConversationId(conversationId);
|
||||
return Result.success(success);
|
||||
} catch (Exception e) {
|
||||
log.error("删除会话消息失败", e);
|
||||
return Result.error("删除会话消息失败：" + e.getMessage());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user