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,