From ef33c332a0b9b1c15fde54f1d7fe21ac52824105 Mon Sep 17 00:00:00 2001 From: zhaokai Date: Wed, 5 Aug 2026 11:31:50 +0800 Subject: [PATCH] =?UTF-8?q?feat(alarm):=20=E6=B7=BB=E5=8A=A0=E4=BC=A0?= =?UTF-8?q?=E6=84=9F=E5=99=A8=E5=90=8D=E7=A7=B0=E5=AD=97=E6=AE=B5=E5=88=B0?= =?UTF-8?q?=E6=8A=A5=E8=AD=A6=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zcloud/dto/clientobject/AlarmRecordScreenCO.java | 3 +++ .../src/main/resources/mapper/AlarmRecordMapper.xml | 1 + 2 files changed, 4 insertions(+) diff --git a/web-client/src/main/java/com/zcloud/dto/clientobject/AlarmRecordScreenCO.java b/web-client/src/main/java/com/zcloud/dto/clientobject/AlarmRecordScreenCO.java index fbaa29b..6edfd69 100644 --- a/web-client/src/main/java/com/zcloud/dto/clientobject/AlarmRecordScreenCO.java +++ b/web-client/src/main/java/com/zcloud/dto/clientobject/AlarmRecordScreenCO.java @@ -22,6 +22,9 @@ public class AlarmRecordScreenCO extends ClientObject { @ApiModelProperty(value = "设备类型") private String alarmSourceName; + @ApiModelProperty(value = "设备名称") + private String sensorName; + @ApiModelProperty(value = "所属单位名称") private String corpName; diff --git a/web-infrastructure/src/main/resources/mapper/AlarmRecordMapper.xml b/web-infrastructure/src/main/resources/mapper/AlarmRecordMapper.xml index 3375667..62e8d28 100644 --- a/web-infrastructure/src/main/resources/mapper/AlarmRecordMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/AlarmRecordMapper.xml @@ -121,6 +121,7 @@ WHEN 'THRESHOLD' THEN '阈值报警' ELSE ar.alarm_source END AS alarmSourceName, + iasd.sensor_name AS sensorName, ci.corp_name AS corpName, fr.fire_region_name AS fireRegionName, ar.alarm_type AS alarmType,