From 6ded2ee6a9d9097d45f8f79a7e6429cf55ed7cc3 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 07 三月 2025 16:59:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/system_service/src/main/java/com/doumee/api/system/SystemRoleController.java | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/server/system_service/src/main/java/com/doumee/api/system/SystemRoleController.java b/server/system_service/src/main/java/com/doumee/api/system/SystemRoleController.java
index a81ad34..c646de8 100644
--- a/server/system_service/src/main/java/com/doumee/api/system/SystemRoleController.java
+++ b/server/system_service/src/main/java/com/doumee/api/system/SystemRoleController.java
@@ -4,9 +4,10 @@
import com.doumee.biz.system.SystemRoleBiz;
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;
@@ -18,11 +19,11 @@
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.*;
import java.util.ArrayList;
import java.util.List;
+import org.springframework.web.bind.annotation.*;
/**
* @author Eva.Caesar Liu
* @date 2023/03/21 14:49
@@ -42,7 +43,8 @@
@ApiOperation("閰嶇疆瑙掕壊鑿滃崟")
@PostMapping("/createRoleMenu")
@RequiresPermissions("system:role:createRoleMenu")
- public ApiResponse createRoleMenu (@Validated @RequestBody CreateRoleMenuDTO dto) {
+ public ApiResponse createRoleMenu (@Validated @RequestBody CreateRoleMenuDTO dto, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ dto.setCreateUser(this.getLoginUser(token).getId());
systemRoleBiz.createRoleMenu(dto);
return ApiResponse.success(null);
}
@@ -51,7 +53,8 @@
@ApiOperation("閰嶇疆瑙掕壊鏉冮檺")
@PostMapping("/createRolePermission")
@RequiresPermissions("system:role:createRolePermission")
- public ApiResponse createRolePermission (@Validated @RequestBody CreateRolePermissionDTO dto) {
+ public ApiResponse createRolePermission (@Validated @RequestBody CreateRolePermissionDTO dto, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ dto.setCreateUser(this.getLoginUser(token).getId());
systemRoleBiz.createRolePermission(dto);
return ApiResponse.success(null);
}
@@ -60,7 +63,8 @@
@ApiOperation("鏂板缓")
@PostMapping("/create")
@RequiresPermissions("system:role:create")
- public ApiResponse create(@Validated(OperaType.Create.class) @RequestBody SystemRole systemRole) {
+ public ApiResponse create(@Validated(OperaType.Create.class) @RequestBody SystemRole systemRole, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ systemRole.setCreateUser(this.getLoginUser(token).getId());
return ApiResponse.success(systemRoleBiz.create(systemRole));
}
@@ -88,7 +92,8 @@
@ApiOperation("淇敼")
@PostMapping("/updateById")
@RequiresPermissions("system:role:update")
- public ApiResponse updateById(@Validated(OperaType.Update.class) @RequestBody SystemRole systemRole) {
+ public ApiResponse updateById(@Validated(OperaType.Update.class) @RequestBody SystemRole systemRole, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ systemRole.setUpdateUser(this.getLoginUser(token).getId());
systemRoleBiz.updateById(systemRole);
return ApiResponse.success(null);
}
--
Gitblit v1.9.3