From 3a992a2be8c1cc815719ac76cd7242dd7a2f7c2d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 27 八月 2024 17:33:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/system_service/src/main/java/com/doumee/api/system/SystemMenuController.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 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 5e4cf01..569b7c6 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
@@ -5,6 +5,7 @@
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.constants.OperaType;
import com.doumee.core.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;
@@ -14,10 +15,10 @@
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.List;
+import org.springframework.web.bind.annotation.*;
/**
* @author Eva.Caesar Liu
@@ -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,7 +44,7 @@
@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("鏌ヨ鍒楄〃鏍�")
@@ -56,7 +58,8 @@
@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 +87,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 +96,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