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/SystemRoleCloudController.java | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/server/system_service/src/main/java/com/doumee/api/cloud/SystemRoleCloudController.java b/server/system_service/src/main/java/com/doumee/api/cloud/SystemRoleCloudController.java
index ac5d5f0..f5d0896 100644
--- a/server/system_service/src/main/java/com/doumee/api/cloud/SystemRoleCloudController.java
+++ b/server/system_service/src/main/java/com/doumee/api/cloud/SystemRoleCloudController.java
@@ -12,11 +12,13 @@
import com.doumee.dao.system.dto.CreateRoleMenuDTO;
import com.doumee.dao.system.dto.CreateRolePermissionDTO;
import com.doumee.dao.system.dto.QuerySystemRoleDTO;
+import com.doumee.dao.system.model.SystemDataPermission;
import com.doumee.dao.system.model.SystemRole;
import com.doumee.dao.system.vo.SystemRoleListVO;
import com.doumee.service.system.SystemRoleService;
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.*;
@@ -43,6 +45,7 @@
@PostMapping("/createRoleMenu")
@CloudRequiredPermission("system:role:createRoleMenu")
public ApiResponse createRoleMenu (@RequestHeader(Constants.HEADER_USER_TOKEN) String token, @Validated @RequestBody CreateRoleMenuDTO dto) {
+ dto.setCreateUser(this.getLoginUser(token).getId());
systemRoleBiz.createRoleMenu(dto);
return ApiResponse.success(null);
}
@@ -52,7 +55,18 @@
@PostMapping("/createRolePermission")
@CloudRequiredPermission("system:role:createRolePermission")
public ApiResponse createRolePermission (@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@Validated @RequestBody CreateRolePermissionDTO dto) {
+ dto.setCreateUser(this.getLoginUser(token).getId());
systemRoleBiz.createRolePermission(dto);
+ return ApiResponse.success(null);
+ }
+
+ @PreventRepeat
+ @ApiOperation("閰嶇疆瑙掕壊鏁版嵁鏉冮檺")
+ @PostMapping("/createRoleDataPermission")
+ @CloudRequiredPermission("system:datapermission:create")
+ public ApiResponse createRoleDataPermission (@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@Validated @RequestBody SystemDataPermission dto) {
+ dto.setLoginUserInfo(this.getLoginUser(token));
+ systemRoleBiz.createRoleDataPermission(dto);
return ApiResponse.success(null);
}
@@ -61,6 +75,7 @@
@PostMapping("/create")
@CloudRequiredPermission("system:role:create")
public ApiResponse create(@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@Validated(OperaType.Create.class) @RequestBody SystemRole systemRole) {
+ systemRole.setCreateUser(this.getLoginUser(token).getId());
return ApiResponse.success(systemRoleBiz.create(systemRole));
}
@@ -89,6 +104,7 @@
@PostMapping("/updateById")
@CloudRequiredPermission("system:role:update")
public ApiResponse updateById(@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@Validated(OperaType.Update.class) @RequestBody SystemRole systemRole) {
+ systemRole.setUpdateUser(this.getLoginUser(token).getId());
systemRoleBiz.updateById(systemRole);
return ApiResponse.success(null);
}
--
Gitblit v1.9.3