From 9f3cd3d14b2025c79296ff6cbc49d7efe3302ec5 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Wed, 05 Nov 2025 16:58:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-admin/src/main/java/com/ard/web/controller/route/ArdRouteFileController.java | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/ard-admin/src/main/java/com/ard/web/controller/route/ArdRouteFileController.java b/ard-admin/src/main/java/com/ard/web/controller/route/ArdRouteFileController.java
index 8012075..3b5ee50 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/route/ArdRouteFileController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/route/ArdRouteFileController.java
@@ -3,6 +3,7 @@
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+import com.alibaba.fastjson2.JSON;
import com.ard.common.annotation.Log;
import com.ard.common.core.controller.BaseController;
import com.ard.common.core.domain.AjaxResult;
@@ -13,16 +14,10 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ard.route.domain.ArdRouteFile;
+import org.springframework.web.bind.annotation.*;
+import com.ard.route.domain.route.ArdRouteFile;
import com.ard.route.service.IArdRouteFileService;
+import org.springframework.web.multipart.MultipartFile;
/**
* 文件Controller
@@ -32,7 +27,7 @@
*/
@Api(tags = "文件")
@RestController
-@RequestMapping("/file")
+@RequestMapping("/route/file")
public class ArdRouteFileController extends BaseController {
@Autowired
@@ -79,9 +74,15 @@
@ApiOperation("新增文件")
@PreAuthorize("@ss.hasPermi('route:file:add')")
@Log(title = "文件", businessType = BusinessType.INSERT)
- @PostMapping
- public AjaxResult add(@RequestBody ArdRouteFile ardRouteFile) {
- return toAjax(ardRouteFileService.insertArdRouteFile(ardRouteFile));
+ //@PostMapping("/addFile/{folderId}")
+ @PostMapping("/addFile")
+ public AjaxResult add(@RequestPart("file") MultipartFile file)
+ //@PathVariable String folderId)
+ {
+ ArdRouteFile ardRouteFile = new ArdRouteFile();
+ ardRouteFile.setCreateBy(getUsername());
+ //ardRouteFile.setFolderId(folderId);
+ return toAjax(ardRouteFileService.insertArdRouteFile(ardRouteFile, file));
}
/**
@@ -92,6 +93,7 @@
@Log(title = "文件", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody ArdRouteFile ardRouteFile) {
+ ardRouteFile.setUpdateBy(getUsername());
return toAjax(ardRouteFileService.updateArdRouteFile(ardRouteFile));
}
--
Gitblit v1.9.3