From 4d4394311a96e15ea204e2cae03dda00750d0fdd Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 11 四月 2025 17:37:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/src/main/java/com/doumee/api/business/CategoryController.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/server/src/main/java/com/doumee/api/business/CategoryController.java b/server/src/main/java/com/doumee/api/business/CategoryController.java
index f06804a..b69a568 100644
--- a/server/src/main/java/com/doumee/api/business/CategoryController.java
+++ b/server/src/main/java/com/doumee/api/business/CategoryController.java
@@ -15,7 +15,6 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
import java.util.List;
/**
@@ -68,12 +67,18 @@
public ApiResponse<PageData<Category>> findPage (@RequestBody PageWrap<Category> pageWrap) {
return ApiResponse.success(categoryService.findPage(pageWrap));
}
+ @ApiOperation("鍒嗛〉鏌ヨ")
+ @PostMapping("/list")
+ @RequiresPermissions("business:category:query")
+ public ApiResponse<List<Category>> findList (@RequestBody Category pageWrap) {
+ return ApiResponse.success(categoryService.findList(pageWrap));
+ }
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
@RequiresPermissions("business:category:exportExcel")
public void exportExcel (@RequestBody PageWrap<Category> pageWrap, HttpServletResponse response) {
- ExcelExporter.build(Category.class).exportData(categoryService.findPage(pageWrap).getRecords(), "鍒嗙被淇℃伅琛�", response);
+ ExcelExporter.build(Category.class).export(categoryService.findPage(pageWrap).getRecords(), "鍒嗙被淇℃伅琛�", response);
}
@ApiOperation("鏍规嵁ID鏌ヨ")
@@ -82,4 +87,13 @@
public ApiResponse findById(@PathVariable Integer id) {
return ApiResponse.success(categoryService.findById(id));
}
+
+
+ @ApiOperation("鍒嗙被鏍戞煡璇�")
+ @PostMapping("/tree")
+ @RequiresPermissions("business:category:query")
+ public ApiResponse<List<Category>> tree (@RequestBody Category param){
+ return ApiResponse.success(categoryService.treeList(param));
+ }
+
}
--
Gitblit v1.9.3