xwl2023/Yi.Framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat:添加角色授权用户

Browse Source
This commit is contained in:
陈淳
2023-05-23 19:29:56 +08:00
parent dcbd729944
commit 22fab8dee0
10 changed files with 174 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
Yi.Furion.Net6/Yi.Furion.Application/Rbac/Services/Impl/RoleService.cs
View File

@@ -1,3 +1,5 @@
using System.Linq.Expressions;
using System.Reflection.Metadata;
using Furion.DatabaseAccessor;
using SqlSugar;
using Yi.Framework.Infrastructure.Ddd.Dtos;
@@ -6,6 +8,7 @@ using Yi.Framework.Infrastructure.Ddd.Services;
using Yi.Framework.Infrastructure.Helper;
using Yi.Furion.Application.Rbac.Domain;
using Yi.Furion.Core.Rbac.Dtos.Role;
using Yi.Furion.Core.Rbac.Dtos.User;
using Yi.Furion.Core.Rbac.Entities;
using Yi.Furion.Core.Rbac.Enums;
@@ -17,13 +20,14 @@ namespace Yi.Furion.Application.Rbac.Services.Impl
public class RoleService : CrudAppService<RoleEntity, RoleGetOutputDto, RoleGetListOutputDto, long, RoleGetListInputVo, RoleCreateInputVo, RoleUpdateInputVo>,
IRoleService, ITransient, IDynamicApiController
{
public RoleService(RoleManager roleManager, IRepository<RoleDeptEntity> roleDeptRepository) =>
(_roleManager, _roleDeptRepository) =
(roleManager, roleDeptRepository);
public RoleService(RoleManager roleManager, IRepository<RoleDeptEntity> roleDeptRepository, IRepository<UserRoleEntity> userRoleRepository) =>
(_roleManager, _roleDeptRepository, _userRoleRepository) =
(roleManager, roleDeptRepository, userRoleRepository);
private RoleManager _roleManager { get; set; }
private IRepository<RoleDeptEntity> _roleDeptRepository;
private IRepository<UserRoleEntity> _userRoleRepository;
[UnitOfWork]
public async Task UpdateDataScpoceAsync(UpdateDataScpoceInput input)
{
@@ -31,7 +35,7 @@ namespace Yi.Furion.Application.Rbac.Services.Impl
if (input.DataScope == DataScopeEnum.CUSTOM)
{
await _roleDeptRepository.DeleteAsync(x => x.RoleId == input.RoleId);
var insertEntities = input.DeptIds.Select(x => new RoleDeptEntity {Id=SnowflakeHelper.NextId, DeptId = x, RoleId = input.RoleId }).ToList();
var insertEntities = input.DeptIds.Select(x => new RoleDeptEntity { Id = SnowflakeHelper.NextId, DeptId = x, RoleId = input.RoleId }).ToList();
await _roleDeptRepository.InsertRangeAsync(insertEntities);
}
await _repository._Db.Updateable(new RoleEntity() { Id = input.RoleId, DataScope = input.DataScope }).UpdateColumns(x => x.DataScope).ExecuteCommandAsync();
@@ -116,5 +120,71 @@ namespace Yi.Furion.Application.Rbac.Services.Impl
await _repository.UpdateAsync(entity);
return await MapToGetOutputDtoAsync(entity);
}
/// <summary>
/// 获取角色下的用户
/// </summary>
/// <param name="roleId"></param>
/// <param name="input"></param>
/// <param name="isAllocated">是否在该角色下</param>
/// <returns></returns>
[Route("/api/role/auth-user/{roleId}/{isAllocated}")]
public async Task<PagedResultDto<UserGetListOutputDto>> GetAuthUserByRoleIdAsync([FromRoute] long roleId, [FromRoute] bool isAllocated, [FromQuery] RoleAuthUserGetListInput input)
{
//角色下已授权用户
if (isAllocated == true)
{
RefAsync<int> total = 0;
var output = await _userRoleRepository._DbQueryable
.LeftJoin<UserEntity>((ur, u) => ur.UserId == u.Id && ur.RoleId == roleId)
.Where((ur, u) => ur.RoleId == roleId)
.WhereIF(!string.IsNullOrEmpty(input.UserName), (ur, u) => u.UserName.Contains(input.UserName))
.WhereIF(input.Phone is not null, (ur, u) => u.Phone.ToString().Contains(input.Phone.ToString()))
.Select((ur, u) => new UserGetListOutputDto { Id = u.Id }, true)
.ToPageListAsync(input.PageNum, input.PageSize, total);
return new PagedResultDto<UserGetListOutputDto>(total, output);
}
//角色下未授权用户
else
{
RefAsync<int> total = 0;
var entities = await _userRoleRepository._Db.Queryable<UserEntity>()
.Where(u => SqlFunc.Subqueryable<UserRoleEntity>().Where(x => x.RoleId == roleId).Where(x => x.UserId == u.Id).NotAny())
.WhereIF(!string.IsNullOrEmpty(input.UserName), u => u.UserName.Contains(input.UserName))
.WhereIF(input.Phone is not null, u => u.Phone.ToString().Contains(input.Phone.ToString()))
.ToPageListAsync(input.PageNum, input.PageSize, total);
var output = entities.Adapt<List<UserGetListOutputDto>>();
return new PagedResultDto<UserGetListOutputDto>(total, output);
}
}
/// <summary>
/// 批量给用户授权
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
public async Task CreateAuthUserAsync(RoleAuthUserCreateOrDeleteInput input)
{
var userRoleEntities = input.UserIds.Select(u => new UserRoleEntity { Id = SnowflakeHelper.NextId, RoleId = input.RoleId, UserId = u }).ToList();
await _userRoleRepository.InsertRangeAsync(userRoleEntities);
}
/// <summary>
/// 批量取消授权
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
public async Task DeleteAuthUserAsync(RoleAuthUserCreateOrDeleteInput input)
{
await _userRoleRepository._Db.Deleteable<UserRoleEntity>().Where(x => x.RoleId == input.RoleId)
.Where(x => input.UserIds.Contains(x.UserId))
.ExecuteCommandAsync(); ;
}
}
}

23
Yi.Furion.Net6/Yi.Furion.Application/Yi.Furion.Application.xml
View File

@@ -451,6 +451,29 @@
<param name="state"></param>
<returns></returns>
</member>
<member name="M:Yi.Furion.Application.Rbac.Services.Impl.RoleService.GetAuthUserByRoleIdAsync(System.Int64,System.Boolean,Yi.Furion.Core.Rbac.Dtos.Role.RoleAuthUserGetListInput)">
<summary>
获取角色下的用户
</summary>
<param name="roleId"></param>
<param name="input"></param>
<param name="isAllocated">是否在该角色下</param>
<returns></returns>
</member>
<member name="M:Yi.Furion.Application.Rbac.Services.Impl.RoleService.CreateAuthUserAsync(Yi.Furion.Core.Rbac.Dtos.Role.RoleAuthUserCreateOrDeleteInput)">
<summary>
批量给用户授权
</summary>
<param name="input"></param>
<returns></returns>
</member>
<member name="M:Yi.Furion.Application.Rbac.Services.Impl.RoleService.DeleteAuthUserAsync(Yi.Furion.Core.Rbac.Dtos.Role.RoleAuthUserCreateOrDeleteInput)">
<summary>
批量取消授权
</summary>
<param name="input"></param>
<returns></returns>
</member>
<member name="M:Yi.Furion.Application.Rbac.Services.Impl.TaskService.GetById(System.String)">
<summary>
单查job

18
Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Role/RoleAuthUserCreateOrDeleteInput.cs Normal file
View File

@@ -0,0 +1,18 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Yi.Framework.Infrastructure.Ddd.Dtos;
namespace Yi.Furion.Core.Rbac.Dtos.Role
{
public class RoleAuthUserCreateOrDeleteInput
{
[Required]
public long RoleId { get; set; }
[Required]
public List<long> UserIds { get; set; }
}
}

16
Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Role/RoleAuthUserGetListInput.cs Normal file
View File

@@ -0,0 +1,16 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Yi.Framework.Infrastructure.Ddd.Dtos;
namespace Yi.Furion.Core.Rbac.Dtos.Role
{
public class RoleAuthUserGetListInput: PagedAndSortedResultRequestDto
{
public string? UserName { get; set; }
public long? Phone { get; set; }
}
}