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 14:36:26 +08:00
parent 1268105507
commit b708efa87e
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -89,6 +89,13 @@ public class DeviceUploadLogService : IDeviceUploadLogService
var inserts = new List<DeviceUploadLogEntity>();
foreach (var request in requests.Where(x => existsDeviceUniqueNos.Contains(x.DeviceUniqueNo)))
{
var device = devices.First(x => x.UniqueNo == request.DeviceUniqueNo);
//智能空开判断
if (deviceCodeInEFenceMap.TryGetValue(device.Code, out var fence))
{
await HandlerPowerSwitchAsync(fence.Code, request.UserUniqueNo, fence.DirectionType);
}
if (await _dbContext.Queryable<DeviceUploadLogEntity>().Where(x => x.DeviceUniqueNo == request.DeviceUniqueNo
&& x.SerialNo == request.SerialNo
&& x.RaiseDateTime == request.RaiseDateTime).AnyAsync())
@@ -109,8 +116,6 @@ public class DeviceUploadLogService : IDeviceUploadLogService
}
}
var device = devices.First(x => x.UniqueNo == request.DeviceUniqueNo);
var currentGainfo = gainfos.FirstOrDefault(x => x.Code == request.UserUniqueNo);
var userType = currentGainfo?.Type;
var needUpload = ((userType is GainfoUserTypeEnumType.Normal or GainfoUserTypeEnumType.SecurityWhite)
@@ -119,11 +124,6 @@ public class DeviceUploadLogService : IDeviceUploadLogService
? DeviceUploadLogTypeEnumType.Attendance
: DeviceUploadLogTypeEnumType.Door;
if (deviceCodeInEFenceMap.TryGetValue(device.Code, out var fence))
{
await HandlerPowerSwitchAsync(fence.Code, request.UserUniqueNo, fence.DirectionType);
}
var workGridInfo = new WorkGridInfo();
var currentWorkGridTimePeriods = workGridTimePeriods.Where(x => x.TenantId == device.TenantId).ToList();
var currentWorkGridSchedules = workGridSchedules.Where(x => x.UserCode == request.UserUniqueNo).ToList();