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
2025-10-10 11:26:15 +08:00
parent eab455aef6
commit 1268105507
5 changed files with 42 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs
View File

@@ -50,11 +50,9 @@ public class DeviceUploadLogService : IDeviceUploadLogService
{
var deviceUniqueNos = requests.Select(x => x.DeviceUniqueNo).Distinct().ToList();
var devices = await _dbContext.Queryable<DeviceEntity>().Where(x => deviceUniqueNos.Contains(x.UniqueNo)).ToListAsync();
var existsDeviceUniqueNos = devices.Select(x => x.UniqueNo).ToList();
var existsDeviceUniqueNos = devices.Select(x => x.UniqueNo).ToList();
var deviceCodes = devices.Where(x => x.DeployDirection.HasValue).Select(x => x.Code).Distinct().ToList();
var eFenceDeviceRelations = await _dbContext.Queryable<EFenceDeviceRelationEntity>().Where(x => deviceCodes.Contains(x.DeviceCode)).ToListAsync();
var eFenceDeviceMap = eFenceDeviceRelations.ToDictionary(x => x.DeviceCode, x => x.EFenceCode);
var deviceCodeInEFenceMap = await GetDeviceCodeInEFencesAsync(devices.Select(x => x.Code).ToList());
var userCodes = requests.Where(x => x.UserUniqueNo.IsPresent()).Select(x => x.UserUniqueNo).Distinct().ToList();
var gainfo1 = await _dbContext.Queryable<GainfoEntity>().Where(x => userCodes.Contains(x.Code)).Select(x => new { x.Code, x.Name, x.Type }).ToListAsync();
@@ -121,9 +119,9 @@ public class DeviceUploadLogService : IDeviceUploadLogService
? DeviceUploadLogTypeEnumType.Attendance
: DeviceUploadLogTypeEnumType.Door;
if (eFenceDeviceMap.TryGetValue(device.Code, out var eFenceCore))
if (deviceCodeInEFenceMap.TryGetValue(device.Code, out var fence))
{
await HandlerPowerSwitchAsync(eFenceCore, request.UserUniqueNo, device.DeployDirection.Value);
await HandlerPowerSwitchAsync(fence.Code, request.UserUniqueNo, fence.DirectionType);
}
var workGridInfo = new WorkGridInfo();
@@ -278,6 +276,23 @@ public class DeviceUploadLogService : IDeviceUploadLogService
}
private async Task<Dictionary<Guid, EFenceEntity>> GetDeviceCodeInEFencesAsync(List<Guid> deviceCodes)
{
var eFenceDeviceRelations = await _dbContext.Queryable<EFenceDeviceRelationEntity>()
.Where(x => deviceCodes.Contains(x.DeviceCode))
.ToListAsync();
var eFenceCodes = eFenceDeviceRelations.Select(x => x.DeviceCode).Distinct().ToList();
var eFences = await _dbContext.Queryable<EFenceEntity>().Where(x => eFenceCodes.Contains(x.Code)).ToListAsync();
//二次过滤
var eFenceCodesNew = eFences.Select(x => x.Code).Distinct().ToList();
eFenceDeviceRelations = eFenceDeviceRelations.Where(x => eFenceCodesNew.Contains(x.EFenceCode)).ToList();
return eFenceDeviceRelations.ToDictionary(x => x.DeviceCode, x => eFences.First(y => y.Code == x.EFenceCode));
}
/// <summary>
/// 宿舍只能空开触发
/// </summary>