From b5d5cb947a194ceb34cd2797ab077f1484989305 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 21 五月 2026 11:39:31 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' into dev_New_pro_财务
---
src/main/java/com/ruoyi/ai/controller/ManufacturingAiController.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/ai/controller/ManufacturingAiController.java b/src/main/java/com/ruoyi/ai/controller/ManufacturingAiController.java
index 8e2948e..cb7c0ba 100644
--- a/src/main/java/com/ruoyi/ai/controller/ManufacturingAiController.java
+++ b/src/main/java/com/ruoyi/ai/controller/ManufacturingAiController.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;
@@ -83,21 +83,20 @@
@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()));
}
}
--
Gitblit v1.9.3