From b8279ad72886ab5d858ba885bf7b19caa7f97f56 Mon Sep 17 00:00:00 2001 From: yanghongwei Date: Fri, 22 Aug 2025 16:50:41 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E8=B0=83=E6=95=B4=EF=BC=8C?= =?UTF-8?q?=E9=A2=84=E8=AD=A6=E5=88=97=E8=A1=A8=EF=BC=8C=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E6=96=B0=E5=8A=A0=E7=99=BD=E5=90=8D=E5=8D=95=EF=BC=8C=E9=A2=84?= =?UTF-8?q?=E8=AD=A6=E7=AD=89=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Model/AlarmRepDto.cs | 1 + Service/AlarmService.cs | 5 +++-- appsettings.json | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Model/AlarmRepDto.cs b/Model/AlarmRepDto.cs index f3bc244..4f212e9 100644 --- a/Model/AlarmRepDto.cs +++ b/Model/AlarmRepDto.cs @@ -21,6 +21,7 @@ namespace LY.App.Model [JsonConverter(typeof(ValueToStringConverter))] public long positionId { get; set; } public string positionName { get; set; } + public int alarmLevel { get; set; } //public long position_id { get; set; } } diff --git a/Service/AlarmService.cs b/Service/AlarmService.cs index e737922..61cc6f9 100644 --- a/Service/AlarmService.cs +++ b/Service/AlarmService.cs @@ -406,7 +406,7 @@ namespace LY.App.Service var query = await _db.Queryable() .Where(s => pageitem.Item2.Contains(s.BatchId)).SplitTable() - .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, s.alarmLevel }) .Select(st => new AlarmRepDto { batchId = st.BatchId.ToString(), @@ -416,7 +416,8 @@ namespace LY.App.Service Frequency = SqlFunc.AggregateMax(st.freq), duration = (SqlFunc.AggregateMax(st.CreateTime) - SqlFunc.AggregateMin(st.CreateTime)).TotalSeconds == 0 ? 1 : (SqlFunc.AggregateMax(st.CreateTime) - SqlFunc.AggregateMin(st.CreateTime)).TotalSeconds, model = st.device_type, - IsWhitelist = SqlFunc.AggregateMax(st.IsWhitelist) + IsWhitelist = SqlFunc.AggregateMax(st.IsWhitelist), + alarmLevel = SqlFunc.AggregateMax(st.alarmLevel) }).OrderByDescending(s => s.batchId).ToListAsync(); return new ApiResult() { diff --git a/appsettings.json b/appsettings.json index 4563222..661f55c 100644 --- a/appsettings.json +++ b/appsettings.json @@ -8,7 +8,7 @@ "log2db": true, //是否记录 "AllowedHosts": "*", "ConnectionStrings": { - "DefaultConnection": "server=114.66.59.70;port=33306;database=lyapp;user=root;password=dklymysql;Pooling=true;" + "DefaultConnection": "server=110.42.35.89;port=13306;database=lyapp;user=root;password=dklymysql;Pooling=true;" }, "Token": { "SecretKey": "HWLSNPM+OhlFe4wwEV/teSWsxGjrWbxKnHonxW5Z+mFlQq3zonv5",