From 967e12a05e1a1cb0c595a379c55c5ecc71dd03a9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 22 九月 2023 09:08:32 +0800
Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/preselect into dev
---
server/platform/src/main/java/com/doumee/api/business/BaseCategoryController.java | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/server/platform/src/main/java/com/doumee/api/business/BaseCategoryController.java b/server/platform/src/main/java/com/doumee/api/business/BaseCategoryController.java
index 21b8acb..edd851c 100644
--- a/server/platform/src/main/java/com/doumee/api/business/BaseCategoryController.java
+++ b/server/platform/src/main/java/com/doumee/api/business/BaseCategoryController.java
@@ -7,6 +7,7 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.model.PageData;
import com.doumee.dao.business.model.BaseCategory;
+import com.doumee.dao.business.model.Category;
import com.doumee.dao.business.model.dto.BaseCategoryRequest;
import com.doumee.service.business.BaseCategoryService;
import io.swagger.annotations.Api;
@@ -34,7 +35,7 @@
@PreventRepeat
@ApiOperation("鏂板缓")
@PostMapping("/create")
-// @RequiresPermissions("business:basecategory:create")
+ @RequiresPermissions("business:basecategory:create")
public ApiResponse create(@RequestBody BaseCategoryRequest baseCategory) {
return ApiResponse.success(baseCategoryService.create(baseCategory));
}
@@ -61,10 +62,17 @@
}
@ApiOperation(value = "鏍规嵁ID淇敼-鍒楄〃灞炴�т慨鏀�")
- @PostMapping("/updateById")
-// @RequiresPermissions("business:basecategory:update")
+ @PostMapping("/updateByIdOrigin")
+ @RequiresPermissions("business:basecategory:update")
public ApiResponse updateById(@RequestBody BaseCategory baseCategory) {
baseCategoryService.updateById(baseCategory);
+ return ApiResponse.success(null);
+ }
+ @ApiOperation("淇敼鐘舵��")
+ @PostMapping("/updateDisableById")
+ @RequiresPermissions("business:basecategory:update")
+ public ApiResponse updateDisableById(@RequestBody BaseCategory category) {
+ baseCategoryService.updateDisableById(category);
return ApiResponse.success(null);
}
@@ -74,16 +82,16 @@
* @param baseCategory 瀹炰綋瀵硅薄
*/
@ApiOperation("鏍规嵁ID淇敼-缂栬緫淇敼")
- @PostMapping("/update")
-// @RequiresPermissions("business:basecategory:update")
+ @PostMapping("/updateById")
+ @RequiresPermissions("business:basecategory:update")
public ApiResponse update(@RequestBody BaseCategoryRequest baseCategory){
baseCategoryService.update(baseCategory);
return ApiResponse.success(null);
}
- @ApiOperation("鍒嗛〉鏌ヨ")
+ @ApiOperation("鍒嗛〉鏌ヨ`")
@PostMapping("/page")
-// @RequiresPermissions("business:basecategory:query")
+ @RequiresPermissions("business:basecategory:query")
public ApiResponse<PageData<BaseCategory>> findPage (@RequestBody PageWrap<BaseCategory> pageWrap) {
return ApiResponse.success(baseCategoryService.findPage(pageWrap));
}
@@ -97,7 +105,7 @@
@ApiOperation("鏍规嵁ID鏌ヨ")
@GetMapping("/{id}")
-// @RequiresPermissions("business:basecategory:query")
+ @RequiresPermissions("business:basecategory:query")
public ApiResponse findById(@PathVariable Integer id) {
return ApiResponse.success(baseCategoryService.findById(id));
}
--
Gitblit v1.9.3