fix 权限任务生成优化
This commit is contained in:
@@ -1,13 +1,8 @@
|
||||
using System.Collections.Concurrent;
|
||||
using System.Diagnostics;
|
||||
using System.Runtime.CompilerServices;
|
||||
using Dlhis.Basic.DataPermissions;
|
||||
using Dlhis.Basic.DataPermissions;
|
||||
using Dlhis.Basic.Device.Dtos;
|
||||
using Dlhis.Basic.Device.Request;
|
||||
using Dlhis.Basic.Device.Response;
|
||||
using Dlhis.Basic.Organization.Dto;
|
||||
using Dlhis.Entity.Basic.Entity;
|
||||
using Dlhis.Entity.Basic.Enums;
|
||||
using Dlhis.Entity.Device.Entities;
|
||||
using Dlhis.Entity.Device.Enums;
|
||||
using Dlhis.Entity.Sys.Entities;
|
||||
@@ -32,52 +27,41 @@ public class DevicePermissionService : IDevicePermissionService
|
||||
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;
|
||||
}
|
||||
|
||||
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 = _myDataPermissionService.GetMyDeviceCodes();
|
||||
|
||||
if (request.AssignType == AssignTypeEnumType.Tenant && request.UniqueType == DeviceAssignmentTypeEnumType.Device)
|
||||
{
|
||||
return await AssignDeviceToTenantAsync(currentTenantId, isAll, deviceCodes, request);
|
||||
}
|
||||
|
||||
if (request.AssignType == AssignTypeEnumType.Tenant && request.UniqueType == DeviceAssignmentTypeEnumType.Group)
|
||||
{
|
||||
return await AssignDeviceGroupToTenantAsync(currentTenantId, request);
|
||||
}
|
||||
|
||||
if (request.AssignType == AssignTypeEnumType.Department && request.UniqueType == DeviceAssignmentTypeEnumType.Device)
|
||||
{
|
||||
return await AssignDeviceToDepartmentAsync(currentTenantId, isAll, deviceCodes, request);
|
||||
}
|
||||
|
||||
if (request.AssignType == AssignTypeEnumType.Department && request.UniqueType == DeviceAssignmentTypeEnumType.Group)
|
||||
{
|
||||
return await AssignDeviceGroupToDepartmentAsync(currentTenantId, request);
|
||||
}
|
||||
var deviceCodes = isAll ? new List<Guid>() : _myDataPermissionService.GetMyDeviceCodes();
|
||||
|
||||
_parallelService.Enable = true;
|
||||
return await GenerateDeviceTasksAsync(async () =>
|
||||
return await _devicePermissionAnalyzeService.GenerateDeviceTasksAsync(async () =>
|
||||
{
|
||||
request.AssignValue = request.AssignType == AssignTypeEnumType.Department ? request.TenantId + ":" + request.AssignValue : request.AssignValue;
|
||||
|
||||
@@ -114,211 +98,6 @@ public class DevicePermissionService : IDevicePermissionService
|
||||
}, null);
|
||||
}
|
||||
|
||||
public async Task<DevicePermissionAssignResponse> AssignDeviceToDepartmentAsync(string currentTenantId, bool isAll, List<Guid> deviceCodes, DevicePermissionSaveRequest request)
|
||||
{
|
||||
var departmentValue = request.TenantId + ":" + request.AssignValue;
|
||||
|
||||
var p = await _dbContext.Queryable<DevicePermissionEntity>()
|
||||
.Where(x => x.AssignType == AssignTypeEnumType.Department)
|
||||
.Where(x => x.AssignValue == departmentValue)
|
||||
.Where(x => x.UniqueType == request.UniqueType)
|
||||
.WhereIF(!isAll, x => deviceCodes.Contains(x.UniqueValue))
|
||||
.Where(x => x.Type == request.Type)
|
||||
.Where(x => x.TenantId == currentTenantId)
|
||||
.ToListAsync();
|
||||
|
||||
var departments = await _dbContext.Queryable<DepartmentEntity>().ToListAsync();
|
||||
var departmentNos = new List<string> { request.AssignValue };
|
||||
DepartmentRecursionGetNext(request.AssignValue, departments, departmentNos);
|
||||
|
||||
var gainfoNos = await _dbContext.Queryable<GainfoEntity>()
|
||||
.Where(x => x.Factory == request.TenantId && departmentNos.Contains(x.DepartmentNo))
|
||||
.Select(x => x.No)
|
||||
.ToListAsync();
|
||||
|
||||
var beforeDeviceCodes = p.Select(x => x.UniqueValue).ToList();
|
||||
var presentDeviceCodes = request.Codes.IsPresent() ? request.Codes : new List<Guid>();
|
||||
|
||||
var addDeviceCodes = presentDeviceCodes.Except(beforeDeviceCodes).ToList();
|
||||
var deleteDeviceCodes = beforeDeviceCodes.Except(presentDeviceCodes).ToList();
|
||||
|
||||
await _dbContext.DeleteAsync(p);
|
||||
//保存配置的权限
|
||||
if (request.Codes.IsPresent())
|
||||
{
|
||||
var devicePermissions = request.Codes.Select(code => new DevicePermissionEntity
|
||||
{
|
||||
AssignType = request.AssignType,
|
||||
AssignValue = departmentValue,
|
||||
UniqueType = request.UniqueType,
|
||||
UniqueValue = code,
|
||||
Type = request.Type,
|
||||
TenantId = currentTenantId
|
||||
}).ToList();
|
||||
|
||||
await _dbContext.InsertAsync(devicePermissions);
|
||||
}
|
||||
|
||||
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> AssignDeviceGroupToDepartmentAsync(string currentTenantId, DevicePermissionSaveRequest request)
|
||||
{
|
||||
var departmentValue = request.TenantId + ":" + request.AssignValue;
|
||||
|
||||
var groupData = await _dbContext.Queryable<DevicePermissionEntity>()
|
||||
.Where(x => x.AssignType == AssignTypeEnumType.Department)
|
||||
.Where(x => x.AssignValue == departmentValue)
|
||||
.Where(x => x.UniqueType == request.UniqueType)
|
||||
.Where(x => x.Type == request.Type)
|
||||
.Where(x => x.TenantId == currentTenantId)
|
||||
.ToListAsync();
|
||||
|
||||
var departments = await _dbContext.Queryable<DepartmentEntity>().ToListAsync();
|
||||
var departmentNos = new List<string> { request.AssignValue };
|
||||
DepartmentRecursionGetNext(request.AssignValue, departments, departmentNos);
|
||||
|
||||
var gainfoNos = await _dbContext.Queryable<GainfoEntity>()
|
||||
.Where(x => x.Factory == request.TenantId && departmentNos.Contains(x.DepartmentNo))
|
||||
.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 = departmentValue,
|
||||
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 async Task CheckAssignTopDoorDeviceGroupAsync(DevicePermissionSaveRequest request)
|
||||
{
|
||||
@@ -337,42 +116,8 @@ public class DevicePermissionService : IDevicePermissionService
|
||||
}
|
||||
|
||||
|
||||
public async Task<DevicePermissionAssignResponse> AssignDeviceToTenantAsync(string currentTenantId, bool isAll, List<Guid> deviceCodes, DevicePermissionSaveRequest request)
|
||||
public async Task<DevicePermissionAssignResponse> GenerateTasksAsync(List<Guid> addDeviceCodes, List<Guid> deleteDeviceCodes, List<string> gainfoNos)
|
||||
{
|
||||
var p = await _dbContext.Queryable<DevicePermissionEntity>()
|
||||
.Where(x => x.AssignType == AssignTypeEnumType.Tenant)
|
||||
.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();
|
||||
|
||||
var gainfoNos = await _dbContext.Queryable<GainfoEntity>().Where(x => x.Factory == request.AssignValue).Select(x => x.No).ToListAsync();
|
||||
|
||||
var beforeDeviceCodes = p.Select(x => x.UniqueValue).ToList();
|
||||
var presentDeviceCodes = request.Codes.IsPresent() ? request.Codes : new List<Guid>();
|
||||
|
||||
var addDeviceCodes = presentDeviceCodes.Except(beforeDeviceCodes).ToList();
|
||||
var deleteDeviceCodes = beforeDeviceCodes.Except(presentDeviceCodes).ToList();
|
||||
|
||||
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);
|
||||
}
|
||||
|
||||
var allDeviceCodes = addDeviceCodes.Concat(deleteDeviceCodes).ToList();
|
||||
var devices = await _dbContext.Queryable<DeviceEntity>()
|
||||
.Where(x => allDeviceCodes.Contains(x.Code))
|
||||
@@ -729,211 +474,13 @@ public class DevicePermissionService : IDevicePermissionService
|
||||
}
|
||||
}
|
||||
|
||||
public async Task<List<Guid>> GetAssignmentsAsync(DeviceGetAssignmentsRequest request)
|
||||
{
|
||||
request.AssignValue = request.AssignType == AssignTypeEnumType.Department ? request.TenantId + ":" + request.AssignValue : request.AssignValue;
|
||||
var role = _currentUser.GetRole();
|
||||
var isAll = role is "admin" or "tenant-admin";
|
||||
var deviceCodes = _myDataPermissionService.GetMyDeviceCodes();
|
||||
|
||||
return 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)
|
||||
.Select(x => x.UniqueValue)
|
||||
.ToListAsync();
|
||||
}
|
||||
|
||||
|
||||
public async Task<List<GainfoDto>> GetAssignmentUniqueAsync(DeviceGetAssignmentUniquesRequest request)
|
||||
{
|
||||
var nos = await _dbContext.Queryable<DevicePermissionEntity>()
|
||||
.Where(x => x.UniqueType == request.UniqueType)
|
||||
.Where(x => x.UniqueValue == request.UniqueValue)
|
||||
.Where(x => x.AssignType == AssignTypeEnumType.User)
|
||||
.Where(x => x.Type == request.Type)
|
||||
.Select(x => x.AssignValue)
|
||||
.ToListAsync();
|
||||
|
||||
return await _dbContext.Queryable<GainfoEntity>().Where(x => nos.Contains(x.No)).Select(x => new GainfoDto
|
||||
{
|
||||
Id = x.Id,
|
||||
Code = x.Code,
|
||||
Name = x.Name,
|
||||
Workplace = x.Workplace,
|
||||
Factory = x.Factory
|
||||
}).ToListAsync();
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
public async Task<Dictionary<string, List<UserTenantDeviceCodeDto>>> GetUserDevicePermissionsAsync(string code)
|
||||
{
|
||||
var userNo = await _dbContext.Queryable<GainfoEntity>().Where(x => x.Code == code).Select(x => x.No).SingleAsync();
|
||||
return await GetAssignDeviceCodesInternalAsync(new List<string> { userNo });
|
||||
return await _devicePermissionAnalyzeService.GetAssignDeviceCodesInternalAsync(new List<string> { userNo });
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
public async Task GetUserDevicePermissions2Async()
|
||||
{
|
||||
var today = DateTime.Today;
|
||||
var yesterday = today.AddDays(-1);
|
||||
|
||||
var tripInfos = await _dbContext.Queryable<BusinessTripEntity>()
|
||||
.LeftJoin<GainfoEntity>((x, ga) => x.Code == ga.Code)
|
||||
.Where(x => SqlFunc.DateIsSame(x.BeginDate, today) || SqlFunc.DateIsSame(x.BeginDate, yesterday))
|
||||
.Where(x => !SqlFunc.IsNullOrEmpty(x.Destination))
|
||||
.Select((x, ga) => new
|
||||
{
|
||||
x.Code, UserNo = ga.No
|
||||
})
|
||||
.ToListAsync();
|
||||
|
||||
|
||||
//获取人员的设备权限
|
||||
|
||||
var userNos = tripInfos.Select(x => x.UserNo).Distinct().ToList();
|
||||
var result = await GetAssignDeviceCodesInternalAsync(userNos);
|
||||
|
||||
foreach (var tripInfo in tripInfos.Where(x => x.UserNo.IsPresent()))
|
||||
{
|
||||
var myDeviceCodes = result[tripInfo.UserNo].SelectMany(x => x.Codes);
|
||||
|
||||
var devices = await _dbContext.Queryable<DeviceEntity>().Where(x => myDeviceCodes.Contains(x.Code)).ToListAsync();
|
||||
|
||||
var tasks = devices.Select(x => new DeviceTaskEntity
|
||||
{
|
||||
DeviceUniqueNo = x.UniqueNo,
|
||||
Status = DeviceTaskStatusEnumType.Wait,
|
||||
Version = 0,
|
||||
UserNo = tripInfo.UserNo,
|
||||
Type = DeviceTaskEnumType.Add,
|
||||
DeviceType = x.Type,
|
||||
TenantId = x.TenantId,
|
||||
Priority = 10,
|
||||
Source = DeviceTaskSourceEnumType.Manually
|
||||
}).ToList();
|
||||
|
||||
await _dbContext.InsertAsync(tasks);
|
||||
}
|
||||
}
|
||||
|
||||
public async Task<DevicePermissionAssignResponse> GenerateDeviceTasksAsync(Func<Task> func, List<string> userNos)
|
||||
{
|
||||
var getAllUser = userNos.IsEmpty();
|
||||
|
||||
//获取所有人的权限
|
||||
if (getAllUser)
|
||||
userNos = await GetPermissionUserNosAsync();
|
||||
|
||||
var before = await GetAssignDeviceCodesInternalAsync(userNos);
|
||||
|
||||
//业务处理
|
||||
_dbContext.Client.QueryFilter.Restore();
|
||||
await func();
|
||||
_dbContext.Client.QueryFilter.ClearAndBackup<ITenantId>();
|
||||
|
||||
//获取业务处理后所有人的权限
|
||||
if (getAllUser)
|
||||
{
|
||||
var nextUserNos = await GetPermissionUserNosAsync();
|
||||
if (nextUserNos.Any())
|
||||
userNos = userNos.Concat(nextUserNos).Distinct().ToList();
|
||||
}
|
||||
|
||||
var current = await GetAssignDeviceCodesInternalAsync(userNos);
|
||||
|
||||
var devices = await _dbContext.Queryable<DeviceEntity>().Where(x => x.Enable).ToListAsync();
|
||||
// var waitAddTasks = new ConcurrentBag<DeviceTaskEntity>();
|
||||
// var waitDeleteTasks = new ConcurrentBag<DeviceTaskEntity>();
|
||||
|
||||
var waitAddTasks = new List<DeviceTaskEntity>();
|
||||
var waitDeleteTasks = new List<DeviceTaskEntity>();
|
||||
|
||||
// Parallel.ForEach(userNos, userNo =>
|
||||
// {
|
||||
foreach (var userNo in userNos)
|
||||
{
|
||||
before.TryGetValue(userNo, out var beforeTenantDeviceCodes);
|
||||
beforeTenantDeviceCodes ??= new List<UserTenantDeviceCodeDto>();
|
||||
current.TryGetValue(userNo, out var currentTenantDeviceCodes);
|
||||
currentTenantDeviceCodes ??= new List<UserTenantDeviceCodeDto>();
|
||||
|
||||
var tenants = new HashSet<string>();
|
||||
foreach (var item in beforeTenantDeviceCodes)
|
||||
tenants.Add(item.Tenant);
|
||||
foreach (var item in currentTenantDeviceCodes)
|
||||
tenants.Add(item.Tenant);
|
||||
|
||||
foreach (var tenant in tenants)
|
||||
{
|
||||
var currentCodes = currentTenantDeviceCodes.FirstOrDefault(x => x.Tenant == tenant)?.Codes?.ToList() ?? new List<Guid>();
|
||||
var beforeCodes = beforeTenantDeviceCodes.FirstOrDefault(x => x.Tenant == tenant)?.Codes?.ToList() ?? new List<Guid>();
|
||||
|
||||
//被删除
|
||||
var deletedItems = beforeCodes.Where(x => !currentCodes.Contains(x)).ToList();
|
||||
//新增
|
||||
var addItems = currentCodes.Where(x => !beforeCodes.Contains(x)).ToList();
|
||||
|
||||
if (!deletedItems.Any() && !addItems.Any())
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
var deviceCodes = devices.Where(x => deletedItems.Contains(x.Code) || addItems.Contains(x.Code)).Select(x => x.Code).ToList();
|
||||
deletedItems = deletedItems.Where(x => deviceCodes.Contains(x)).ToList();
|
||||
addItems = addItems.Where(x => deviceCodes.Contains(x)).ToList();
|
||||
|
||||
//下发任务创建
|
||||
deletedItems.ForEach(x => waitDeleteTasks.Add(new DeviceTaskEntity
|
||||
{
|
||||
DeviceUniqueNo = devices.First(item => item.Code == x).UniqueNo,
|
||||
Status = DeviceTaskStatusEnumType.Wait,
|
||||
Type = DeviceTaskEnumType.Delete,
|
||||
CancellationId = 0,
|
||||
DeviceType = devices.First(item => item.Code == x).Type,
|
||||
UserNo = userNo,
|
||||
Version = 0,
|
||||
TenantId = tenant,
|
||||
Source = DeviceTaskSourceEnumType.Manually
|
||||
}));
|
||||
|
||||
addItems.ForEach(x => waitAddTasks.Add(new DeviceTaskEntity
|
||||
{
|
||||
DeviceUniqueNo = devices.First(item => item.Code == x).UniqueNo,
|
||||
Status = DeviceTaskStatusEnumType.Wait,
|
||||
Type = DeviceTaskEnumType.Add,
|
||||
DeviceType = devices.First(item => item.Code == x).Type,
|
||||
UserNo = userNo,
|
||||
Version = 0,
|
||||
TenantId = tenant,
|
||||
Source = DeviceTaskSourceEnumType.Manually
|
||||
}));
|
||||
}
|
||||
}
|
||||
// });
|
||||
|
||||
if (waitAddTasks.Any())
|
||||
await ChunkInsertAsync(waitAddTasks.ToList());
|
||||
|
||||
if (waitDeleteTasks.Any())
|
||||
await ChunkInsertAsync(waitDeleteTasks.ToList());
|
||||
|
||||
return new DevicePermissionAssignResponse
|
||||
{
|
||||
AddCount = waitAddTasks.Count,
|
||||
DeleteCount = waitDeleteTasks.Count
|
||||
};
|
||||
|
||||
async Task ChunkInsertAsync<T>(List<T> batch) where T : class, new()
|
||||
{
|
||||
foreach (var tasks in batch.Chunk(500))
|
||||
{
|
||||
await _dbContext.InsertAsync(tasks.ToList());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public async Task<Pagination<DeviceGainfoResponse>> GetGainfoPageByDeviceAsync(DeviceWithGainfoRequest request)
|
||||
{
|
||||
@@ -1154,344 +701,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 GetAssignDeviceCodesInternalAsync(new List<string> { userNo });
|
||||
var result = await _devicePermissionAnalyzeService.GetAssignDeviceCodesInternalAsync(new List<string> { userNo });
|
||||
return result.First().Value.SelectMany(x => x.Codes).ToList();
|
||||
}
|
||||
|
||||
//************************************************ help methods *******************************************************
|
||||
|
||||
/// <summary>
|
||||
/// 获取当前基地有权限的用户
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
private async Task<List<string>> GetPermissionUserNosAsync()
|
||||
{
|
||||
var permissions = await _dbContext.Queryable<DevicePermissionEntity>().ToListAsync();
|
||||
|
||||
//User
|
||||
var userNos = permissions.Where(x => x.AssignType == AssignTypeEnumType.User)
|
||||
.Select(x => x.AssignValue)
|
||||
.Distinct()
|
||||
.ToList();
|
||||
|
||||
//Group
|
||||
var groupCodes = permissions.Where(x => x.AssignType == AssignTypeEnumType.Group)
|
||||
.Select(x => Guid.Parse(x.AssignValue))
|
||||
.Distinct()
|
||||
.ToList();
|
||||
var userNosByGroup = await _dbContext.Queryable<GainfoGroupRelationshipEntity>()
|
||||
.Where(x => groupCodes.Contains(x.GroupCode))
|
||||
.Select(x => x.UserNo)
|
||||
.ToListAsync();
|
||||
|
||||
//Department
|
||||
var tenantDepartmentNos = permissions.Where(x => x.AssignType == AssignTypeEnumType.Department)
|
||||
.Where(x => x.AssignValue.Contains(':'))
|
||||
.Select(x =>
|
||||
{
|
||||
var arr = x.AssignValue.Split(':');
|
||||
return new
|
||||
{
|
||||
Factory = arr[0], DepartmentNo = arr[1]
|
||||
};
|
||||
})
|
||||
.GroupBy(x => x.Factory)
|
||||
.ToDictionary(x => x.Key, x => x.Select(p => p.DepartmentNo).Distinct().ToList());
|
||||
var departments = await _dbContext.Queryable<DepartmentEntity>().ToListAsync();
|
||||
|
||||
var gainfoByDeptWhere = LinqExpressionExtensions.False<GainfoEntity>();
|
||||
foreach ((string factory, List<string> departmentNos) in tenantDepartmentNos)
|
||||
{
|
||||
var departmentNosToSearch = new List<string>();
|
||||
foreach (var d in departmentNos)
|
||||
{
|
||||
departmentNosToSearch.Add(d);
|
||||
RecursionGetNextAllDepartment(d, departments, departmentNosToSearch);
|
||||
}
|
||||
|
||||
gainfoByDeptWhere = gainfoByDeptWhere.Or(x => x.Factory == factory && departmentNosToSearch.Contains(x.DepartmentNo));
|
||||
}
|
||||
|
||||
var userNosByDepartment = await _dbContext.Queryable<GainfoEntity>()
|
||||
.Where(gainfoByDeptWhere)
|
||||
.Select(x => x.No)
|
||||
.ToListAsync();
|
||||
|
||||
|
||||
//Tenant
|
||||
var tenants = permissions.Where(x => x.AssignType == AssignTypeEnumType.Tenant).Select(x => x.AssignValue).Distinct().ToList();
|
||||
var userNosByWerk = await _dbContext.Queryable<GainfoEntity>().Where(x => tenants.Contains(x.Factory)).Select(x => x.No).ToListAsync();
|
||||
|
||||
return userNos.Concat(userNosByGroup).Concat(userNosByDepartment).Concat(userNosByWerk).Distinct().ToList();
|
||||
|
||||
void RecursionGetNextAllDepartment(string current, List<DepartmentEntity> data, List<string> result)
|
||||
{
|
||||
var next = data.Where(x => x.PNo == current);
|
||||
foreach (var item in next.Select(x => x.No))
|
||||
{
|
||||
result.Add(item);
|
||||
RecursionGetNextAllDepartment(item, data, result);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private static List<UserTenantDeviceCodeDto> GetAssignCodesInternal(
|
||||
List<DevicePermissionEntity> devicePermissions, List<DeviceGroupEntity> deviceGroups, List<DepartmentEntity> departments,
|
||||
DeviceAssignmentTypeEnumType uniqueType, AssignTypeEnumType assignType, string assignValue)
|
||||
{
|
||||
var tenantDevicePermissions = devicePermissions
|
||||
.Where(x => x.UniqueType == uniqueType
|
||||
&& x.AssignType == assignType
|
||||
&& x.AssignValue == assignValue)
|
||||
.GroupBy(x => x.TenantId)
|
||||
.Select(x => new UserTenantDeviceCodeDto { Tenant = x.Key, Codes = x.Select(p => p.UniqueValue) })
|
||||
.ToList();
|
||||
|
||||
//处理获取设备分组的情况
|
||||
if (uniqueType == DeviceAssignmentTypeEnumType.Group)
|
||||
{
|
||||
//开始递归处理
|
||||
var tops = deviceGroups.Where(x => !x.PCode.HasValue).ToList();
|
||||
tops.ForEach(x => { DeviceGroupRecursionGetNext(x, deviceGroups, tenantDevicePermissions, tenantDevicePermissions.SelectMany(item => item.Codes).Contains(x.Code)); });
|
||||
}
|
||||
|
||||
if (assignType == AssignTypeEnumType.Department)
|
||||
{
|
||||
//递归向上获取 assignValue = department.No
|
||||
var arr = assignValue.Split(":");
|
||||
var tenantId = arr.First();
|
||||
var currentDepartmentNo = arr.Last();
|
||||
var departmentNos = new List<string>(12) { currentDepartmentNo };
|
||||
DepartmentRecursionGetPNo(currentDepartmentNo, departments, departmentNos);
|
||||
|
||||
departmentNos = departmentNos.Select(x => tenantId + ":" + x).ToList();
|
||||
|
||||
tenantDevicePermissions = devicePermissions
|
||||
.Where(x => x.UniqueType == uniqueType)
|
||||
.Where(x => x.AssignType == assignType)
|
||||
.Where(x => departmentNos.Contains(x.AssignValue))
|
||||
.GroupBy(x => x.TenantId)
|
||||
.Select(x => new UserTenantDeviceCodeDto { Tenant = x.Key, Codes = x.Select(p => p.UniqueValue) })
|
||||
.ToList();
|
||||
}
|
||||
|
||||
return tenantDevicePermissions.GroupBy(x => x.Tenant).Select(x =>
|
||||
{
|
||||
var tenant = x.Key;
|
||||
|
||||
return new UserTenantDeviceCodeDto
|
||||
{
|
||||
Tenant = tenant,
|
||||
Codes = x.SelectMany(item => item.Codes).ToList()
|
||||
};
|
||||
}).ToList();
|
||||
}
|
||||
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
static void DepartmentRecursionGetPNo(string current, List<DepartmentEntity> data, List<string> result)
|
||||
{
|
||||
var p = data.FirstOrDefault(x => x.No == current)?.PNo;
|
||||
if (!p.IsPresent())
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
result.Add(p);
|
||||
DepartmentRecursionGetPNo(p, data, result);
|
||||
}
|
||||
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
static void DeviceGroupRecursionGetNext(DeviceGroupEntity current, List<DeviceGroupEntity> currentDeviceGroups, List<UserTenantDeviceCodeDto> result, bool add)
|
||||
{
|
||||
var next = currentDeviceGroups.Where(x => x.PCode == current.Code).ToList();
|
||||
foreach (var item in next)
|
||||
{
|
||||
if (add)
|
||||
{
|
||||
result.Add(new UserTenantDeviceCodeDto { Tenant = item.TenantId, Codes = new List<Guid> { item.Code } });
|
||||
}
|
||||
|
||||
DeviceGroupRecursionGetNext(item, currentDeviceGroups, result, result.SelectMany(x => x.Codes).Contains(item.Code));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private async Task<Dictionary<string, List<UserTenantDeviceCodeDto>>> GetAssignDeviceCodesInternalAsync(List<string> userNos)
|
||||
{
|
||||
var devices = await _dbContext.Queryable<DeviceEntity>().Where(x => x.Enable).ToListAsync();
|
||||
var deviceUniqueNos = devices.Select(x => x.UniqueNo).ToList();
|
||||
var registries = await _dbContext.Queryable<DeviceRegistryEntity>()
|
||||
.Where(x => deviceUniqueNos.Contains(x.DeviceUniqueNo))
|
||||
.Where(x => !SqlFunc.IsNullOrEmpty(x.BusinessPlaceCode))
|
||||
.ToListAsync();
|
||||
|
||||
var gainfos = await _dbContext.Queryable<GainfoEntity>().Where(x => userNos.Contains(x.No)).ToListAsync();
|
||||
if (!gainfos.Any())
|
||||
{
|
||||
return new Dictionary<string, List<UserTenantDeviceCodeDto>>();
|
||||
}
|
||||
|
||||
var enableFactoryPermissions = await _dbContext.Queryable<FactorySettingEntity>().ToListAsync();
|
||||
|
||||
var gainfoGroupRelationships = await _dbContext.Queryable<GainfoGroupRelationshipEntity>().Where(x => userNos.Contains(x.UserNo)).ToListAsync();
|
||||
var devicePermissions = await _dbContext.Queryable<DevicePermissionEntity>().ToListAsync();
|
||||
var deviceGroups = await _dbContext.Queryable<DeviceGroupEntity>().ToListAsync();
|
||||
var deviceRelationships = await _dbContext.Queryable<DeviceGroupRelationshipEntity>().ToListAsync();
|
||||
var departments = await _dbContext.Queryable<DepartmentEntity>().ToListAsync();
|
||||
|
||||
if (_parallelService.Enable)
|
||||
{
|
||||
var result = new ConcurrentDictionary<string, List<UserTenantDeviceCodeDto>>();
|
||||
|
||||
Parallel.ForEach(gainfos, new ParallelOptions { MaxDegreeOfParallelism = 4 }, gainfo =>
|
||||
{
|
||||
var gainfoDto = new GainfoDto
|
||||
{
|
||||
Id = gainfo.Id,
|
||||
No = gainfo.No,
|
||||
Code = gainfo.Code,
|
||||
Name = gainfo.Name,
|
||||
Workplace = gainfo.Workplace,
|
||||
Factory = gainfo.Factory,
|
||||
DepartmentNo = gainfo.DepartmentNo,
|
||||
IsOutsource = gainfo.Type == GainfoUserTypeEnumType.Outsource,
|
||||
EnableFactoryPermission = enableFactoryPermissions.FirstOrDefault(x => x.TenantId == gainfo.Factory)?.EnableOutsourceDown ?? true
|
||||
};
|
||||
|
||||
var codes = GetAssignDeviceCodesInternal(gainfoDto, gainfoGroupRelationships, devicePermissions, deviceGroups, deviceRelationships, registries, devices, departments);
|
||||
result.TryAdd(gainfo.No, codes);
|
||||
});
|
||||
|
||||
return result.ToDictionary(x => x.Key, x => x.Value);
|
||||
}
|
||||
else
|
||||
{
|
||||
var result = new Dictionary<string, List<UserTenantDeviceCodeDto>>();
|
||||
foreach (var gainfo in gainfos)
|
||||
{
|
||||
var gainfoDto = new GainfoDto
|
||||
{
|
||||
Id = gainfo.Id,
|
||||
No = gainfo.No,
|
||||
Code = gainfo.Code,
|
||||
Name = gainfo.Name,
|
||||
Workplace = gainfo.Workplace,
|
||||
Factory = gainfo.Factory,
|
||||
DepartmentNo = gainfo.DepartmentNo,
|
||||
IsOutsource = gainfo.Type == GainfoUserTypeEnumType.Outsource,
|
||||
EnableFactoryPermission = enableFactoryPermissions.FirstOrDefault(x => x.TenantId == gainfo.Factory)?.EnableOutsourceDown ?? true
|
||||
};
|
||||
|
||||
var codes = GetAssignDeviceCodesInternal(gainfoDto, gainfoGroupRelationships, devicePermissions, deviceGroups, deviceRelationships, registries, devices, departments);
|
||||
result.Add(gainfo.No, codes);
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private List<UserTenantDeviceCodeDto> GetAssignDeviceCodesInternal(
|
||||
GainfoDto gainfo,
|
||||
List<GainfoGroupRelationshipEntity> gainfoGroupRelationships,
|
||||
List<DevicePermissionEntity> devicePermissions,
|
||||
List<DeviceGroupEntity> deviceGroups,
|
||||
List<DeviceGroupRelationshipEntity> deviceGroupRelationships,
|
||||
List<DeviceRegistryEntity> deviceRegistries,
|
||||
List<DeviceEntity> devices, List<DepartmentEntity> departments)
|
||||
{
|
||||
if (gainfo.IsOutsource)
|
||||
{
|
||||
//外包人员不允许餐饮
|
||||
devices = devices.Where(x => x.Type != DeviceTypeEnumType.Meal).ToList();
|
||||
}
|
||||
|
||||
var userNo = gainfo.No;
|
||||
|
||||
var deviceDtos = new List<UserTenantDeviceCodeDto>();
|
||||
var deviceGroupDtos = new List<UserTenantDeviceCodeDto>();
|
||||
var businessPlaceDtos = new List<UserTenantDeviceCodeDto>();
|
||||
|
||||
//获取人员的分组,跨基地
|
||||
var gainfoGroups = gainfoGroupRelationships.Where(x => x.UserNo == userNo).Select(x => x.GroupCode).ToList();
|
||||
|
||||
//按用户
|
||||
var du = GetAssignCodesInternal(devicePermissions, deviceGroups, departments, DeviceAssignmentTypeEnumType.Device, AssignTypeEnumType.User, userNo);
|
||||
var gu = GetAssignCodesInternal(devicePermissions, deviceGroups, departments, DeviceAssignmentTypeEnumType.Group, AssignTypeEnumType.User, userNo);
|
||||
var pu = GetAssignCodesInternal(devicePermissions, deviceGroups, departments, DeviceAssignmentTypeEnumType.BusinessPlace, AssignTypeEnumType.User, userNo);
|
||||
deviceDtos.AddRange(du);
|
||||
deviceGroupDtos.AddRange(gu);
|
||||
businessPlaceDtos.AddRange(pu);
|
||||
|
||||
//按用户组
|
||||
foreach (var groupCode in gainfoGroups)
|
||||
{
|
||||
var dg = GetAssignCodesInternal(devicePermissions, deviceGroups, departments, DeviceAssignmentTypeEnumType.Device, AssignTypeEnumType.Group, groupCode.ToString());
|
||||
var gg = GetAssignCodesInternal(devicePermissions, deviceGroups, departments, DeviceAssignmentTypeEnumType.Group, AssignTypeEnumType.Group, groupCode.ToString());
|
||||
var pg = GetAssignCodesInternal(devicePermissions, deviceGroups, departments, DeviceAssignmentTypeEnumType.BusinessPlace, AssignTypeEnumType.Group, groupCode.ToString());
|
||||
deviceDtos.AddRange(dg);
|
||||
deviceGroupDtos.AddRange(gg);
|
||||
businessPlaceDtos.AddRange(pg);
|
||||
}
|
||||
|
||||
//按部门
|
||||
var currentAssignValue = gainfo.Factory + ":" + gainfo.DepartmentNo;
|
||||
var dd = GetAssignCodesInternal(devicePermissions, deviceGroups, departments, DeviceAssignmentTypeEnumType.Device, AssignTypeEnumType.Department, currentAssignValue);
|
||||
var gd = GetAssignCodesInternal(devicePermissions, deviceGroups, departments, DeviceAssignmentTypeEnumType.Group, AssignTypeEnumType.Department, currentAssignValue);
|
||||
var pd = GetAssignCodesInternal(devicePermissions, deviceGroups, departments, DeviceAssignmentTypeEnumType.BusinessPlace, AssignTypeEnumType.Department, currentAssignValue);
|
||||
deviceDtos.AddRange(dd);
|
||||
deviceGroupDtos.AddRange(gd);
|
||||
businessPlaceDtos.AddRange(pd);
|
||||
|
||||
//按厂区
|
||||
if (!gainfo.IsOutsource || gainfo.EnableFactoryPermission)
|
||||
{
|
||||
var dt = GetAssignCodesInternal(devicePermissions, deviceGroups, departments, DeviceAssignmentTypeEnumType.Device, AssignTypeEnumType.Tenant, gainfo.Factory);
|
||||
var gt = GetAssignCodesInternal(devicePermissions, deviceGroups, departments, DeviceAssignmentTypeEnumType.Group, AssignTypeEnumType.Tenant, gainfo.Factory);
|
||||
var pt = GetAssignCodesInternal(devicePermissions, deviceGroups, departments, DeviceAssignmentTypeEnumType.BusinessPlace, AssignTypeEnumType.Tenant, gainfo.Factory);
|
||||
deviceDtos.AddRange(dt);
|
||||
deviceGroupDtos.AddRange(gt);
|
||||
businessPlaceDtos.AddRange(pt);
|
||||
}
|
||||
|
||||
var deviceGroupCodes = deviceGroupDtos.SelectMany(x => x.Codes).Distinct().ToList();
|
||||
var businessPlaceCodes = businessPlaceDtos.SelectMany(x => x.Codes).Distinct().ToList();
|
||||
|
||||
var deviceCodesByGroup = deviceGroupRelationships.Where(x => deviceGroupCodes.Contains(x.GroupCode))
|
||||
.GroupBy(x => x.TenantId)
|
||||
.Select(x => new UserTenantDeviceCodeDto
|
||||
{
|
||||
Tenant = x.Key,
|
||||
Codes = x.Select(item => item.DeviceCode).Distinct().ToList()
|
||||
});
|
||||
|
||||
var placeGroup = deviceRegistries.Where(x => businessPlaceCodes.Contains(x.BusinessPlaceCode!.Value))
|
||||
.GroupBy(x => x.TenantId)
|
||||
.Select(x =>
|
||||
{
|
||||
var currentDeviceUniqueNos = x.Select(item => item.DeviceUniqueNo).ToList();
|
||||
|
||||
return new UserTenantDeviceCodeDto
|
||||
{
|
||||
Tenant = x.Key,
|
||||
Codes = devices.Where(d => currentDeviceUniqueNos.Contains(d.UniqueNo)).Select(d => d.Code).Distinct().ToList()
|
||||
};
|
||||
}).ToList();
|
||||
|
||||
deviceDtos.AddRange(deviceCodesByGroup);
|
||||
deviceDtos.AddRange(placeGroup);
|
||||
|
||||
return deviceDtos.GroupBy(x => x.Tenant).Select(x =>
|
||||
{
|
||||
var dto = new UserTenantDeviceCodeDto
|
||||
{
|
||||
Tenant = x.Key,
|
||||
Codes = x.SelectMany(item => item.Codes).Distinct().ToList()
|
||||
};
|
||||
|
||||
dto.Codes = dto.Codes.Where(p => devices.Any(item => item.Code == p)).ToList();
|
||||
|
||||
return dto;
|
||||
}).ToList();
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user