add store
This commit is contained in:
@@ -10,7 +10,8 @@ import com.imyeyu.api.modules.user.entity.Permission;
|
||||
import com.imyeyu.api.modules.user.entity.Role;
|
||||
import com.imyeyu.api.modules.user.service.PermissionService;
|
||||
import com.imyeyu.api.modules.user.service.RoleService;
|
||||
import com.imyeyu.api.modules.user.vo.role.UserRoleAuthorizeReq;
|
||||
import com.imyeyu.api.modules.user.service.UserRoleService;
|
||||
import com.imyeyu.api.modules.user.vo.role.UserRoleAuthorizeRequest;
|
||||
import com.imyeyu.spring.annotation.AOPLog;
|
||||
import com.imyeyu.spring.bean.Page;
|
||||
import com.imyeyu.spring.bean.PageResult;
|
||||
@@ -37,6 +38,7 @@ import java.util.List;
|
||||
public class RoleController {
|
||||
|
||||
private final RoleService service;
|
||||
private final UserRoleService userRoleService;
|
||||
private final PermissionService permissionService;
|
||||
|
||||
@RequireCoreRole(value = {CoreRoleCode.ADMIN, CoreRoleCode.USER_ROLE_ADMIN}, mode = RoleMatchMode.ANY)
|
||||
@@ -86,26 +88,26 @@ public class RoleController {
|
||||
@RequireCoreRole(value = {CoreRoleCode.ADMIN, CoreRoleCode.USER_ROLE_ADMIN}, mode = RoleMatchMode.ANY)
|
||||
@RequireCorePermission(CorePermissionCode.USER_ROLE_READ)
|
||||
@PostMapping("/authorized/list")
|
||||
public List<Role> listUserRole(@RequestParam String userId, @RequestParam(required = false) ModuleCode moduleCode) {
|
||||
public List<Role> listUserRole(@RequestParam(required = false) ModuleCode moduleCode, @RequestParam String userId) {
|
||||
if (moduleCode != null) {
|
||||
return service.listByUserId(userId, moduleCode);
|
||||
return userRoleService.listRoleByUserId(moduleCode, userId);
|
||||
}
|
||||
return service.listByUserId(userId);
|
||||
return userRoleService.listRoleByUserId(userId);
|
||||
}
|
||||
|
||||
@AOPLog
|
||||
@RequireCoreRole(value = {CoreRoleCode.ADMIN, CoreRoleCode.USER_ROLE_ADMIN}, mode = RoleMatchMode.ANY)
|
||||
@RequireCorePermission(value = {CorePermissionCode.USER_ROLE_CREATE, CorePermissionCode.USER_ROLE_DELETE})
|
||||
@PostMapping("/authorized/create")
|
||||
public void authorizeUserRole(@RequestBody UserRoleAuthorizeReq req) {
|
||||
service.authorizeUserRole(req);
|
||||
public void authorizeUserRole(@RequestBody UserRoleAuthorizeRequest req) {
|
||||
userRoleService.authorizeUserRole(req);
|
||||
}
|
||||
|
||||
@RequireCoreRole(value = {CoreRoleCode.ADMIN, CoreRoleCode.USER_ROLE_ADMIN}, mode = RoleMatchMode.ANY)
|
||||
@RequireCorePermission(CorePermissionCode.USER_ROLE_READ)
|
||||
@PostMapping("/authorized/permission")
|
||||
public List<Permission> listAuthorizedPermission(@RequestParam String userId) {
|
||||
return service.listAllPermissionByUserId(userId);
|
||||
return userRoleService.listAllPermissionByUserId(userId);
|
||||
}
|
||||
|
||||
private void fillRoleDetail(Role role) {
|
||||
|
||||
Reference in New Issue
Block a user