From b708efa87e74849c2b0c3341045da3cdb5b182a1 Mon Sep 17 00:00:00 2001 From: liguoyang Date: Fri, 10 Oct 2025 14:36:26 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E7=A9=BA=E5=BC=80=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E6=8F=90=E5=89=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Services/Implements/DeviceUploadLogService.cs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs b/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs index 92a49050..2427b67c 100644 --- a/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs +++ b/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs @@ -89,6 +89,13 @@ public class DeviceUploadLogService : IDeviceUploadLogService var inserts = new List(); 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().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();