From 55be401a3ffbf2c6da59427814a6e67422ada73d Mon Sep 17 00:00:00 2001
From: "gao.zhiyuan" <gao.zhiyuan@free-sun.com.cn>
Date: Wed, 28 Sep 2022 17:53:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=A6=E5=87=BA=E5=B7=B2=E7=A1=AE=E8=AE=A4?=
 =?UTF-8?q?=E5=91=8A=E8=AD=A6=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/app/lib/controllers/alarm/data.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/api/app/lib/controllers/alarm/data.js b/api/app/lib/controllers/alarm/data.js
index a466329..c8ef878 100644
--- a/api/app/lib/controllers/alarm/data.js
+++ b/api/app/lib/controllers/alarm/data.js
@@ -130,7 +130,7 @@ async function list (ctx) {
          const confirmedAlarmDetailMax = confirmedAlarm.length ?
             await clickHouse.dataAlarm.query(`
                SELECT 
-                  max(Time) AS Time,AlarmId
+                  max(Time) AS Time, AlarmId , max(Content) AS Content
                FROM 
                   alarm_details
                WHERE
@@ -166,11 +166,12 @@ async function list (ctx) {
 
             // 最新告警详情 - 确认信息
             let corConfirmedData = (confirmedAlarmDetailMax.find(cdm => cdm.AlarmId == ar.AlarmId) || {});
-            if (corConfirmedData.AlarmState && corConfirmedData.AlarmState > 2) {
 
-            } else {
-               corConfirmedData = {}
-            }
+            // if (corConfirmedData.AlarmState && corConfirmedData.AlarmState > 2) {
+
+            // } else {
+            //    corConfirmedData = {}
+            // }
             ar.confirmedContent = corConfirmedData.Content
             ar.confirmedTime = corConfirmedData.Time