fix 修改营业点分页模糊搜索条件

Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs

@@ -600,25 +600,42 @@ public class BalanceService : IBalanceService
     /// <returns></returns>
     private async Task<List<DeviceEntity>> GetOfflineDevicesCount(List<DeviceEntity> devices)
     {
-        var nos = devices.Select(x => x.UniqueNo).ToList();
-        var deviceRegistrys = await _dbContext.Queryable<DeviceRegistryEntity>()
-            .Where(x => nos.Contains(x.DeviceUniqueNo))
+        var now = DateTime.Now;
+
+        var deviceUniqueNos = devices.Select(x => x.UniqueNo).ToList();
+
+        var deviceRegistries = await _dbContext.Queryable<DeviceRegistryEntity>()
+            .LeftJoin<DeviceEntity>((x, d) => x.DeviceUniqueNo == d.UniqueNo)
+            .Where(x => deviceUniqueNos.Contains(x.DeviceUniqueNo))
+            .Select((x, d) => new
+            {
+                UniqueNo = d.UniqueNo,
+                d.HeartbeatInterval,
+                x.LastHeartbeatTime
+            })
             .ToListAsync();
 
-        var list = new List<DeviceEntity>();
-        foreach (var device in devices)
-        {
-            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);
-            }
-        }
+        var OnlineDevices = deviceRegistries
+                .Where(x =>
+                {
+                    if (x.HeartbeatInterval <= 0)
+                    {
+                        return true;
+                    }
+
+                    return x.LastHeartbeatTime.AddSeconds(x.HeartbeatInterval * 3) >= now;
+
+                })
+                .Select(x => new
+                {
+                    UniqueNo = x.UniqueNo,
+                })
+                .ToList();
+        var onlineUniqueNos = new List<string>();
+        OnlineDevices.ForEach(x => onlineUniqueNos.Add(x.UniqueNo));
+
+        var offUniqueNos = deviceUniqueNos.Except(onlineUniqueNos).ToList();
+        var list = devices.Where(x => offUniqueNos.Contains(x.UniqueNo)).ToList();
         return list;
     }