diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/DeviceAlarmVo.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/DeviceAlarmVo.java index 6800f809..4e9935d3 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/DeviceAlarmVo.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/DeviceAlarmVo.java @@ -9,6 +9,7 @@ import cn.idev.excel.annotation.ExcelProperty; import com.fuyuanshen.common.excel.annotation.ExcelDictFormat; import com.fuyuanshen.common.excel.convert.ExcelDictConvert; import io.github.linpeilie.annotations.AutoMapper; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.io.Serial; @@ -118,7 +119,7 @@ public class DeviceAlarmVo implements Serializable { * 报警持续时间 */ @ExcelProperty(value = "报警持续时间") - private Long durationTime; + private String durationTime; /** * 0已处理,1未处理 @@ -126,5 +127,11 @@ public class DeviceAlarmVo implements Serializable { @ExcelProperty(value = "0已处理,1未处理") private Integer treatmentState; + /** + * 设备图片 + * device_pic + */ + @Schema(name = "设备图片") + private String devicePic; } diff --git a/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceAlarmMapper.xml b/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceAlarmMapper.xml index 5752328d..cdb76f8a 100644 --- a/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceAlarmMapper.xml +++ b/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceAlarmMapper.xml @@ -7,7 +7,7 @@