diff --git a/Service/AlarmService.cs b/Service/AlarmService.cs index 8f45631..5d67072 100644 --- a/Service/AlarmService.cs +++ b/Service/AlarmService.cs @@ -52,6 +52,7 @@ namespace LY.App.Service { // 排除掉不在范围内的报警信息 var O4entity = entity.Where(s => s.device_type == "O4" || s.serial_number == "O4" || s.device_type == "UAV" || !string.IsNullOrEmpty(s.device_type)); + entity = entity.Where(s => checkDistance(s.drone_lat, s.drone_lon, deviceinfo.Lat, deviceinfo.Lon) == true).ToList(); if (O4entity.Any()) { foreach (var item in O4entity) @@ -62,6 +63,7 @@ namespace LY.App.Service } } } + entity = entity.Distinct().ToList(); if (entity.Any()) { foreach (var item in entity)