yuangb/jinko.yikatong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 移除并发

Browse Source
This commit is contained in:
liguoyang
2024-11-28 19:12:52 +08:00
parent c653c8d453
commit 9b32ec28db
1 changed files with 38 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs
View File

@@ -216,10 +216,15 @@ public class DevicePermissionService : IDevicePermissionService
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 ConcurrentBag<DeviceTaskEntity>();
// var waitDeleteTasks = new ConcurrentBag<DeviceTaskEntity>();
Parallel.ForEach(userNos, userNo =>
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>();
@@ -277,7 +282,8 @@ public class DevicePermissionService : IDevicePermissionService
Source = DeviceTaskSourceEnumType.Manually
}));
}
});
}
// });
if (waitAddTasks.Any())
await ChunkInsertAsync(waitAddTasks.ToList());
@@ -621,8 +627,30 @@ public class DevicePermissionService : IDevicePermissionService
var deviceRelationships = await _dbContext.Queryable<DeviceGroupRelationshipEntity>().ToListAsync();
var departments = await _dbContext.Queryable<DepartmentEntity>().ToListAsync();
var result = new ConcurrentDictionary<string, List<UserTenantDeviceCodeDto>>();
Parallel.ForEach(gainfos, gainfo =>
//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);
var result = new Dictionary<string, List<UserTenantDeviceCodeDto>>();
foreach (var gainfo in gainfos)
{
var gainfoDto = new GainfoDto
{
@@ -638,12 +666,13 @@ public class DevicePermissionService : IDevicePermissionService
};
var codes = GetAssignDeviceCodesInternal(gainfoDto, gainfoGroupRelationships, devicePermissions, deviceGroups, deviceRelationships, registries, devices, departments);
result.TryAdd(gainfo.No, codes);
});
result.Add(gainfo.No, codes);
}
return result.ToDictionary(x => x.Key, x => x.Value);
return result;
}
private static List<UserTenantDeviceCodeDto> GetAssignDeviceCodesInternal(
GainfoDto gainfo,
List<GainfoGroupRelationshipEntity> gainfoGroupRelationships,