From 09785d909aa8b93f7c6a700e7aa503155a1cd1a3 Mon Sep 17 00:00:00 2001 From: yanghongwei Date: Sun, 24 Aug 2025 15:22:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=BA=E5=9E=8B=E4=BC=9A=E5=8F=91=E7=94=9F?= =?UTF-8?q?=E5=8F=98=E5=8C=96=EF=BC=8C=E8=BF=99=E9=87=8C=E5=8F=AA=E5=8F=96?= =?UTF-8?q?=E7=AC=AC=E4=B8=80=E6=9D=A1?= 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 f048174..6d9cc03 100644 --- a/Service/AlarmService.cs +++ b/Service/AlarmService.cs @@ -423,12 +423,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(), @@ -437,7 +437,6 @@ namespace LY.App.Service sn = st.serial_number, Frequency = 0, duration = (SqlFunc.AggregateMax(st.CreateTime) - SqlFunc.AggregateMin(st.CreateTime)).TotalSeconds, - model = st.device_type, IsWhitelist = SqlFunc.AggregateMax(st.IsWhitelist), }).OrderByDescending(s => s.batchId).ToListAsync(); @@ -448,6 +447,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() {