From 640143eb6b655fa95fc734eefdb9ca849cbc9335 Mon Sep 17 00:00:00 2001 From: cheche <717840555@qq.com> Date: Mon, 4 Mar 2024 13:56:30 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E4=BF=AE=E6=AD=A3=E7=A6=BB=E7=BA=BF?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=88=A4=E6=96=AD=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Services/Implements/DeviceService.cs | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs b/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs index 8173bcf9..f06f81c4 100644 --- a/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs +++ b/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs @@ -298,16 +298,24 @@ public class DeviceService : IDeviceService var list = new List(); foreach (var device in devices) { - var regis = deviceRegistrys.FirstOrDefault(x => x.DeviceUniqueNo == device.UniqueNo); - if (regis == null) + if(device.HeartbeatInterval > 0) { - continue; + var regis = deviceRegistrys.FirstOrDefault(x => x.DeviceUniqueNo == device.UniqueNo); + if (regis == null) + { + continue; + } + TimeSpan timeDifference = DateTime.Now - regis.LastHeartbeatTime; + if (timeDifference.TotalSeconds > (device.HeartbeatInterval * 3)) + { + list.Add(device); + } } - TimeSpan timeDifference = DateTime.Now - regis.LastHeartbeatTime; - if (timeDifference.TotalSeconds > (device.HeartbeatInterval * 3)) + else { list.Add(device); } + } return list; }