From 1c9a4afcbcb6ba29031919f0b7a863ec8c461ff2 Mon Sep 17 00:00:00 2001 From: yanghongwei Date: Sun, 24 Aug 2025 16:32:14 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E8=B0=83=E6=95=B4=EF=BC=8C?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=89=B9=E6=AC=A1=E6=8C=89sn=E6=9D=A5=20?= =?UTF-8?q?=E5=88=86=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Service/AlarmService.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Service/AlarmService.cs b/Service/AlarmService.cs index 5f24330..f91efd0 100644 --- a/Service/AlarmService.cs +++ b/Service/AlarmService.cs @@ -405,12 +405,12 @@ namespace LY.App.Service var pageitem = await _db.Ado.SqlQueryAsync(string.Format(coutsql, tablesql) + string.Format(page, tablesql, (input.pageNum - 1) * input.pageSize, input.pageSize)); var temp = await _db.Queryable() - .Where(s => pageitem.Item2.Contains(s.BatchId)).SplitTable().Select(s => new { s.BatchId, s.freq, s.Id, s.positionId, s.PostionName, s.alarmLevel }).ToListAsync(); + .Where(s => pageitem.Item2.Contains(s.BatchId)).SplitTable().Select(s => new { s.BatchId, s.freq, s.Id, s.positionId, s.PostionName, s.alarmLevel, s.device_type }).ToListAsync(); var query = await _db.Queryable() .Where(s => pageitem.Item2.Contains(s.BatchId)).SplitTable() - .GroupBy(s => new { s.BatchId, s.serial_number, s.device_type }) + .GroupBy(s => new { s.BatchId, s.serial_number }) .Select(st => new AlarmRepDto { batchId = st.BatchId.ToString(), @@ -418,7 +418,6 @@ namespace LY.App.Service endTime = SqlFunc.AggregateMax(st.CreateTime), sn = st.serial_number, duration = (SqlFunc.AggregateMax(st.CreateTime) - SqlFunc.AggregateMin(st.CreateTime)).TotalSeconds, - model = st.device_type, IsWhitelist = SqlFunc.AggregateMax(st.IsWhitelist), }).OrderByDescending(s => s.batchId).ToListAsync(); @@ -429,6 +428,7 @@ namespace LY.App.Service s.positionId = temp.Where(m => m.BatchId == long.Parse(s.batchId)).OrderByDescending(o => o.Id).FirstOrDefault().positionId; s.positionName = temp.Where(m => m.BatchId == long.Parse(s.batchId)).OrderByDescending(o => o.Id).FirstOrDefault().PostionName; s.alarmLevel = temp.Where(m => m.BatchId == long.Parse(s.batchId)).Any(o => o.alarmLevel == 1) ? 1 : 0; + s.model = temp.Where(m => m.BatchId == long.Parse(s.batchId)).OrderByDescending(o => o.Id).FirstOrDefault().device_type; }); return new ApiResult() { code = 0,