From 53b6400ec10c8ca61ccec91c82c358d2488eead8 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 20 十二月 2024 09:50:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/system_service/src/main/java/com/doumee/api/cloud/SystemDepartmentCloudController.java | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/server/system_service/src/main/java/com/doumee/api/cloud/SystemDepartmentCloudController.java b/server/system_service/src/main/java/com/doumee/api/cloud/SystemDepartmentCloudController.java
index f5140d2..5f9f971 100644
--- a/server/system_service/src/main/java/com/doumee/api/cloud/SystemDepartmentCloudController.java
+++ b/server/system_service/src/main/java/com/doumee/api/cloud/SystemDepartmentCloudController.java
@@ -2,6 +2,7 @@
import com.doumee.api.BaseController;
import com.doumee.biz.system.SystemDepartmentBiz;
+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;
@@ -18,7 +19,6 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
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.*;
@@ -32,7 +32,7 @@
*/
@Api(tags = "閮ㄩ棬")
@RestController
-@RequestMapping("/cloudService/system/department")
+@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/system/department")
public class SystemDepartmentCloudController extends BaseController {
@Autowired
@@ -44,16 +44,16 @@
@PreventRepeat
@ApiOperation("鏂板缓")
@PostMapping("/create")
- @RequiresPermissions("system:department:create")
+ @CloudRequiredPermission("system:department:create")
public ApiResponse create(@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@Validated(OperaType.Create.class) @RequestBody SystemDepartment systemDepartment) {
- systemDepartment.setCreateUser(getLoginUser().getId());
- systemDepartment.setUpdateUser(getLoginUser().getId());
+ systemDepartment.setCreateUser(getLoginUser(token).getId());
+ systemDepartment.setUpdateUser(getLoginUser(token).getId());
return ApiResponse.success(systemDepartmentBiz.create(systemDepartment));
}
@ApiOperation("鍒犻櫎")
@GetMapping("/delete/{id}")
- @RequiresPermissions("system:department:delete")
+ @CloudRequiredPermission("system:department:delete")
public ApiResponse deleteById(@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@PathVariable Integer id) {
systemDepartmentBiz.deleteById(id);
return ApiResponse.success(null);
@@ -62,7 +62,7 @@
@ApiOperation("鎵归噺鍒犻櫎")
@GetMapping("/delete/batch")
@PreventRepeat
- @RequiresPermissions("system:department:delete")
+ @CloudRequiredPermission("system:department:delete")
public ApiResponse deleteByIdInBatch(@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@RequestParam String ids) {
String [] idArray = ids.split(",");
List<Integer> idList = new ArrayList<>();
@@ -75,24 +75,24 @@
@ApiOperation("淇敼")
@PostMapping("/updateById")
- @RequiresPermissions("system:department:update")
+ @CloudRequiredPermission("system:department:update")
public ApiResponse updateById(@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@Validated(OperaType.Update.class) @RequestBody SystemDepartment systemDepartment) {
- systemDepartment.setCreateUser(getLoginUser().getId());
- systemDepartment.setUpdateUser(getLoginUser().getId());
+ systemDepartment.setCreateUser(getLoginUser(token).getId());
+ systemDepartment.setUpdateUser(getLoginUser(token).getId());
systemDepartmentBiz.updateById(systemDepartment);
return ApiResponse.success(null);
}
@ApiOperation("鏌ヨ閮ㄩ棬鍒楄〃")
@PostMapping("/tree")
- @RequiresPermissions("system:department:query")
+ @CloudRequiredPermission("system:department:query")
public ApiResponse<List<SystemDepartmentListVO>> findTree (@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
return ApiResponse.success(systemDepartmentBiz.findTree());
}
@ApiOperation("鏌ヨ閮ㄩ棬鍒楄〃鍙婇儴闂ㄤ笅鐨勪汉鍛�")
@GetMapping("/findTreeUser")
- @RequiresPermissions("system:department:query")
+ @CloudRequiredPermission("system:department:query")
@ApiImplicitParams({
@ApiImplicitParam(name = "parentId", value = "parentId", paramType = "query", dataType = "Integer"),
})
@@ -103,7 +103,7 @@
@Trace(exclude = true)
@ApiOperation("鏌ヨ閮ㄩ棬浜哄憳")
@PostMapping("/users")
- @RequiresPermissions("system:department:queryUsers")
+ @CloudRequiredPermission("system:department: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