feat 优化权限完成
This commit is contained in:
@@ -1,5 +1,4 @@
|
||||
using Dlhis.Basic.DataPermissions;
|
||||
using Dlhis.Basic.Device.Dtos;
|
||||
using Dlhis.Basic.Device.Dtos;
|
||||
using Dlhis.Basic.Device.Request;
|
||||
using Dlhis.Basic.Device.Response;
|
||||
using Dlhis.Entity.Basic.Entity;
|
||||
@@ -11,10 +10,8 @@ using Dlhis.Entity.Visitor.Entity;
|
||||
using Dlhis.Sys.Api;
|
||||
using Kurisu.AspNetCore.Authentication.Abstractions;
|
||||
using Kurisu.AspNetCore.DataAccess.Dto;
|
||||
using Kurisu.AspNetCore.DataAccess.Entity;
|
||||
using Kurisu.AspNetCore.DataAccess.SqlSugar.Extensions;
|
||||
using Kurisu.AspNetCore.DataAccess.SqlSugar.Services;
|
||||
using Kurisu.AspNetCore.Scope;
|
||||
using Kurisu.AspNetCore.Utils.Extensions;
|
||||
using OfficeOpenXml;
|
||||
using SqlSugar;
|
||||
@@ -24,25 +21,19 @@ namespace Dlhis.Basic.Device.Services.Implements;
|
||||
public class DevicePermissionService : IDevicePermissionService
|
||||
{
|
||||
private readonly IDbContext _dbContext;
|
||||
private readonly IMyDataPermissionService _myDataPermissionService;
|
||||
private readonly ITenantApi _tenantApi;
|
||||
private readonly IParallelService _parallelService;
|
||||
private readonly INamedResolver _namedResolver;
|
||||
private readonly IDevicePermissionAnalyzeService _devicePermissionAnalyzeService;
|
||||
private readonly ICurrentUser _currentUser;
|
||||
|
||||
public DevicePermissionService(IDbContext dbContext,
|
||||
IMyDataPermissionService myDataPermissionService,
|
||||
ITenantApi tenantApi,
|
||||
IParallelService parallelService,
|
||||
INamedResolver namedResolver,
|
||||
IDevicePermissionAnalyzeService devicePermissionAnalyzeService,
|
||||
ICurrentUser currentUser)
|
||||
{
|
||||
_dbContext = dbContext;
|
||||
_myDataPermissionService = myDataPermissionService;
|
||||
_tenantApi = tenantApi;
|
||||
_parallelService = parallelService;
|
||||
_namedResolver = namedResolver;
|
||||
_devicePermissionAnalyzeService = devicePermissionAnalyzeService;
|
||||
_currentUser = currentUser;
|
||||
@@ -50,252 +41,9 @@ public class DevicePermissionService : IDevicePermissionService
|
||||
|
||||
public async Task<DevicePermissionAssignResponse> AssignAsync(DevicePermissionSaveRequest request)
|
||||
{
|
||||
await _namedResolver.GetService<IPermissionAnalyzeService>(PermissionAnalyzeConstants.GetTypeName(request.AssignType)).AnalyzeAsync(request);
|
||||
|
||||
return null;
|
||||
await CheckAssignTopDoorDeviceGroupAsync(request);
|
||||
|
||||
var currentTenantId = _currentUser.GetStringTenantId();
|
||||
var role = _currentUser.GetRole();
|
||||
var isAll = role is "admin" or "tenant-admin";
|
||||
var deviceCodes = isAll ? new List<Guid>() : _myDataPermissionService.GetMyDeviceCodes();
|
||||
|
||||
_parallelService.Enable = true;
|
||||
return await _devicePermissionAnalyzeService.GenerateDeviceTasksAsync(async () =>
|
||||
{
|
||||
request.AssignValue = request.AssignType == AssignTypeEnumType.Department ? request.TenantId + ":" + request.AssignValue : request.AssignValue;
|
||||
|
||||
await _dbContext.IgnoreAsync<ITenantId>(async () =>
|
||||
{
|
||||
//删除当前匹配的基地权限
|
||||
var p = await _dbContext.Queryable<DevicePermissionEntity>()
|
||||
.Where(x => x.AssignType == request.AssignType)
|
||||
.Where(x => x.AssignValue == request.AssignValue)
|
||||
.Where(x => x.UniqueType == request.UniqueType)
|
||||
.WhereIF(request.UniqueType == DeviceAssignmentTypeEnumType.Device && !isAll, x => deviceCodes.Contains(x.UniqueValue))
|
||||
.Where(x => x.Type == request.Type)
|
||||
.Where(x => x.TenantId == currentTenantId)
|
||||
.ToListAsync();
|
||||
|
||||
await _dbContext.DeleteAsync(p);
|
||||
|
||||
//保存配置的权限
|
||||
if (request.Codes.IsPresent())
|
||||
{
|
||||
var devicePermissions = request.Codes.Select(code => new DevicePermissionEntity
|
||||
{
|
||||
AssignType = request.AssignType,
|
||||
AssignValue = request.AssignValue,
|
||||
UniqueType = request.UniqueType,
|
||||
UniqueValue = code,
|
||||
Type = request.Type,
|
||||
TenantId = currentTenantId
|
||||
}).ToList();
|
||||
|
||||
await _dbContext.InsertAsync(devicePermissions);
|
||||
}
|
||||
});
|
||||
}, null);
|
||||
}
|
||||
|
||||
|
||||
private async Task CheckAssignTopDoorDeviceGroupAsync(DevicePermissionSaveRequest request)
|
||||
{
|
||||
if (request.UniqueType == DeviceAssignmentTypeEnumType.Group)
|
||||
{
|
||||
await Scoped.Temp.Value.CreateAsync(async sp =>
|
||||
{
|
||||
var currentDb = sp.GetService<IDbContext>();
|
||||
await currentDb.IgnoreAsync<ITenantId>(async () =>
|
||||
{
|
||||
var dgs = await currentDb.Queryable<DeviceGroupEntity>().Where(x => request.Codes.Contains(x.Code)).ToListAsync();
|
||||
dgs.Any(x => x.TenantId.IsEmpty()).ThrowIfTrue("不可分配顶级分组节点");
|
||||
});
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public async Task<DevicePermissionAssignResponse> GenerateTasksAsync(List<Guid> addDeviceCodes, List<Guid> deleteDeviceCodes, List<string> gainfoNos)
|
||||
{
|
||||
var allDeviceCodes = addDeviceCodes.Concat(deleteDeviceCodes).ToList();
|
||||
var devices = await _dbContext.Queryable<DeviceEntity>()
|
||||
.Where(x => allDeviceCodes.Contains(x.Code))
|
||||
.Select(x => new { x.Code, x.UniqueNo, x.Type, x.TenantId })
|
||||
.ToListAsync();
|
||||
|
||||
var tasks = new List<DeviceTaskEntity>();
|
||||
foreach (var gainfoNo in gainfoNos)
|
||||
{
|
||||
tasks.AddRange(addDeviceCodes.Select(x =>
|
||||
{
|
||||
var d = devices.First(item => item.Code == x);
|
||||
return new DeviceTaskEntity
|
||||
{
|
||||
Type = DeviceTaskEnumType.Add,
|
||||
DeviceType = d.Type,
|
||||
UserId = null,
|
||||
UserNo = gainfoNo,
|
||||
DeviceUniqueNo = d.UniqueNo,
|
||||
Status = DeviceTaskStatusEnumType.Wait,
|
||||
Version = 0,
|
||||
ResultMessage = null,
|
||||
CancellationId = 0,
|
||||
Source = DeviceTaskSourceEnumType.Manually,
|
||||
Priority = 0,
|
||||
TenantId = d.TenantId,
|
||||
};
|
||||
}).ToList());
|
||||
|
||||
tasks.AddRange(deleteDeviceCodes.Select(x =>
|
||||
{
|
||||
var d = devices.First(item => item.Code == x);
|
||||
return new DeviceTaskEntity
|
||||
{
|
||||
Type = DeviceTaskEnumType.Delete,
|
||||
DeviceType = d.Type,
|
||||
UserId = null,
|
||||
UserNo = gainfoNo,
|
||||
DeviceUniqueNo = d.UniqueNo,
|
||||
Status = DeviceTaskStatusEnumType.Wait,
|
||||
Version = 0,
|
||||
ResultMessage = null,
|
||||
CancellationId = 0,
|
||||
Source = DeviceTaskSourceEnumType.Manually,
|
||||
Priority = 0,
|
||||
TenantId = d.TenantId,
|
||||
};
|
||||
}).ToList());
|
||||
}
|
||||
|
||||
foreach (var items in tasks.Where(x => x.Type == DeviceTaskEnumType.Add).Chunk(500))
|
||||
{
|
||||
await _dbContext.InsertAsync(items.ToList());
|
||||
}
|
||||
|
||||
return new DevicePermissionAssignResponse
|
||||
{
|
||||
AddCount = addDeviceCodes.Count * gainfoNos.Count,
|
||||
DeleteCount = deleteDeviceCodes.Count * gainfoNos.Count
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
public async Task<DevicePermissionAssignResponse> AssignDeviceGroupToTenantAsync(string currentTenantId, DevicePermissionSaveRequest request)
|
||||
{
|
||||
var groupData = await _dbContext.Queryable<DevicePermissionEntity>()
|
||||
.Where(x => x.AssignType == AssignTypeEnumType.Tenant)
|
||||
.Where(x => x.AssignValue == request.AssignValue)
|
||||
.Where(x => x.UniqueType == request.UniqueType)
|
||||
.Where(x => x.Type == request.Type)
|
||||
.Where(x => x.TenantId == currentTenantId)
|
||||
.ToListAsync();
|
||||
|
||||
var gainfoNos = await _dbContext.Queryable<GainfoEntity>().Where(x => x.Factory == request.AssignValue).Select(x => x.No).ToListAsync();
|
||||
|
||||
var beforeDeviceCodes = groupData.Select(x => x.UniqueValue).ToList();
|
||||
var presentDeviceCodes = request.Codes.IsPresent() ? request.Codes : new List<Guid>();
|
||||
|
||||
var addDeviceGroupCodes = presentDeviceCodes.Except(beforeDeviceCodes).ToList();
|
||||
var deleteDeviceGroupCodes = beforeDeviceCodes.Except(presentDeviceCodes).ToList();
|
||||
|
||||
await _dbContext.DeleteAsync(groupData);
|
||||
//保存配置的权限
|
||||
if (request.Codes.IsPresent())
|
||||
{
|
||||
var devicePermissions = request.Codes.Select(code => new DevicePermissionEntity
|
||||
{
|
||||
AssignType = request.AssignType,
|
||||
AssignValue = request.AssignValue,
|
||||
UniqueType = request.UniqueType,
|
||||
UniqueValue = code,
|
||||
Type = request.Type,
|
||||
TenantId = currentTenantId
|
||||
}).ToList();
|
||||
|
||||
await _dbContext.InsertAsync(devicePermissions);
|
||||
}
|
||||
|
||||
var deviceGroups = await _dbContext.Queryable<DeviceGroupEntity>().ToListAsync();
|
||||
|
||||
var addDevices = await GetDevicesByGroupsAsync(deviceGroups, deviceGroups.Where(x => addDeviceGroupCodes.Contains(x.Code)).ToList());
|
||||
var deleteDevices = await GetDevicesByGroupsAsync(deviceGroups, deviceGroups.Where(x => deleteDeviceGroupCodes.Contains(x.Code)).ToList());
|
||||
|
||||
var tasks = new List<DeviceTaskEntity>();
|
||||
foreach (var gainfoNo in gainfoNos)
|
||||
{
|
||||
tasks.AddRange(addDevices.Select(x => new DeviceTaskEntity
|
||||
{
|
||||
Type = DeviceTaskEnumType.Add,
|
||||
DeviceType = x.Type,
|
||||
UserId = null,
|
||||
UserNo = gainfoNo,
|
||||
DeviceUniqueNo = x.UniqueNo,
|
||||
Status = DeviceTaskStatusEnumType.Wait,
|
||||
Version = 0,
|
||||
ResultMessage = null,
|
||||
CancellationId = 0,
|
||||
Source = DeviceTaskSourceEnumType.Manually,
|
||||
Priority = 0,
|
||||
TenantId = x.TenantId,
|
||||
}).ToList());
|
||||
|
||||
tasks.AddRange(deleteDevices.Select(x => new DeviceTaskEntity
|
||||
{
|
||||
Type = DeviceTaskEnumType.Delete,
|
||||
DeviceType = x.Type,
|
||||
UserId = null,
|
||||
UserNo = gainfoNo,
|
||||
DeviceUniqueNo = x.UniqueNo,
|
||||
Status = DeviceTaskStatusEnumType.Wait,
|
||||
Version = 0,
|
||||
ResultMessage = null,
|
||||
CancellationId = 0,
|
||||
Source = DeviceTaskSourceEnumType.Manually,
|
||||
Priority = 0,
|
||||
TenantId = x.TenantId,
|
||||
}).ToList());
|
||||
}
|
||||
|
||||
foreach (var items in tasks.Where(x => x.Type == DeviceTaskEnumType.Add).Chunk(500))
|
||||
{
|
||||
await _dbContext.InsertAsync(items.ToList());
|
||||
}
|
||||
|
||||
return new DevicePermissionAssignResponse
|
||||
{
|
||||
AddCount = addDevices.Count * gainfoNos.Count,
|
||||
DeleteCount = deleteDevices.Count * gainfoNos.Count
|
||||
};
|
||||
}
|
||||
|
||||
private static void RecursionGetNextDeviceGroup(List<DeviceGroupEntity> allData, DeviceGroupEntity current, List<Guid> result)
|
||||
{
|
||||
var nextItems = allData.Where(x => x.PCode == current.Code).ToList();
|
||||
foreach (var item in nextItems)
|
||||
{
|
||||
result.Add(item.Code);
|
||||
RecursionGetNextDeviceGroup(allData, item, result);
|
||||
}
|
||||
}
|
||||
|
||||
private async Task<List<DeviceEntity>> GetDevicesByGroupsAsync(List<DeviceGroupEntity> allData, List<DeviceGroupEntity> groups)
|
||||
{
|
||||
var result = new List<Guid>();
|
||||
foreach (var group in groups)
|
||||
{
|
||||
result.Add(group.Code);
|
||||
RecursionGetNextDeviceGroup(allData, group, result);
|
||||
}
|
||||
|
||||
var deviceCodes = await _dbContext.Queryable<DeviceGroupRelationshipEntity>()
|
||||
.Where(x => result.Contains(x.GroupCode))
|
||||
.Select(x => x.DeviceCode)
|
||||
.ToListAsync();
|
||||
|
||||
return await _dbContext.Queryable<DeviceEntity>()
|
||||
.Where(x => deviceCodes.Contains(x.Code))
|
||||
.ToListAsync();
|
||||
return await _namedResolver
|
||||
.GetService<IPermissionAnalyzeService>(PermissionAnalyzeConstants.GetTypeName(request.AssignType))
|
||||
.AnalyzeAsync(request);
|
||||
}
|
||||
|
||||
public async Task AssignToUniqueAsync(DevicePermissionsAssignToDeviceRequest request)
|
||||
@@ -475,10 +223,19 @@ public class DevicePermissionService : IDevicePermissionService
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
public async Task<Dictionary<string, List<UserTenantDeviceCodeDto>>> GetUserDevicePermissionsAsync(string code)
|
||||
public async Task<Dictionary<string, IEnumerable<UserTenantDeviceCodeDto>>> GetUserDevicePermissionsAsync(string code)
|
||||
{
|
||||
var userNo = await _dbContext.Queryable<GainfoEntity>().Where(x => x.Code == code).Select(x => x.No).SingleAsync();
|
||||
return await _devicePermissionAnalyzeService.GetAssignDeviceCodesInternalAsync(new List<string> { userNo });
|
||||
var result = await _devicePermissionAnalyzeService.GetUserAssignDeviceCodesWithTypeInTenantAsync(new List<string> { userNo });
|
||||
|
||||
return result.ToDictionary(x => x.Key, x => x.Value.GroupBy(p => p.Tenant).Select(item =>
|
||||
{
|
||||
return new UserTenantDeviceCodeDto
|
||||
{
|
||||
Tenant = item.Key,
|
||||
Codes = item.SelectMany(p => p.AssignTypes).SelectMany(p => p.Codes).Distinct().ToList(),
|
||||
};
|
||||
}));
|
||||
}
|
||||
|
||||
|
||||
@@ -701,7 +458,7 @@ public class DevicePermissionService : IDevicePermissionService
|
||||
public async Task<List<Guid>> GetAssignDeviceCodesAsync(string userCode)
|
||||
{
|
||||
var userNo = await _dbContext.Queryable<GainfoEntity>().Where(x => x.Code == userCode || x.No == userCode).Select(x => x.No).SingleAsync();
|
||||
var result = await _devicePermissionAnalyzeService.GetAssignDeviceCodesInternalAsync(new List<string> { userNo });
|
||||
return result.First().Value.SelectMany(x => x.Codes).ToList();
|
||||
var result = await _devicePermissionAnalyzeService.GetUserAssignDeviceCodesWithTypeInTenantAsync(new List<string> { userNo });
|
||||
return result.First().Value.SelectMany(x => x.AssignTypes.SelectMany(p => p.Codes)).Distinct().ToList();
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user