From 3f1445f2dca0b6496749692ab6f77f3c38063269 Mon Sep 17 00:00:00 2001
From: xusd <xu13181496959@163.com>
Date: Fri, 27 Sep 2024 15:37:45 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=8A=A5=E8=AD=A6=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=88=97=E8=A1=A8=E4=B8=AD=E6=8A=A5=E8=AD=A6=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E6=94=B9=E4=B8=BA=E9=A6=96=E6=AC=A1=E6=8A=A5=E8=AD=A6?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/controller/imtIndex/vo/ImtIndexAlarmListVO.java    | 2 +-
 .../src/main/resources/mapper/alarm/AlarmDataMapper.xml       | 4 ++--
 imt-ui/src/views/imtIndex.vue                                 | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/controller/imtIndex/vo/ImtIndexAlarmListVO.java b/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/controller/imtIndex/vo/ImtIndexAlarmListVO.java
index 1b024ec..d565432 100644
--- a/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/controller/imtIndex/vo/ImtIndexAlarmListVO.java
+++ b/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/controller/imtIndex/vo/ImtIndexAlarmListVO.java
@@ -20,7 +20,7 @@ public class ImtIndexAlarmListVO {
     private String customerName;
 
     @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = TIME_ZONE_DEFAULT)
-    private Date lastAlarmTime;
+    private Date firstAlarmTime;
 
     private String equipNo;
 
diff --git a/imt-server/imt-module-system/imt-module-system-biz/src/main/resources/mapper/alarm/AlarmDataMapper.xml b/imt-server/imt-module-system/imt-module-system-biz/src/main/resources/mapper/alarm/AlarmDataMapper.xml
index 3b46d18..f4c6ea9 100644
--- a/imt-server/imt-module-system/imt-module-system-biz/src/main/resources/mapper/alarm/AlarmDataMapper.xml
+++ b/imt-server/imt-module-system/imt-module-system-biz/src/main/resources/mapper/alarm/AlarmDataMapper.xml
@@ -26,7 +26,7 @@
 
     <resultMap id="selectListTop3" type="com.inspur.module.system.controller.imtIndex.vo.ImtIndexAlarmListVO">
         <result property="content"    column="content"    />
-        <result property="lastAlarmTime"    column="last_alarm_time"    />
+        <result property="firstAlarmTime"    column="first_alarm_time"    />
         <result property="customerName"    column="customer_name"    />
         <result property="equipNo"    column="equip_no"    />
     </resultMap>
@@ -69,7 +69,7 @@
         <include refid="selectAlarmDataVo"/>
         where ad.status = 0
         and ad.deleted = '0'
-        ORDER BY ad.last_alarm_time desc
+        ORDER BY ad.first_alarm_time desc
         limit 3
     </select>
     <select id="getAlarmDataTimeLineByEquipId"
diff --git a/imt-ui/src/views/imtIndex.vue b/imt-ui/src/views/imtIndex.vue
index b35ad0f..2b776be 100644
--- a/imt-ui/src/views/imtIndex.vue
+++ b/imt-ui/src/views/imtIndex.vue
@@ -121,7 +121,7 @@
             <el-table-column label="客户名称" align="center" prop="customerName" :show-overflow-tooltip="true" />
             <el-table-column label="设备编号" align="center" prop="equipNo" :show-overflow-tooltip="true" />
             <el-table-column label="报警信息" align="center" prop="content" :show-overflow-tooltip="true" />
-            <el-table-column label="报警时间" align="center" prop="lastAlarmTime" width="180" :show-overflow-tooltip="true" />
+            <el-table-column label="报警时间" align="center" prop="firstAlarmTime" width="180" :show-overflow-tooltip="true" />
           </el-table>
         </el-card>
       </el-col>