From 10c28ce3d0b384584c77ce9111a66a0641250752 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 27 二月 2025 18:30:32 +0800
Subject: [PATCH] 最新版本541200007

---
 server/system_service/src/main/java/com/doumee/api/cloud/SystemRoleCloudController.java |   23 +++++++++++++++++++----
 1 files changed, 19 insertions(+), 4 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 27ba244..23bac9c 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
@@ -5,13 +5,14 @@
 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.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
 import com.doumee.core.utils.Constants;
 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;
@@ -29,7 +30,7 @@
  */
 @Api(tags = "绯荤粺瑙掕壊")
 @RestController
-@RequestMapping("/cloudService/system/role")
+@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/system/role")
 public class SystemRoleCloudController extends BaseController {
 
     @Autowired
@@ -43,6 +44,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 +54,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 +74,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 +103,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