From 56f0cc7293f0672ab5291a56ac9aea7b8fd0bf28 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 22 五月 2026 10:25:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/ai/controller/PurchaseAiController.java | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/ruoyi/ai/controller/PurchaseAiController.java b/src/main/java/com/ruoyi/ai/controller/PurchaseAiController.java
index e1e605e..158ea61 100644
--- a/src/main/java/com/ruoyi/ai/controller/PurchaseAiController.java
+++ b/src/main/java/com/ruoyi/ai/controller/PurchaseAiController.java
@@ -6,10 +6,17 @@
import com.ruoyi.common.utils.SecurityUtils;
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 io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
import reactor.core.publisher.Flux;
@@ -42,28 +49,28 @@
@Operation(summary = "閲囪喘澶氭枃浠跺垎鏋愮‘璁ゅ鐞�")
@PostMapping("/analyze-files/confirm")
- public R confirmAnalyzeResult(@RequestBody PurchaseAiConfirmRequest request) {
+ public AjaxResult confirmAnalyzeResult(@RequestBody PurchaseAiConfirmRequest request) {
return purchaseAiService.confirmAnalyzeResult(request);
}
@Operation(summary = "閲囪喘浼氳瘽鍒楄〃")
@GetMapping("/history/sessions")
- public R listSessions() {
+ public AjaxResult listSessions() {
LoginUser loginUser = SecurityUtils.getLoginUser();
- return R.ok(purchaseAiService.listSessions(loginUser));
+ return success(purchaseAiService.listSessions(loginUser));
}
@Operation(summary = "閲囪喘浼氳瘽娑堟伅")
@GetMapping("/history/messages/{memoryId}")
- public R listMessages(@PathVariable String memoryId) {
+ public AjaxResult listMessages(@PathVariable String memoryId) {
LoginUser loginUser = SecurityUtils.getLoginUser();
- return R.ok(purchaseAiService.listMessages(memoryId, loginUser));
+ return success(purchaseAiService.listMessages(memoryId, loginUser));
}
@Operation(summary = "鍒犻櫎閲囪喘浼氳瘽")
@DeleteMapping("/history/{memoryId}")
- public R deleteSession(@PathVariable String memoryId) {
+ public AjaxResult deleteSession(@PathVariable String memoryId) {
LoginUser loginUser = SecurityUtils.getLoginUser();
- return R.ok(purchaseAiService.deleteSession(memoryId, loginUser));
+ return toAjax(purchaseAiService.deleteSession(memoryId, loginUser));
}
}
--
Gitblit v1.9.3