From 828a0ec114279086e5a899b3ca0f45ae22fe4382 Mon Sep 17 00:00:00 2001
From: "zangch@mesnac.com" <zangch@mesnac.com>
Date: Thu, 22 Jan 2026 13:39:12 +0800
Subject: [PATCH] =?UTF-8?q?refactor(report):=20=E6=9B=B4=E6=96=B0=E6=8A=A5?=
 =?UTF-8?q?=E8=AD=A6=E4=BF=A1=E6=81=AF=E6=9F=A5=E8=AF=A2=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将数据源从 RECORD_ALARM_DEVICE 改为 DMS_RECORD_ALARM_INFO + BASE_DEVICELEDGER
- 修改字段映射：ALARM_INFO 改为 ALARM_REASON
- 修改字段映射：ALARM_TIME 改为 ALARM_BEGIN_TIME
- 添加设备名称关联查询
- 保持按报警时间降序排列逻辑
---
 .../main/resources/mapper/report/Board4Mapper.xml  | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/aucma-report/src/main/resources/mapper/report/Board4Mapper.xml b/aucma-report/src/main/resources/mapper/report/Board4Mapper.xml
index 7a1ed27..3e971c1 100644
--- a/aucma-report/src/main/resources/mapper/report/Board4Mapper.xml
+++ b/aucma-report/src/main/resources/mapper/report/Board4Mapper.xml
@@ -76,15 +76,15 @@
     </select>
 
     <!-- 查询最新报警信息 -->
-    <!-- 数据来源：RECORD_ALARM_DEVICE -->
+    <!-- 数据来源：DMS_RECORD_ALARM_INFO + BASE_DEVICELEDGER -->
     <select id="selectLatestAlarmInfo" resultType="java.util.HashMap">
         SELECT * FROM (
-            SELECT a.DEVICE_NAME AS DEVICE_NAME,
-                   a.ALARM_INFO AS ALARM_REASON,
-                   TO_CHAR(a.ALARM_TIME, 'HH24:MI:SS') AS ALARM_TIME
-            FROM RECORD_ALARM_DEVICE a
-            WHERE a.IS_FLAG = 0
-            ORDER BY a.ALARM_TIME DESC
+            SELECT d.DEVICE_NAME AS DEVICE_NAME,
+                   a.ALARM_REASON AS ALARM_REASON,
+                   TO_CHAR(a.ALARM_BEGIN_TIME, 'HH24:MI:SS') AS ALARM_TIME
+            FROM DMS_RECORD_ALARM_INFO a
+            LEFT JOIN BASE_DEVICELEDGER d ON a.DEVICE_ID = d.OBJ_ID
+            ORDER BY a.ALARM_BEGIN_TIME DESC
         ) WHERE ROWNUM = 1
     </select>