From 4a8ff39b0fab0627ef8f7459587d514cc01c3676 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 20 十月 2025 10:52:02 +0800
Subject: [PATCH] Merge branch 'wuhuyancao' of http://139.186.142.91:10010/r/productDev/dmvisit into wuhuyancao
---
server/system_service/src/main/java/com/doumee/api/system/SystemMenuController.java | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/server/system_service/src/main/java/com/doumee/api/system/SystemMenuController.java b/server/system_service/src/main/java/com/doumee/api/system/SystemMenuController.java
index 9b4514c..1590d46 100644
--- a/server/system_service/src/main/java/com/doumee/api/system/SystemMenuController.java
+++ b/server/system_service/src/main/java/com/doumee/api/system/SystemMenuController.java
@@ -4,7 +4,8 @@
import com.doumee.biz.system.SystemMenuBiz;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.constants.OperaType;
-import com.doumee.core.model.ApiResponse;
+import com.doumee.service.business.third.model.ApiResponse;
+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;
@@ -34,7 +35,8 @@
@ApiOperation("鑿滃崟鎺掑簭")
@PostMapping("/updateSort")
@RequiresPermissions("system:menu:sort")
- public ApiResponse updateSort (@Validated @RequestBody UpdateSystemMenuSortDTO dto) {
+ public ApiResponse updateSort (@Validated @RequestBody UpdateSystemMenuSortDTO dto, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ dto.setUpdateUser(this.getLoginUser(token).getId());
systemMenuBiz.updateSort(dto);
return ApiResponse.success(null);
}
@@ -42,21 +44,29 @@
@ApiOperation("鏌ヨ鑿滃崟鏍�")
@GetMapping("/treeNodes")
public ApiResponse<List<SystemMenuNodeVO>> getTreeMenu () {
- return ApiResponse.success(systemMenuBiz.findTree(this.getLoginUser().getId()));
+ return ApiResponse.success(systemMenuBiz.findTree(this.getLoginUser(null).getId()));
+ }
+
+ @ApiOperation("鏌ヨ椤堕儴瀵艰埅鏍�")
+ @PostMapping("/topList")
+ @RequiresPermissions("system:menu:query")
+ public ApiResponse<List<SystemMenu>> findTopList () {
+ return ApiResponse.success(systemMenuBiz.findTopList());
}
@ApiOperation("鏌ヨ鍒楄〃鏍�")
@PostMapping("/treeList")
@RequiresPermissions("system:menu:query")
public ApiResponse<List<SystemMenuListVO>> findTree () {
- return ApiResponse.success(systemMenuBiz.findTree());
+ return ApiResponse.success(systemMenuBiz.findTree(new SystemMenu()));
}
@PreventRepeat
@ApiOperation("鏂板缓")
@PostMapping("/create")
@RequiresPermissions("system:menu:create")
- public ApiResponse create(@Validated(OperaType.Create.class) @RequestBody SystemMenu systemMenu) {
+ public ApiResponse create(@Validated(OperaType.Create.class) @RequestBody SystemMenu systemMenu, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ systemMenu.setCreateUser(this.getLoginUser(token).getId());
return ApiResponse.success(systemMenuBiz.create(systemMenu));
}
@@ -84,7 +94,8 @@
@ApiOperation("淇敼")
@PostMapping("/updateById")
@RequiresPermissions("system:menu:update")
- public ApiResponse updateById(@Validated(OperaType.Update.class) @RequestBody SystemMenu systemMenu) {
+ public ApiResponse updateById(@Validated(OperaType.Update.class) @RequestBody SystemMenu systemMenu, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ systemMenu.setUpdateUser(this.getLoginUser(token).getId());
systemMenuBiz.updateById(systemMenu);
return ApiResponse.success(null);
}
@@ -92,7 +103,8 @@
@ApiOperation("淇敼鑿滃崟鐘舵��")
@PostMapping("/updateStatus")
@RequiresPermissions("system:menu:update")
- public ApiResponse updateStatus(@Validated(OperaType.UpdateStatus.class) @RequestBody SystemMenu systemMenu) {
+ public ApiResponse updateStatus(@Validated(OperaType.UpdateStatus.class) @RequestBody SystemMenu systemMenu, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ systemMenu.setUpdateUser(this.getLoginUser(token).getId());
systemMenuBiz.updateById(systemMenu);
return ApiResponse.success(null);
}
--
Gitblit v1.9.3