From a7dd93b840bdce4bd0011bc948157f440514a207 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 28 四月 2026 16:36:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/basic/controller/StorageAttachmentController.java | 17 ++++++-----------
1 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/controller/StorageAttachmentController.java b/src/main/java/com/ruoyi/basic/controller/StorageAttachmentController.java
index 730201d..d79f911 100644
--- a/src/main/java/com/ruoyi/basic/controller/StorageAttachmentController.java
+++ b/src/main/java/com/ruoyi/basic/controller/StorageAttachmentController.java
@@ -18,19 +18,18 @@
@RestController
@AllArgsConstructor
-@RequestMapping("/basic/storage_attachment")
+ @RequestMapping("/basic/storage_attachment")
public class StorageAttachmentController {
private StorageAttachmentService storageAttachmentService;
/**
* 鍒嗛〉鏌ヨ閫氱敤鏂囦欢涓婁紶鐨勯檮浠朵俊鎭�
- * @param page 鍒嗛〉鍙傛暟
* @param storageAttachmentDTO 鍏宠仈璁板綍淇℃伅
* @return 鍒嗛〉缁撴灉
*/
- @GetMapping("/listPage")
- public R listPage(Page page, StorageAttachmentDTO storageAttachmentDTO) {
- return R.ok(storageAttachmentService.listPage(page, storageAttachmentDTO));
+ @GetMapping("/list")
+ public R list(StorageAttachmentDTO storageAttachmentDTO) {
+ return R.ok(storageAttachmentService.list(storageAttachmentDTO));
}
/**
@@ -45,14 +44,10 @@
/**
* 淇濆瓨閫氱敤鏂囦欢涓婁紶鐨勯檮浠朵俊鎭�
- * @param storageBlobs 鏂囦欢淇℃伅鍒楄〃
- * @param recordId 绠＄悊璁板綍id
- * @param recordType 鍏宠仈璁板綍绫诲瀷
- * @param fileType 鏂囦欢绫诲瀷
*/
@PostMapping("/add")
- public R add(@RequestBody List<StorageBlobDTO> storageBlobs, Long recordId, String recordType, String fileType) {
- storageAttachmentService.saveStorageAttachment(storageBlobs, recordId, recordType, fileType);
+ public R add(@RequestBody StorageAttachmentDTO storageAttachmentDTO) {
+ storageAttachmentService.saveStorageAttachment(storageAttachmentDTO);
return R.ok();
}
}
--
Gitblit v1.9.3