peanut/happy-life-star
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

服务层重构与优化：补全所有ServiceImpl实现类，修复RestTemplate注入，完善DTO与配置，保证编译与启动通过

Browse Source
This commit is contained in:
huazhongmin
2025-07-24 14:15:31 +08:00
parent 873b8e55da
commit cf4d73ceff
95 changed files with 5889 additions and 2282 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend-single/src/main/java/com/emotion/controller/AiChatController.java
+165 -87
View File
@@ -1,13 +1,30 @@
package com.emotion.controller;
import com.emotion.common.Result;
import com.emotion.service.AiService;
import com.emotion.dto.request.AiChatRequest;
import com.emotion.dto.request.AiSummaryRequest;
import com.emotion.dto.request.ChatStatsRequest;
import com.emotion.dto.request.GuestChatRequest;
import com.emotion.dto.request.ConversationCreateRequest;
import com.emotion.dto.response.AiChatResponse;
import com.emotion.dto.response.AiSummaryResponse;
import com.emotion.dto.response.AiStatusResponse;
import com.emotion.dto.response.ChatStatsResponse;
import com.emotion.dto.response.GuestChatResponse;
import com.emotion.dto.response.GuestUserInfoResponse;
import com.emotion.dto.response.ConversationResponse;
import com.emotion.entity.Conversation;
import com.emotion.service.AIChatService;
import com.emotion.service.MessageService;
import com.emotion.service.ConversationService;
import lombok.extern.slf4j.Slf4j;
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.HashMap;
import java.util.Map;
@@ -23,140 +40,201 @@ import java.util.Map;
public class AiChatController {
@Autowired
private AiService aiService;
private AIChatService aiChatService;
@Autowired
private MessageService messageService;
@Autowired
private ConversationService conversationService;
private static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
/**
* 发送聊天消息
*/
@PostMapping("/chat")
public Result<Map<String, Object>> sendChatMessage(@RequestBody Map<String, String> request) {
try {
String conversationId = request.get("conversationId");
String message = request.get("message");
String userId = request.get("userId");
if (message == null || message.trim().isEmpty()) {
return Result.error("消息内容不能为空");
}
if (userId == null || userId.trim().isEmpty()) {
userId = "guest_" + System.currentTimeMillis();
}
public Result<AiChatResponse> sendChatMessage(@Valid @RequestBody AiChatRequest request) {
log.info("收到AI聊天请求: conversationId={}, userId={}, message={}",
conversationId, userId, message);
request.getConversationId(), request.getUserId(), request.getMessage());
// 调用AI服务
String aiReply = aiService.sendChatMessage(conversationId, message, userId);
String aiReply = aiChatService.sendChatMessage(request.getConversationId(), request.getMessage(),
request.getUserId());
Map<String, Object> response = new HashMap<>();
response.put("conversationId", conversationId);
response.put("userMessage", message);
response.put("aiReply", aiReply);
response.put("userId", userId);
response.put("timestamp", System.currentTimeMillis());
// 构建响应
AiChatResponse response = new AiChatResponse();
response.setConversationId(request.getConversationId());
response.setUserMessage(request.getMessage());
response.setAiReply(aiReply);
response.setUserId(request.getUserId());
response.setTimestamp(System.currentTimeMillis());
return Result.success(response);
} catch (Exception e) {
log.error("AI聊天请求处理失败", e);
return Result.error("AI聊天服务暂时不可用，请稍后再试");
}
return Result.success(response);
}
/**
* 生成对话总结
*/
@PostMapping("/summary")
public Result<Map<String, Object>> generateSummary(@RequestBody Map<String, String> request) {
try {
String conversationId = request.get("conversationId");
String userId = request.get("userId");
if (conversationId == null || conversationId.trim().isEmpty()) {
return Result.error("会话ID不能为空");
}
if (userId == null || userId.trim().isEmpty()) {
userId = "guest_" + System.currentTimeMillis();
}
log.info("收到对话总结请求: conversationId={}, userId={}", conversationId, userId);
public Result<AiSummaryResponse> generateSummary(@Valid @RequestBody AiSummaryRequest request) {
log.info("收到对话总结请求: conversationId={}, userId={}", request.getConversationId(), request.getUserId());
// 调用AI总结服务
String summary = aiService.generateConversationSummary(conversationId, userId);
String summary = aiChatService.generateConversationSummary(request.getConversationId(),
request.getUserId());
Map<String, Object> response = new HashMap<>();
response.put("conversationId", conversationId);
response.put("summary", summary);
response.put("userId", userId);
response.put("timestamp", System.currentTimeMillis());
// 构建响应
AiSummaryResponse response = new AiSummaryResponse();
response.setConversationId(request.getConversationId());
response.setSummary(summary);
response.setUserId(request.getUserId());
response.setTimestamp(System.currentTimeMillis());
return Result.success(response);
} catch (Exception e) {
log.error("对话总结请求处理失败", e);
return Result.error("对话总结服务暂时不可用，请稍后再试");
}
return Result.success(response);
}
/**
* 获取AI服务状态
*/
@GetMapping("/status")
public Result<Map<String, Object>> getServiceStatus() {
try {
boolean available = aiService.isServiceAvailable();
String status = aiService.getServiceStatus();
public Result<AiStatusResponse> getServiceStatus() {
log.info("获取AI服务状态");
boolean available = aiChatService.isServiceAvailable();
String status = aiChatService.getServiceStatus();
Map<String, Object> response = new HashMap<>();
response.put("available", available);
response.put("status", status);
response.put("timestamp", System.currentTimeMillis());
return Result.success(response);
} catch (Exception e) {
log.error("获取AI服务状态失败", e);
return Result.error("无法获取AI服务状态");
}
// 构建响应
AiStatusResponse response = new AiStatusResponse();
response.setAvailable(available);
response.setStatus(status);
response.setTimestamp(System.currentTimeMillis());
return Result.success(response);
}
/**
* 获取聊天记录统计
*/
@GetMapping("/stats")
public Result<Map<String, Object>> getChatStats(@RequestParam(required = false) String userId,
@RequestParam(required = false) String conversationId) {
try {
Map<String, Object> stats = new HashMap<>();
public Result<ChatStatsResponse> getChatStats(@RequestParam(required = false) String userId,
@RequestParam(required = false) String conversationId) {
log.info("获取聊天统计: userId={}, conversationId={}", userId, conversationId);
// 构建响应
ChatStatsResponse response = new ChatStatsResponse();
if (userId != null && !userId.trim().isEmpty()) {
Long userConversationCount = conversationService.countByUserId(userId);
Long activeConversationCount = conversationService.countActiveByUserId(userId);
stats.put("userConversationCount", userConversationCount);
stats.put("activeConversationCount", activeConversationCount);
response.setUserConversationCount(userConversationCount);
response.setActiveConversationCount(activeConversationCount);
}
if (conversationId != null && !conversationId.trim().isEmpty()) {
Long conversationMessageCount = messageService.countByConversationId(conversationId);
stats.put("conversationMessageCount", conversationMessageCount);
response.setConversationMessageCount(conversationMessageCount);
}
stats.put("timestamp", System.currentTimeMillis());
return Result.success(stats);
} catch (Exception e) {
log.error("获取聊天统计失败", e);
return Result.error("无法获取聊天统计信息");
response.setTimestamp(System.currentTimeMillis());
return Result.success(response);
}
/**
* 访客聊天（不需要登录）
*/
@PostMapping("/guest/chat")
public Result<GuestChatResponse> guestChat(@Valid @RequestBody GuestChatRequest request,
HttpServletRequest httpRequest) {
String clientIp = getClientIp(httpRequest);
log.info("访客聊天请求: {}, IP: {}", request.getMessage(), clientIp);
// 调用AI服务
Map<String, Object> aiResponse = aiChatService.guestChat(request.getMessage(), clientIp);
// 构建响应
GuestChatResponse response = new GuestChatResponse();
response.setMessage((String) aiResponse.get("message"));
response.setMessageId((String) aiResponse.get("messageId"));
response.setTimestamp((Long) aiResponse.get("timestamp"));
response.setError((Boolean) aiResponse.get("error"));
return Result.success("发送成功", response);
}
/**
* 获取访客用户信息
*/
@GetMapping("/guest/user/info")
public Result<GuestUserInfoResponse> getGuestUserInfo(HttpServletRequest request) {
String clientIp = getClientIp(request);
log.info("获取访客用户信息: IP={}", clientIp);
// 调用AI服务
Map<String, Object> userInfo = aiChatService.getGuestUserInfo(clientIp);
// 构建响应
GuestUserInfoResponse response = new GuestUserInfoResponse();
response.setId((String) userInfo.get("id"));
response.setUsername((String) userInfo.get("username"));
response.setNickname((String) userInfo.get("nickname"));
response.setType((String) userInfo.get("type"));
response.setClientIp((String) userInfo.get("clientIp"));
response.setUserCreateTime((Long) userInfo.get("createTime"));
return Result.success(response);
}
/**
* 创建对话
*/
@PostMapping("/conversation/create")
public Result<ConversationResponse> createConversation(@Valid @RequestBody ConversationCreateRequest request,
HttpServletRequest httpRequest) {
log.info("创建对话请求: userId={}, title={}", request.getUserId(), request.getTitle());
String clientIp = getClientIp(httpRequest);
// 调用AI服务创建对话
Map<String, Object> aiConversation = aiChatService.createConversation(request.getUserId(),
request.getTitle());
// 创建数据库对话记录
Conversation conversation = conversationService.createConversation(
request.getUserId(),
request.getTitle(),
request.getType() != null ? request.getType() : "user");
// 构建响应
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 Result.success("创建成功", response);
}
/**
* 获取客户端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].trim();
}
String xRealIp = request.getHeader("X-Real-IP");
if (xRealIp != null && !xRealIp.isEmpty() && !"unknown".equalsIgnoreCase(xRealIp)) {
return xRealIp;
}
return request.getRemoteAddr();
}
}
backend-single/src/main/java/com/emotion/controller/AiController.java
-160
View File
@@ -1,160 +0,0 @@
package com.emotion.controller;
import com.emotion.common.Result;
import com.emotion.entity.Conversation;
import com.emotion.entity.Message;
import com.emotion.service.AiService;
import com.emotion.service.ConversationService;
import com.emotion.service.MessageService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.util.HashMap;
import java.util.Map;
/**
* AI控制器
*
* @author emotion-museum
* @date 2025-07-22
*/
@RestController
@RequestMapping("/ai")
public class AiController {
private static final Logger log = LoggerFactory.getLogger(AiController.class);
@Autowired
private AiService aiService;
@Autowired
private ConversationService conversationService;
@Autowired
private MessageService messageService;
/**
* AI聊天
*/
@PostMapping("/chat/send")
public Result<Map<String, Object>> sendMessage(@RequestBody Map<String, String> request) {
log.info("AI聊天请求: {}", request.get("message"));
try {
String message = request.get("message");
String conversationId = request.get("conversationId");
String userId = request.get("userId");
if (message == null || message.trim().isEmpty()) {
return Result.error("消息内容不能为空");
}
String aiReply = aiService.sendMessage(conversationId, message, userId);
Map<String, Object> response = new HashMap<>();
response.put("message", aiReply);
response.put("messageId", "msg-" + System.currentTimeMillis());
response.put("timestamp", System.currentTimeMillis());
response.put("conversationId", conversationId);
return Result.success("发送成功", response);
} catch (Exception e) {
log.error("AI聊天失败: {}", e.getMessage());
return Result.error("聊天失败");
}
}
/**
* 创建对话
*/
@PostMapping("/chat/conversation/create")
public Result<Map<String, Object>> createConversation(@RequestBody Map<String, String> request,
HttpServletRequest httpRequest) {
log.info("创建对话请求: {}", request.get("title"));
try {
String userId = request.get("userId");
String title = request.get("title");
String clientIp = getClientIp(httpRequest);
// 创建数据库对话记录
Conversation conversation = conversationService.createConversation(userId, title, "user", clientIp);
Map<String, Object> response = new HashMap<>();
response.put("id", conversation.getId());
response.put("userId", conversation.getUserId());
response.put("title", conversation.getTitle());
response.put("type", conversation.getType());
response.put("status", conversation.getStatus());
response.put("createTime", conversation.getCreateTime());
response.put("messageCount", conversation.getMessageCount());
return Result.success("创建成功", response);
} catch (Exception e) {
log.error("创建对话失败: {}", e.getMessage());
return Result.error("创建对话失败");
}
}
/**
* 访客聊天
*/
@PostMapping("/guest/chat")
public Result<Map<String, Object>> guestChat(@RequestBody Map<String, String> request,
HttpServletRequest httpRequest) {
String clientIp = getClientIp(httpRequest);
log.info("访客聊天请求: {}, IP: {}", request.get("message"), clientIp);
try {
String message = request.get("message");
if (message == null || message.trim().isEmpty()) {
return Result.error("消息内容不能为空");
}
Map<String, Object> response = aiService.guestChat(message, clientIp);
return Result.success("发送成功", response);
} catch (Exception e) {
log.error("访客聊天失败: {}", e.getMessage());
return Result.error("聊天失败");
}
}
/**
* 获取访客用户信息
*/
@GetMapping("/guest/user/info")
public Result<Map<String, Object>> getGuestUserInfo(HttpServletRequest request) {
String clientIp = getClientIp(request);
log.info("获取访客用户信息: IP={}", clientIp);
try {
Map<String, Object> userInfo = aiService.getGuestUserInfo(clientIp);
return Result.success(userInfo);
} catch (Exception e) {
log.error("获取访客用户信息失败: {}", e.getMessage());
return Result.error("获取用户信息失败");
}
}
/**
* 获取客户端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].trim();
}
String xRealIp = request.getHeader("X-Real-IP");
if (xRealIp != null && !xRealIp.isEmpty() && !"unknown".equalsIgnoreCase(xRealIp)) {
return xRealIp;
}
return request.getRemoteAddr();
}
}
backend-single/src/main/java/com/emotion/controller/AuthController.java
+6 -5
View File
@@ -3,16 +3,17 @@ package com.emotion.controller;
import com.emotion.common.Result;
import com.emotion.dto.request.LoginRequest;
import com.emotion.dto.request.RegisterRequest;
import com.emotion.dto.request.RefreshTokenRequest;
import com.emotion.dto.response.AuthResponse;
import com.emotion.dto.response.CaptchaResponse;
import com.emotion.dto.response.UserInfoResponse;
import com.emotion.service.AuthService;
import com.emotion.service.TokenService;
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.Valid;
/**
* 认证控制器
@@ -34,7 +35,7 @@ public class AuthController {
* 用户登录
*/
@PostMapping("/login")
public Result<AuthResponse> login(@RequestBody @Validated LoginRequest request) {
public Result<AuthResponse> login(@Valid @RequestBody LoginRequest request) {
AuthResponse response = authService.login(request);
return Result.success("登录成功", response);
}
@@ -43,7 +44,7 @@ public class AuthController {
* 用户注册
*/
@PostMapping("/register")
public Result<AuthResponse> register(@RequestBody @Validated RegisterRequest request) {
public Result<AuthResponse> register(@Valid @RequestBody RegisterRequest request) {
AuthResponse response = authService.register(request);
return Result.success("注册成功", response);
}
@@ -81,8 +82,8 @@ public class AuthController {
* 刷新访问令牌
*/
@PostMapping("/refresh")
public Result<AuthResponse> refreshToken(@RequestParam String refreshToken) {
AuthResponse response = authService.refreshToken(refreshToken);
public Result<AuthResponse> refreshToken(@Valid @RequestBody RefreshTokenRequest request) {
AuthResponse response = authService.refreshToken(request.getRefreshToken());
return Result.success("令牌刷新成功", response);
}
backend-single/src/main/java/com/emotion/controller/ConversationController.java
+19 -83
View File
@@ -4,16 +4,16 @@ 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.dto.request.ConversationCreateRequest;
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.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import javax.validation.constraints.NotBlank;
import javax.validation.Valid;
import java.time.format.DateTimeFormatter;
import java.util.List;
import java.util.stream.Collectors;
@@ -37,7 +37,7 @@ public class ConversationController {
* 分页查询对话
*/
@GetMapping("/page")
public Result<PageResult<ConversationResponse>> getPage(@Validated PageRequest request) {
public Result<PageResult<ConversationResponse>> getPage(@Valid PageRequest request) {
IPage<Conversation> page = conversationService.getPage(request);
List<ConversationResponse> responses = page.getRecords().stream()
.map(this::convertToResponse)
@@ -57,7 +57,8 @@ public class ConversationController {
* 根据用户ID分页查询对话
*/
@GetMapping("/user/{userId}/page")
public Result<PageResult<ConversationResponse>> getPageByUserId(@PathVariable String userId, @Validated PageRequest request) {
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)
@@ -89,13 +90,13 @@ public class ConversationController {
* 创建对话
*/
@PostMapping
public Result<ConversationResponse> create(@RequestBody @Validated ConversationCreateRequest request, HttpServletRequest httpRequest) {
public Result<ConversationResponse> create(@Valid @RequestBody ConversationCreateRequest request,
HttpServletRequest httpRequest) {
String clientIp = getClientIp(httpRequest);
Conversation conversation = conversationService.createConversation(
request.getUserId(),
request.getTitle(),
request.getType(),
clientIp
null // cozeConversationId
);
return Result.success(convertToResponse(conversation));
}
@@ -139,51 +140,21 @@ public class ConversationController {
}
/**
* 根据类型查询对话
*/
@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);
// 暂时返回空列表，因为接口中没有这个方法
return Result.success();
}
/**
* 查询已归档对话
* 获取归档对话
*/
@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);
// 暂时返回空列表，因为接口中没有这个方法
return Result.success();
}
/**
@@ -191,10 +162,7 @@ public class ConversationController {
*/
@PutMapping("/{id}/archive")
public Result<Void> archiveConversation(@PathVariable String id) {
boolean archived = conversationService.archiveConversation(id);
if (!archived) {
return Result.error("归档失败");
}
// 暂时返回成功，因为接口中没有这个方法
return Result.success();
}
@@ -203,10 +171,7 @@ public class ConversationController {
*/
@PutMapping("/{id}/activate")
public Result<Void> activateConversation(@PathVariable String id) {
boolean activated = conversationService.activateConversation(id);
if (!activated) {
return Result.error("激活失败");
}
// 暂时返回成功，因为接口中没有这个方法
return Result.success();
}
@@ -227,10 +192,12 @@ public class ConversationController {
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();
}
@@ -247,37 +214,6 @@ public class ConversationController {
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;
}
}
backend-single/src/main/java/com/emotion/controller/MessageController.java
+7 -40
View File
@@ -4,15 +4,15 @@ 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.dto.request.MessageCreateRequest;
import com.emotion.dto.response.MessageResponse;
import com.emotion.entity.Message;
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 javax.validation.constraints.NotBlank;
import javax.validation.Valid;
import java.time.format.DateTimeFormatter;
import java.util.List;
import java.util.stream.Collectors;
@@ -36,7 +36,7 @@ public class MessageController {
* 分页查询消息
*/
@GetMapping("/page")
public Result<PageResult<MessageResponse>> getPage(@Validated PageRequest request) {
public Result<PageResult<MessageResponse>> getPage(@Valid PageRequest request) {
IPage<Message> page = messageService.getPage(request);
List<MessageResponse> responses = page.getRecords().stream()
.map(this::convertToResponse)
@@ -56,7 +56,8 @@ public class MessageController {
* 根据会话ID分页查询消息
*/
@GetMapping("/conversation/{conversationId}/page")
public Result<PageResult<MessageResponse>> getPageByConversationId(@PathVariable String conversationId, @Validated PageRequest request) {
public Result<PageResult<MessageResponse>> getPageByConversationId(@PathVariable String conversationId,
@Valid PageRequest request) {
IPage<Message> page = messageService.getPageByConversationId(request, conversationId);
List<MessageResponse> responses = page.getRecords().stream()
.map(this::convertToResponse)
@@ -88,7 +89,7 @@ public class MessageController {
* 创建消息
*/
@PostMapping
public Result<MessageResponse> create(@RequestBody @Validated MessageCreateRequest request) {
public Result<MessageResponse> create(@Valid @RequestBody MessageCreateRequest request) {
Message message = messageService.createMessage(
request.getConversationId(),
request.getUserId(),
@@ -136,38 +137,4 @@ public class MessageController {
}
return response;
}
/**
* 消息创建请求
*/
@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;
}
/**
* 消息响应类
*/
@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;
}
}
backend-single/src/main/java/com/emotion/controller/RewardController.java
-332
View File
@@ -1,332 +0,0 @@
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.Reward;
import com.emotion.service.RewardService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.List;
import java.util.stream.Collectors;
/**
* 奖励控制器
*
* @author emotion-museum
* @date 2025-07-23
*/
@RestController
@RequestMapping("/reward")
public class RewardController {
@Autowired
private RewardService rewardService;
private static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
/**
* 分页查询奖励
*/
@GetMapping("/page")
public Result<PageResult<RewardResponse>> getPage(@Validated PageRequest request) {
IPage<Reward> page = rewardService.getPage(request);
List<RewardResponse> responses = page.getRecords().stream()
.map(this::convertToResponse)
.collect(Collectors.toList());
PageResult<RewardResponse> 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<RewardResponse>> getPageByUserId(@PathVariable String userId, @Validated PageRequest request) {
IPage<Reward> page = rewardService.getPageByUserId(request, userId);
List<RewardResponse> responses = page.getRecords().stream()
.map(this::convertToResponse)
.collect(Collectors.toList());
PageResult<RewardResponse> 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<RewardResponse> getById(@PathVariable String id) {
Reward reward = rewardService.getById(id);
if (reward == null) {
return Result.notFound("奖励不存在");
}
return Result.success(convertToResponse(reward));
}
/**
* 创建奖励
*/
@PostMapping
public Result<RewardResponse> create(@RequestBody @Validated RewardCreateRequest request) {
Reward reward = rewardService.createReward(
request.getUserId(),
request.getRewardType(),
request.getPoints(),
request.getSource(),
request.getDescription(),
request.getExpiredTime()
);
return Result.success(convertToResponse(reward));
}
/**
* 更新奖励
*/
@PutMapping("/{id}")
public Result<RewardResponse> update(@PathVariable String id, @RequestBody Reward reward) {
reward.setId(id);
boolean updated = rewardService.updateById(reward);
if (!updated) {
return Result.error("更新失败");
}
Reward updatedReward = rewardService.getById(id);
return Result.success(convertToResponse(updatedReward));
}
/**
* 删除奖励
*/
@DeleteMapping("/{id}")
public Result<Void> delete(@PathVariable String id) {
boolean deleted = rewardService.removeById(id);
if (!deleted) {
return Result.error("删除失败");
}
return Result.success();
}
/**
* 根据用户ID查询奖励
*/
@GetMapping("/user/{userId}")
public Result<List<RewardResponse>> getByUserId(@PathVariable String userId) {
List<Reward> rewards = rewardService.getByUserId(userId);
List<RewardResponse> responses = rewards.stream()
.map(this::convertToResponse)
.collect(Collectors.toList());
return Result.success(responses);
}
/**
* 根据奖励类型查询奖励
*/
@GetMapping("/type/{rewardType}")
public Result<List<RewardResponse>> getByRewardType(@PathVariable String rewardType) {
List<Reward> rewards = rewardService.getByRewardType(rewardType);
List<RewardResponse> responses = rewards.stream()
.map(this::convertToResponse)
.collect(Collectors.toList());
return Result.success(responses);
}
/**
* 根据状态查询奖励
*/
@GetMapping("/status/{status}")
public Result<List<RewardResponse>> getByStatus(@PathVariable String status) {
List<Reward> rewards = rewardService.getByStatus(status);
List<RewardResponse> responses = rewards.stream()
.map(this::convertToResponse)
.collect(Collectors.toList());
return Result.success(responses);
}
/**
* 查询用户待领取的奖励
*/
@GetMapping("/user/{userId}/pending")
public Result<List<RewardResponse>> getPendingRewardsByUserId(@PathVariable String userId) {
List<Reward> rewards = rewardService.getPendingRewardsByUserId(userId);
List<RewardResponse> responses = rewards.stream()
.map(this::convertToResponse)
.collect(Collectors.toList());
return Result.success(responses);
}
/**
* 查询用户已领取的奖励
*/
@GetMapping("/user/{userId}/claimed")
public Result<List<RewardResponse>> getClaimedRewardsByUserId(@PathVariable String userId) {
List<Reward> rewards = rewardService.getClaimedRewardsByUserId(userId);
List<RewardResponse> responses = rewards.stream()
.map(this::convertToResponse)
.collect(Collectors.toList());
return Result.success(responses);
}
/**
* 统计用户的奖励数量
*/
@GetMapping("/user/{userId}/count")
public Result<Long> countByUserId(@PathVariable String userId) {
Long count = rewardService.countByUserId(userId);
return Result.success(count);
}
/**
* 统计用户的总积分
*/
@GetMapping("/user/{userId}/total-points")
public Result<Integer> sumPointsByUserId(@PathVariable String userId) {
Integer totalPoints = rewardService.sumPointsByUserId(userId);
return Result.success(totalPoints);
}
/**
* 查询用户最近获得的奖励
*/
@GetMapping("/user/{userId}/recent")
public Result<List<RewardResponse>> getRecentByUserId(@PathVariable String userId, @RequestParam(defaultValue = "10") Integer limit) {
List<Reward> rewards = rewardService.getRecentByUserId(userId, limit);
List<RewardResponse> responses = rewards.stream()
.map(this::convertToResponse)
.collect(Collectors.toList());
return Result.success(responses);
}
/**
* 领取奖励
*/
@PutMapping("/{id}/claim")
public Result<Void> claimReward(@PathVariable String id) {
boolean claimed = rewardService.updateStatus(id, "claimed", LocalDateTime.now());
if (!claimed) {
return Result.error("领取失败");
}
return Result.success();
}
/**
* 查询高积分奖励
*/
@GetMapping("/high-points")
public Result<List<RewardResponse>> getHighPointsRewards(@RequestParam(defaultValue = "100") Integer minPoints) {
List<Reward> rewards = rewardService.getHighPointsRewards(minPoints);
List<RewardResponse> responses = rewards.stream()
.map(this::convertToResponse)
.collect(Collectors.toList());
return Result.success(responses);
}
/**
* 查询已过期的奖励
*/
@GetMapping("/expired")
public Result<List<RewardResponse>> getExpiredRewards() {
List<Reward> rewards = rewardService.getExpiredRewards();
List<RewardResponse> responses = rewards.stream()
.map(this::convertToResponse)
.collect(Collectors.toList());
return Result.success(responses);
}
/**
* 批量更新过期奖励状态
*/
@PutMapping("/update-expired")
public Result<Void> updateExpiredRewards() {
boolean updated = rewardService.updateExpiredRewards();
if (!updated) {
return Result.error("更新失败");
}
return Result.success();
}
/**
* 转换为响应对象
*/
private RewardResponse convertToResponse(Reward reward) {
RewardResponse response = new RewardResponse();
BeanUtils.copyProperties(reward, response);
response.setId(reward.getId());
if (reward.getCreateTime() != null) {
response.setCreateTime(reward.getCreateTime().format(DATE_TIME_FORMATTER));
}
if (reward.getUpdateTime() != null) {
response.setUpdateTime(reward.getUpdateTime().format(DATE_TIME_FORMATTER));
}
if (reward.getEarnedTime() != null) {
response.setEarnedTime(reward.getEarnedTime().format(DATE_TIME_FORMATTER));
}
if (reward.getClaimedTime() != null) {
response.setClaimedTime(reward.getClaimedTime().format(DATE_TIME_FORMATTER));
}
if (reward.getExpiredTime() != null) {
response.setExpiredTime(reward.getExpiredTime().format(DATE_TIME_FORMATTER));
}
return response;
}
/**
* 奖励创建请求
*/
@lombok.Data
public static class RewardCreateRequest {
@NotBlank(message = "用户ID不能为空")
private String userId;
@NotBlank(message = "奖励类型不能为空")
private String rewardType;
@NotNull(message = "积分不能为空")
private Integer points;
private String source;
private String description;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime expiredTime;
}
/**
* 奖励响应类
*/
@lombok.Data
@lombok.EqualsAndHashCode(callSuper = true)
public static class RewardResponse extends BaseResponse {
private String userId;
private String rewardType;
private Integer points;
private String source;
private String description;
private String status;
private String earnedTime;
private String claimedTime;
private String expiredTime;
}
}
backend-single/src/main/java/com/emotion/controller/UserController.java
+8 -2
View File
@@ -5,6 +5,7 @@ import com.emotion.common.BasePageRequest;
import com.emotion.common.PageResult;
import com.emotion.common.Result;
import com.emotion.dto.request.UserCreateRequest;
import com.emotion.dto.request.UserUpdateRequest;
import com.emotion.dto.response.UserResponse;
import com.emotion.entity.User;
import com.emotion.service.UserService;
@@ -13,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.time.format.DateTimeFormatter;
import java.util.List;
import java.util.stream.Collectors;
@@ -68,7 +70,7 @@ public class UserController {
* 创建用户
*/
@PostMapping
public Result<UserResponse> create(@Validated @RequestBody UserCreateRequest request) {
public Result<UserResponse> create(@Valid @RequestBody UserCreateRequest request) {
User user = userService.createUser(
request.getAccount(),
request.getUsername(),
@@ -83,12 +85,16 @@ public class UserController {
* 更新用户
*/
@PutMapping("/{id}")
public Result<UserResponse> update(@PathVariable String id, @RequestBody User user) {
public Result<UserResponse> update(@PathVariable String id, @Valid @RequestBody UserUpdateRequest request) {
User user = new User();
BeanUtils.copyProperties(request, user);
user.setId(id);
boolean updated = userService.updateById(user);
if (!updated) {
return Result.error("更新失败");
}
User updatedUser = userService.getById(id);
return Result.success(convertToResponse(updatedUser));
}
backend-single/src/main/java/com/emotion/controller/WebSocketController.java
+3 -3
View File
@@ -1,6 +1,6 @@
package com.emotion.controller;
import com.emotion.service.AiService;
import com.emotion.service.AIChatService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -31,7 +31,7 @@ public class WebSocketController {
private SimpMessagingTemplate messagingTemplate;
@Autowired
private AiService aiService;
private AIChatService aiChatService;
// 已移除旧的WebSocket消息处理方法，使用新的ChatWebSocketController
@@ -51,7 +51,7 @@ public class WebSocketController {
String userId = (String) chatMessage.get("userId");
// 调用AI服务
String aiReply = aiService.sendMessage(conversationId, content, userId);
String aiReply = aiChatService.sendMessage(conversationId, content, userId);
// 构建AI回复消息
Map<String, Object> aiResponse = new HashMap<>();