From 620bb4712a31791231c4381581f0f60088f079fe Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 27 五月 2026 14:03:45 +0800
Subject: [PATCH] Merge branch 'refs/heads/dev_New_pro' into dev_宁夏_英泽防锈
---
src/main/java/com/ruoyi/ai/controller/SalesAiController.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/ai/controller/SalesAiController.java b/src/main/java/com/ruoyi/ai/controller/SalesAiController.java
index b6ca0e9..0c92ad6 100644
--- a/src/main/java/com/ruoyi/ai/controller/SalesAiController.java
+++ b/src/main/java/com/ruoyi/ai/controller/SalesAiController.java
@@ -10,7 +10,7 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.security.LoginUser;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import dev.langchain4j.data.message.AiMessage;
import dev.langchain4j.data.message.UserMessage;
import io.swagger.v3.oas.annotations.Operation;
@@ -99,22 +99,21 @@
@Operation(summary = "閿�鍞姪鎵嬩細璇濆垪琛�")
@GetMapping("/history/sessions")
- public R<?> listSessions() {
- return R.ok(aiChatSessionService.listCurrentUserSessions(SecurityUtils.getLoginUser()));
+ public AjaxResult listSessions() {
+ return success(aiChatSessionService.listCurrentUserSessions(SecurityUtils.getLoginUser()));
}
@Operation(summary = "閿�鍞姪鎵嬩細璇濇秷鎭�")
@GetMapping("/history/messages/{memoryId}")
- public R<?> listMessages(@PathVariable String memoryId) {
- return R.ok(aiChatSessionService.listCurrentUserMessages(memoryId, SecurityUtils.getLoginUser()));
+ public AjaxResult listMessages(@PathVariable String memoryId) {
+ return success(aiChatSessionService.listCurrentUserMessages(memoryId, SecurityUtils.getLoginUser()));
}
@Operation(summary = "鍒犻櫎閿�鍞姪鎵嬩細璇�")
@DeleteMapping("/history/{memoryId}")
- public R<?> deleteSession(@PathVariable String memoryId) {
+ public AjaxResult deleteSession(@PathVariable String memoryId) {
aiSessionUserContext.remove(memoryId);
- aiChatSessionService.deleteCurrentUserSession(memoryId, SecurityUtils.getLoginUser());
- return R.ok();
+ return toAjax(aiChatSessionService.deleteCurrentUserSession(memoryId, SecurityUtils.getLoginUser()));
}
private boolean isBusinessDataIntent(String message) {
--
Gitblit v1.9.3