From a17cf970cb28836f3d37510a7e6b8be4d471e8d1 Mon Sep 17 00:00:00 2001 From: yanghongwei Date: Mon, 31 Mar 2025 21:44:50 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=A8=E8=BF=B9=E5=9B=9E=E6=94=BE=E5=8A=A0?= =?UTF-8?q?=E5=85=A5=E9=A3=9E=E6=89=8B=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Service/AlarmService.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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(),