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/ArdRouteFolderController.java | 32 ++++++++++++++++++++++----------
1 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/ard-admin/src/main/java/com/ard/web/controller/route/ArdRouteFolderController.java b/ard-admin/src/main/java/com/ard/web/controller/route/ArdRouteFolderController.java
index b41e8c2..c405cd5 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/route/ArdRouteFolderController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/route/ArdRouteFolderController.java
@@ -1,6 +1,7 @@
package com.ard.web.controller.route;
import java.util.List;
+import java.util.Map;
import javax.servlet.http.HttpServletResponse;
import com.ard.common.annotation.Log;
@@ -21,7 +22,7 @@
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.ArdRouteFolder;
+import com.ard.route.domain.route.ArdRouteFolder;
import com.ard.route.service.IArdRouteFolderService;
/**
@@ -32,7 +33,7 @@
*/
@Api(tags = "文件夹")
@RestController
-@RequestMapping("/folder")
+@RequestMapping("/route/folder")
public class ArdRouteFolderController extends BaseController {
@Autowired
@@ -42,10 +43,10 @@
* 查询文件夹列表
*/
@ApiOperation("查询文件夹列表")
- @PreAuthorize("@ss.hasPermi('route:folder:list')")
+ //@PreAuthorize("@ss.hasPermi('route:folder:list')")
@GetMapping("/list")
public TableDataInfo list(ArdRouteFolder ardRouteFolder) {
- startPage();
+ //startPage();
List<ArdRouteFolder> list = ardRouteFolderService.selectArdRouteFolderList(ardRouteFolder);
return getDataTable(list);
}
@@ -54,7 +55,7 @@
* 导出文件夹列表
*/
@ApiOperation("导出文件夹列表")
- @PreAuthorize("@ss.hasPermi('route:folder:export')")
+ //@PreAuthorize("@ss.hasPermi('route:folder:export')")
@Log(title = "文件夹", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, ArdRouteFolder ardRouteFolder) {
@@ -67,7 +68,7 @@
* 获取文件夹详细信息
*/
@ApiOperation("获取文件夹详细信息")
- @PreAuthorize("@ss.hasPermi('route:folder:query')")
+ //@PreAuthorize("@ss.hasPermi('route:folder:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") String id) {
return success(ardRouteFolderService.selectArdRouteFolderById(id));
@@ -77,10 +78,11 @@
* 新增文件夹
*/
@ApiOperation("新增文件夹")
- @PreAuthorize("@ss.hasPermi('route:folder:add')")
+ //@PreAuthorize("@ss.hasPermi('route:folder:add')")
@Log(title = "文件夹", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody ArdRouteFolder ardRouteFolder) {
+ ardRouteFolder.setCreateBy(getUsername());
return toAjax(ardRouteFolderService.insertArdRouteFolder(ardRouteFolder));
}
@@ -88,10 +90,11 @@
* 修改文件夹
*/
@ApiOperation("修改文件夹")
- @PreAuthorize("@ss.hasPermi('route:folder:edit')")
+ //@PreAuthorize("@ss.hasPermi('route:folder:edit')")
@Log(title = "文件夹", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody ArdRouteFolder ardRouteFolder) {
+ ardRouteFolder.setUpdateBy(getUsername());
return toAjax(ardRouteFolderService.updateArdRouteFolder(ardRouteFolder));
}
@@ -99,10 +102,19 @@
* 删除文件夹
*/
@ApiOperation("删除文件夹")
- @PreAuthorize("@ss.hasPermi('route:folder:remove')")
+ //@PreAuthorize("@ss.hasPermi('route:folder:remove')")
@Log(title = "文件夹", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable String[] ids) {
- return toAjax(ardRouteFolderService.deleteArdRouteFolderByIds(ids));
+ try {
+ Map<String, Integer> result = ardRouteFolderService.deleteArdRouteFolderByIds(ids);
+ if (!result.isEmpty()) {
+ return AjaxResult.success("删除成功.文件夹删除" + result.get("folder") + "文件删除" + result.get("file"));
+ } else {
+ return AjaxResult.success("没有删除文件夹信息。");
+ }
+ } catch(Exception e){
+ return AjaxResult.error(e.getMessage());
+ }
}
}
--
Gitblit v1.9.3