dyf/fys-Multi-tenant
1
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

报警持续时间

Browse Source
This commit is contained in:
daiyongfei
2025-08-30 11:07:04 +08:00
parent d8686e3cbd
commit 896c501cd6
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/DeviceAlarmVo.java
View File

@ -9,6 +9,7 @@ import cn.idev.excel.annotation.ExcelProperty;
import com.fuyuanshen.common.excel.annotation.ExcelDictFormat; import com.fuyuanshen.common.excel.annotation.ExcelDictFormat;
import com.fuyuanshen.common.excel.convert.ExcelDictConvert; import com.fuyuanshen.common.excel.convert.ExcelDictConvert;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import java.io.Serial; import java.io.Serial;
@ -118,7 +119,7 @@ public class DeviceAlarmVo implements Serializable {
* 报警持续时间 * 报警持续时间
*/ */
@ExcelProperty(value = "报警持续时间") @ExcelProperty(value = "报警持续时间")
private Long durationTime; private String durationTime;
/** /**
* 0已处理，1未处理 * 0已处理，1未处理
@ -126,5 +127,11 @@ public class DeviceAlarmVo implements Serializable {
@ExcelProperty(value = "0已处理，1未处理") @ExcelProperty(value = "0已处理，1未处理")
private Integer treatmentState; private Integer treatmentState;
/**
* 设备图片
* device_pic
*/
@Schema(name = "设备图片")
private String devicePic;
} }

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

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