From d38d142a3699c87a8d6e5bf08fba58fa768e22f7 Mon Sep 17 00:00:00 2001
From: YYD-YY <2962062657@qq.com>
Date: Mon, 6 Oct 2025 16:11:27 +0800
Subject: [PATCH] =?UTF-8?q?10.6=E4=BF=AE=E6=AD=A3=E9=A2=84=E8=AD=A6?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/alops/system/domain/AlertMessage.java   | 3 ++-
 .../src/main/resources/mapper/system/AlertMessageMapper.xml   | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/AlertMessage.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/AlertMessage.java
index c80ad07f..a6bf00be 100644
--- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/AlertMessage.java
+++ b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/AlertMessage.java
@@ -70,7 +70,8 @@ public class AlertMessage
     @Excel(name = "信息批次")
     private Integer batch;
 
-
+    @Excel(name ="预警信息")
+    private String message;
 
 
 
diff --git a/ALOps_sys_backend/alops-system/src/main/resources/mapper/system/AlertMessageMapper.xml b/ALOps_sys_backend/alops-system/src/main/resources/mapper/system/AlertMessageMapper.xml
index d748818f..4c95da90 100644
--- a/ALOps_sys_backend/alops-system/src/main/resources/mapper/system/AlertMessageMapper.xml
+++ b/ALOps_sys_backend/alops-system/src/main/resources/mapper/system/AlertMessageMapper.xml
@@ -19,7 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="handleTime"    column="handle_time"    />
         <result property="status"    column="status"    />
         <result property="batch"    column="batch"    />
-
+        <result property="message"     column="message"     />
     </resultMap>
 
     <select id="selectMaxBatch" resultType="integer">
@@ -58,7 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        </sql>
 
     <sql id="selectAlertMessageVoJoinGather">
-        select a.id, g.equ_id, type, equ_type, solution, level, occur_time, handler, handle_time, status,batch from alert_message a LEFT JOIN equ_gather g ON a.equ_id = g.equ_id
+        select a.id, g.equ_id, type, equ_type, solution, level, occur_time, handler, handle_time, status,batch,message from alert_message a LEFT JOIN equ_gather g ON a.equ_id = g.equ_id
     </sql>
 
     <select id="selectAlertMessageList" parameterType="AlertDto" resultMap="AlertMessageResult">