diff --git a/Service/AlarmService.cs b/Service/AlarmService.cs index 622a453..bc450a2 100644 --- a/Service/AlarmService.cs +++ b/Service/AlarmService.cs @@ -49,12 +49,15 @@ 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" || !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()) { entity.AddRange(O4entity); + } + if (entity.Any()) + { foreach (var item in entity) { item.BatchId = await GetBatId(item.serial_number); @@ -72,6 +75,8 @@ namespace LY.App.Service //推送报警信息 await _pushService.SendMessageToAll(new { msgType = "event", data = entity }); } + + } return new ApiResult(); }