From 9ffe50c41999fee1c47bfd5d525b6141c4d22b7a Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 24 一月 2025 15:54:51 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

---
 server/system_service/src/main/java/com/doumee/api/cloud/SystemMenuCloudController.java |   26 +++++++++++++++-----------
 1 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/server/system_service/src/main/java/com/doumee/api/cloud/SystemMenuCloudController.java b/server/system_service/src/main/java/com/doumee/api/cloud/SystemMenuCloudController.java
index b64baa5..e8ae9da 100644
--- a/server/system_service/src/main/java/com/doumee/api/cloud/SystemMenuCloudController.java
+++ b/server/system_service/src/main/java/com/doumee/api/cloud/SystemMenuCloudController.java
@@ -2,9 +2,10 @@
 
 import com.doumee.api.BaseController;
 import com.doumee.biz.system.SystemMenuBiz;
+import com.doumee.config.annotation.CloudRequiredPermission;
 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;
@@ -12,7 +13,6 @@
 import com.doumee.dao.system.vo.SystemMenuNodeVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-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.*;
@@ -26,7 +26,7 @@
  */
 @Api(tags = "绯荤粺鑿滃崟")
 @RestController
-@RequestMapping("/cloudService/system/menu")
+@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/system/menu")
 public class SystemMenuCloudController extends BaseController {
 
     @Autowired
@@ -34,8 +34,9 @@
 
     @ApiOperation("鑿滃崟鎺掑簭")
     @PostMapping("/updateSort")
-    @RequiresPermissions("system:menu:sort")
+    @CloudRequiredPermission("system:menu:sort")
     public ApiResponse updateSort (@RequestHeader(Constants.HEADER_USER_TOKEN) String token, @Validated @RequestBody UpdateSystemMenuSortDTO dto) {
+        dto.setUpdateUser(this.getLoginUser(token).getId());
         systemMenuBiz.updateSort(dto);
         return ApiResponse.success(null);
     }
@@ -43,12 +44,12 @@
     @ApiOperation("鏌ヨ鑿滃崟鏍�")
     @GetMapping("/treeNodes")
     public ApiResponse<List<SystemMenuNodeVO>> getTreeMenu (@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
-        return ApiResponse.success(systemMenuBiz.findTree(this.getLoginUser().getId()));
+        return ApiResponse.success(systemMenuBiz.findTree(this.getLoginUser(token).getId()));
     }
 
     @ApiOperation("鏌ヨ鍒楄〃鏍�")
     @PostMapping("/treeList")
-    @RequiresPermissions("system:menu:query")
+    @CloudRequiredPermission("system:menu:query")
     public ApiResponse<List<SystemMenuListVO>> findTree (@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
         return ApiResponse.success(systemMenuBiz.findTree());
     }
@@ -56,14 +57,15 @@
     @PreventRepeat
     @ApiOperation("鏂板缓")
     @PostMapping("/create")
-    @RequiresPermissions("system:menu:create")
+    @CloudRequiredPermission("system:menu:create")
     public ApiResponse create(@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@Validated(OperaType.Create.class) @RequestBody SystemMenu systemMenu) {
+        systemMenu.setCreateUser(this.getLoginUser(token).getId());
         return ApiResponse.success(systemMenuBiz.create(systemMenu));
     }
 
     @ApiOperation("鍒犻櫎")
     @GetMapping("/delete/{id}")
-    @RequiresPermissions("system:menu:delete")
+    @CloudRequiredPermission("system:menu:delete")
     public ApiResponse deleteById(@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@PathVariable Integer id) {
         systemMenuBiz.deleteById(id);
         return ApiResponse.success(null);
@@ -71,7 +73,7 @@
 
     @ApiOperation("鎵归噺鍒犻櫎")
     @GetMapping("/delete/batch")
-    @RequiresPermissions("system:menu:delete")
+    @CloudRequiredPermission("system:menu:delete")
     public ApiResponse deleteByIdInBatch(@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@RequestParam String ids) {
         String [] idArray = ids.split(",");
         List<Integer> idList = new ArrayList<>();
@@ -84,16 +86,18 @@
 
     @ApiOperation("淇敼")
     @PostMapping("/updateById")
-    @RequiresPermissions("system:menu:update")
+    @CloudRequiredPermission("system:menu:update")
     public ApiResponse updateById(@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@Validated(OperaType.Update.class) @RequestBody SystemMenu systemMenu) {
+        systemMenu.setUpdateUser(this.getLoginUser(token).getId());
         systemMenuBiz.updateById(systemMenu);
         return ApiResponse.success(null);
     }
 
     @ApiOperation("淇敼鑿滃崟鐘舵��")
     @PostMapping("/updateStatus")
-    @RequiresPermissions("system:menu:update")
+    @CloudRequiredPermission("system:menu:update")
     public ApiResponse updateStatus(@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@Validated(OperaType.UpdateStatus.class) @RequestBody SystemMenu systemMenu) {
+        systemMenu.setUpdateUser(this.getLoginUser(token).getId());
         systemMenuBiz.updateById(systemMenu);
         return ApiResponse.success(null);
     }

--
Gitblit v1.9.3