报警持续时间

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;
 
 }

fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceAlarmMapper.xml

@@ -7,7 +7,7 @@
     <!-- 查询设备告警列表 -->
     <select id="selectVoPage" resultType="com.fuyuanshen.equipment.domain.vo.DeviceAlarmVo">
         select *, d.device_mac as deviceMac, d.device_imei as deviceImei,
-        d.type_name as deviceTypeName
+        d.type_name as deviceTypeName, d.device_pic as devicePic
         from device_alarm da
         left join device d on da.device_id = d.id
         left join device_type dt on dt.id = da.device_type