From d06ef3f44d6dc19dae223ab420165369ea13cc16 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 20 五月 2026 16:29:35 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro
---
src/main/java/com/ruoyi/ai/controller/ManufacturingAiController.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ruoyi/ai/controller/ManufacturingAiController.java b/src/main/java/com/ruoyi/ai/controller/ManufacturingAiController.java
index cb7c0ba..8e2948e 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.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import dev.langchain4j.data.message.AiMessage;
import dev.langchain4j.data.message.UserMessage;
import io.swagger.v3.oas.annotations.Operation;
@@ -83,20 +83,21 @@
@Operation(summary = "鍒堕�犱細璇濆垪琛�")
@GetMapping("/history/sessions")
- public AjaxResult listSessions() {
- return success(aiChatSessionService.listCurrentUserSessions(SecurityUtils.getLoginUser()));
+ public R<?> listSessions() {
+ return R.ok(aiChatSessionService.listCurrentUserSessions(SecurityUtils.getLoginUser()));
}
@Operation(summary = "鍒堕�犱細璇濇秷鎭�")
@GetMapping("/history/messages/{memoryId}")
- public AjaxResult listMessages(@PathVariable String memoryId) {
- return success(aiChatSessionService.listCurrentUserMessages(memoryId, SecurityUtils.getLoginUser()));
+ public R<?> listMessages(@PathVariable String memoryId) {
+ return R.ok(aiChatSessionService.listCurrentUserMessages(memoryId, SecurityUtils.getLoginUser()));
}
@Operation(summary = "鍒犻櫎鍒堕�犱細璇�")
@DeleteMapping("/history/{memoryId}")
- public AjaxResult deleteSession(@PathVariable String memoryId) {
+ public R<?> deleteSession(@PathVariable String memoryId) {
aiSessionUserContext.remove(memoryId);
- return toAjax(aiChatSessionService.deleteCurrentUserSession(memoryId, SecurityUtils.getLoginUser()));
+ aiChatSessionService.deleteCurrentUserSession(memoryId, SecurityUtils.getLoginUser());
+ return R.ok();
}
}
--
Gitblit v1.9.3