From c50686f775664c5a722f4b5ad7afde1e5214b14d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 05 十一月 2024 19:07:21 +0800
Subject: [PATCH] 最新版本541200007

---
 server/system_service/src/main/java/com/doumee/api/cloud/SystemPositionCloudController.java |   20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/server/system_service/src/main/java/com/doumee/api/cloud/SystemPositionCloudController.java b/server/system_service/src/main/java/com/doumee/api/cloud/SystemPositionCloudController.java
index 035604f..a60d8ba 100644
--- a/server/system_service/src/main/java/com/doumee/api/cloud/SystemPositionCloudController.java
+++ b/server/system_service/src/main/java/com/doumee/api/cloud/SystemPositionCloudController.java
@@ -2,6 +2,7 @@
 
 import com.doumee.api.BaseController;
 import com.doumee.biz.system.SystemPositionBiz;
+import com.doumee.config.annotation.CloudRequiredPermission;
 import com.doumee.core.annotation.pr.PreventRepeat;
 import com.doumee.core.annotation.trace.Trace;
 import com.doumee.core.constants.OperaType;
@@ -17,7 +18,6 @@
 import com.doumee.service.system.SystemUserService;
 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.*;
@@ -31,7 +31,7 @@
  */
 @Api(tags = "宀椾綅")
 @RestController
-@RequestMapping("/cloudService/system/position")
+@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/system/position")
 public class SystemPositionCloudController extends BaseController {
 
     @Autowired
@@ -46,14 +46,15 @@
     @PreventRepeat
     @ApiOperation("鏂板缓")
     @PostMapping("/create")
-    @RequiresPermissions("system:position:create")
+    @CloudRequiredPermission("system:position:create")
     public ApiResponse create(@RequestHeader(Constants.HEADER_USER_TOKEN) String token, @Validated(OperaType.Create.class) @RequestBody SystemPosition systemPosition) {
+        systemPosition.setCreateUser(this.getLoginUser(token).getId());
         return ApiResponse.success(systemPositionBiz.create(systemPosition));
     }
 
     @ApiOperation("鍒犻櫎")
     @GetMapping("/delete/{id}")
-    @RequiresPermissions("system:position:delete")
+    @CloudRequiredPermission("system:position:delete")
     public ApiResponse deleteById(@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@PathVariable Integer id) {
         systemPositionBiz.deleteById(id);
         return ApiResponse.success(null);
@@ -61,7 +62,7 @@
 
     @ApiOperation("鎵归噺鍒犻櫎")
     @GetMapping("/delete/batch")
-    @RequiresPermissions("system:position:delete")
+    @CloudRequiredPermission("system:position:delete")
     public ApiResponse deleteByIdInBatch(@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@RequestParam String ids) {
         String [] idArray = ids.split(",");
         List<Integer> idList = new ArrayList<>();
@@ -74,22 +75,23 @@
 
     @ApiOperation("淇敼")
     @PostMapping("/updateById")
-    @RequiresPermissions("system:position:update")
+    @CloudRequiredPermission("system:position:update")
     public ApiResponse updateById(@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@Validated(OperaType.Update.class) @RequestBody SystemPosition systemPosition) {
+        systemPosition.setUpdateUser(this.getLoginUser(token).getId());
         systemPositionBiz.updateById(systemPosition);
         return ApiResponse.success(null);
     }
 
     @ApiOperation("鏌ヨ宀椾綅鏍戝垪琛�")
     @PostMapping("/tree")
-    @RequiresPermissions("system:position:query")
+    @CloudRequiredPermission("system:position:query")
     public ApiResponse<List<SystemPositionListVO>> findTree (@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
         return ApiResponse.success(systemPositionBiz.findTree());
     }
 
     @ApiOperation("鏌ヨ宀椾綅鍒楄〃")
     @PostMapping("/all")
-    @RequiresPermissions("system:position:query")
+    @CloudRequiredPermission("system:position:query")
     public ApiResponse<List<SystemPosition>> findList (@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
         SystemPosition systemPosition = new SystemPosition();
         systemPosition.setDeleted(Boolean.FALSE);
@@ -99,7 +101,7 @@
     @Trace(exclude = true)
     @ApiOperation("鏌ヨ宀椾綅浜哄憳")
     @PostMapping("/users")
-    @RequiresPermissions("system:position:queryUsers")
+    @CloudRequiredPermission("system:position:queryUsers")
     public ApiResponse<PageData<SystemUserListVO>> findPage (@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@RequestBody PageWrap<QuerySystemUserDTO> pageWrap) {
         return ApiResponse.success(systemUserService.findPage(pageWrap));
     }

--
Gitblit v1.9.3