diff --git a/Service/AlarmService.cs b/Service/AlarmService.cs index 9f4cf1b..6e4b9ab 100644 --- a/Service/AlarmService.cs +++ b/Service/AlarmService.cs @@ -158,6 +158,8 @@ namespace LY.App.Service Lon = s.drone_lon, Lat = s.drone_lat, Alt = s.height, + s.app_lat, + s.app_lon, s.CreateTime, AlarmLevel = s.alarmLevel, }).ToListAsync(); @@ -259,7 +261,7 @@ namespace LY.App.Service .WhereIF(input.strartDate.HasValue, st => st.CreateTime >= input.strartDate.Value) .WhereIF(input.endDate.HasValue, st => st.CreateTime <= input.endDate.Value.AddDays(1)) .OrderBy(s => s.BatchId, OrderByType.Desc) - .GroupBy(s => new { s.BatchId, s.serial_number, s.device_type, s.positionId, s.PostionName ,s.freq}) + .GroupBy(s => new { s.BatchId, s.serial_number, s.device_type, s.positionId, s.PostionName, s.freq }) .Select(st => new AlarmRepDto { batchId = st.BatchId.ToString(),