From c9f07c1f79e7ea9eb00925975d3ae2c9e8dcbd25 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期三, 20 三月 2024 11:37:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
server/company/src/main/java/com/doumee/api/system/SystemMenuController.java | 66 +-------------------------------
1 files changed, 3 insertions(+), 63 deletions(-)
diff --git a/server/company/src/main/java/com/doumee/api/system/SystemMenuController.java b/server/company/src/main/java/com/doumee/api/system/SystemMenuController.java
index 797483a..3067e64 100644
--- a/server/company/src/main/java/com/doumee/api/system/SystemMenuController.java
+++ b/server/company/src/main/java/com/doumee/api/system/SystemMenuController.java
@@ -6,6 +6,7 @@
import com.doumee.core.constants.OperaType;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.LoginUserInfo;
+import com.doumee.core.utils.Constants;
import com.doumee.dao.system.dto.UpdateSystemMenuSortDTO;
import com.doumee.dao.system.model.SystemMenu;
import com.doumee.dao.system.vo.SystemMenuListVO;
@@ -32,80 +33,19 @@
@Autowired
private SystemMenuBiz systemMenuBiz;
- @ApiOperation("鑿滃崟鎺掑簭")
- @PostMapping("/updateSort")
- @RequiresPermissions("system:menu:sort")
- public ApiResponse updateSort (@Validated @RequestBody UpdateSystemMenuSortDTO dto) {
- systemMenuBiz.updateSort(dto);
- return ApiResponse.success(null);
- }
-
@ApiOperation("鏌ヨ鑿滃崟鏍�")
@GetMapping("/treeNodes")
public ApiResponse<List<SystemMenuNodeVO>> getTreeMenu () {
LoginUserInfo loginUserInfo = this.getLoginUser();
- return ApiResponse.success(systemMenuBiz.findTree(loginUserInfo.getId(),loginUserInfo.getType()));
+ return ApiResponse.success(systemMenuBiz.findTree(loginUserInfo.getId(), Constants.ONE));
}
-
-// @ApiOperation("鏌ヨ鍒楄〃鏍�")
-// @PostMapping("/treeList")
-// @RequiresPermissions("system:menu:query")
-// public ApiResponse<List<SystemMenuListVO>> findTree () {
-// LoginUserInfo loginUserInfo = this.getLoginUser();
-// return ApiResponse.success(systemMenuBiz.findTreeByType(loginUserInfo.getType()));
-// }
-
@ApiOperation("鏌ヨ鍒楄〃鏍�")
@PostMapping("/treeList/{type}")
@RequiresPermissions("system:menu:query")
public ApiResponse<List<SystemMenuListVO>> treeList (@PathVariable Integer type) {
- return ApiResponse.success(systemMenuBiz.findTreeByType(type));
+ return ApiResponse.success(systemMenuBiz.findTreeByType(Constants.ONE));
}
- @PreventRepeat
- @ApiOperation("鏂板缓")
- @PostMapping("/create")
- @RequiresPermissions("system:menu:create")
- public ApiResponse create(@Validated(OperaType.Create.class) @RequestBody SystemMenu systemMenu) {
- return ApiResponse.success(systemMenuBiz.create(systemMenu));
- }
-
- @ApiOperation("鍒犻櫎")
- @GetMapping("/delete/{id}")
- @RequiresPermissions("system:menu:delete")
- public ApiResponse deleteById(@PathVariable Integer id) {
- systemMenuBiz.deleteById(id);
- return ApiResponse.success(null);
- }
-
- @ApiOperation("鎵归噺鍒犻櫎")
- @GetMapping("/delete/batch")
- @RequiresPermissions("system:menu:delete")
- public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
- String [] idArray = ids.split(",");
- List<Integer> idList = new ArrayList<>();
- for (String id : idArray) {
- idList.add(Integer.valueOf(id));
- }
- systemMenuBiz.deleteByIdInBatch(idList);
- return ApiResponse.success(null);
- }
-
- @ApiOperation("淇敼")
- @PostMapping("/updateById")
- @RequiresPermissions("system:menu:update")
- public ApiResponse updateById(@Validated(OperaType.Update.class) @RequestBody SystemMenu systemMenu) {
- systemMenuBiz.updateById(systemMenu);
- return ApiResponse.success(null);
- }
-
- @ApiOperation("淇敼鑿滃崟鐘舵��")
- @PostMapping("/updateStatus")
- @RequiresPermissions("system:menu:update")
- public ApiResponse updateStatus(@Validated(OperaType.UpdateStatus.class) @RequestBody SystemMenu systemMenu) {
- systemMenuBiz.updateById(systemMenu);
- return ApiResponse.success(null);
- }
}
--
Gitblit v1.9.3