From 8bd8f38962b635d2fa576e3c031580a019774443 Mon Sep 17 00:00:00 2001
From: yanghongwei <hongwei7458@163.com>
Date: Wed, 9 Jul 2025 20:52:45 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BD=E5=90=8D=E5=8D=95=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Service/AlarmService.cs | 39 ++++++++++-----------------------------
 1 file changed, 10 insertions(+), 29 deletions(-)

diff --git a/Service/AlarmService.cs b/Service/AlarmService.cs
index 8546958..951bb77 100644
--- a/Service/AlarmService.cs
+++ b/Service/AlarmService.cs
@@ -137,37 +137,18 @@ namespace LY.App.Service
         private async Task<Tuple<bool, long>> Iswhitlist(string serial_number, double lat, double lon)
         {
             string key = RedisKeyList.white_list(serial_number);
-            if (!await _redisService.ExistsAsync(key))
-                return new Tuple<bool, long>(false, 0);
-            else
+            if (await _redisService.ExistsAsync(key))
             {
                 var entity = await _redisService.GetAsync<Whitelist>(key);
-                //判断 是否在防区内 
-                if (entity.positionId.Any())
+                //判断时间是否在区在
+                if (entity.allDay)
                 {
-                    foreach (var item in entity.positionId)
-                    {
-                        var region = await _redisService.GetAsync<PositionInfo>(RedisKeyList.PositioinRegion(item));
-                        if (region != null)
-                        {
-                            region.SetRegionJson();
-                            if (IsPointInGeoJson(lat, lon, region.RegionJson))
-                            {
-                                //判断时间是否在区在
-                                if (entity.allDay)
-                                {
-                                    return new Tuple<bool, long>(true, entity.Id);
-                                }
-                                else
-                                {
-                                    var has = entity.startTime <= DateTime.Now && DateTime.Now <= entity.endTime;
-                                    return new Tuple<bool, long>(has, has ? entity.Id : 0);
-                                }
-
-                            }
-                        }
-                    }
-
+                    return new Tuple<bool, long>(true, entity.Id);
+                }
+                else
+                {
+                    var has = entity.startTime <= DateTime.Now && DateTime.Now <= entity.endTime;
+                    return new Tuple<bool, long>(has, has ? entity.Id : 0);
                 }
             }
             return new Tuple<bool, long>(false, 0); ;
@@ -393,7 +374,7 @@ namespace LY.App.Service
                     positionId = SqlFunc.AggregateMax(st.positionId),
                 }).MergeTable()//合并查询
                 .ToPageListAsync(input.pageNum, input.pageSize, total);
-            var ids= items.Select(s => s.positionId).Distinct().ToList();
+            var ids = items.Select(s => s.positionId).Distinct().ToList();
             var positionNames = await _db.Queryable<PositionInfo>()
                .Where(s => ids.Contains(s.Id))
                .Select(s => new { s.Id, s.Name })