diff --git a/Service/AlarmService.cs b/Service/AlarmService.cs index 8c33eb6..622a453 100644 --- a/Service/AlarmService.cs +++ b/Service/AlarmService.cs @@ -49,7 +49,8 @@ namespace LY.App.Service var entity = input.data.Adapt>(); if (entity.Any()) { - var O4entity = entity.Where(s => s.device_type == "O4" || s.serial_number == "O4"||s.device_type== "UAV"); + // 排除掉不这几个类型的设备 + 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()) {