diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaAiController.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaAiController.java index f0bc958..6650af4 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaAiController.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaAiController.java @@ -3,6 +3,7 @@ package com.ruoyi.oa.controller; import java.util.*; import com.ruoyi.common.helper.LoginHelper; +import com.ruoyi.oa.domain.bo.OaAiChatBo; import lombok.RequiredArgsConstructor; import javax.servlet.http.HttpServletResponse; import javax.validation.constraints.*; @@ -227,32 +228,32 @@ public class SysOaAiController extends BaseController { * 发送消息给AI */ @PostMapping("/chat") - public R> chat(@RequestParam Long conversationId, @RequestParam String message) { + public R> chat(@RequestBody OaAiChatBo bo) { try { // 1. 保存用户消息 - messageService.addUserMessage(conversationId, message); + messageService.addUserMessage(bo.getConversationId(), bo.getMessage()); // 2. 获取对话历史(优先从Redis缓存获取) - List conversationHistory = aiServiceUtil.getCachedConversationHistory(conversationId); + List conversationHistory = aiServiceUtil.getCachedConversationHistory(bo.getConversationId()); if (conversationHistory == null) { // 缓存中没有,从数据库获取 - conversationHistory = messageService.queryByConversationId(conversationId); + conversationHistory = messageService.queryByConversationId(bo.getConversationId()); // 缓存对话历史 - aiServiceUtil.cacheConversationHistory(conversationId, conversationHistory); + aiServiceUtil.cacheConversationHistory(bo.getConversationId(), conversationHistory); } // 3. 调用AI服务获取回复(传递对话历史) - String aiResponse = callAiServiceWithHistory(message, conversationHistory); + String aiResponse = callAiServiceWithHistory(bo.getMessage(), conversationHistory); // 4. 保存AI回复 - messageService.addAiMessage(conversationId, aiResponse, 0, java.math.BigDecimal.ZERO); + messageService.addAiMessage(bo. getConversationId(), aiResponse, 0, java.math.BigDecimal.ZERO); // 5. 更新对话历史缓存 - List updatedHistory = messageService.queryByConversationId(conversationId); - aiServiceUtil.cacheConversationHistory(conversationId, updatedHistory); + List updatedHistory = messageService.queryByConversationId(bo.getConversationId()); + aiServiceUtil.cacheConversationHistory(bo.getConversationId(), updatedHistory); Map result = new HashMap<>(); - result.put("conversationId", conversationId); + result.put("conversationId", bo.getConversationId()); result.put("response", aiResponse); return R.ok(result); diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaAiChatBo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaAiChatBo.java new file mode 100644 index 0000000..6086ca9 --- /dev/null +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaAiChatBo.java @@ -0,0 +1,9 @@ +package com.ruoyi.oa.domain.bo; + +import lombok.Data; + +@Data +public class OaAiChatBo { + Long conversationId; + String message; +}