|
@@ -1,6 +1,7 @@
|
|
package com.shawn.model.dto;
|
|
package com.shawn.model.dto;
|
|
|
|
|
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
|
|
|
+import com.shawn.model.entity.TAlarmRecord;
|
|
import com.shawn.model.entity.TEquipment;
|
|
import com.shawn.model.entity.TEquipment;
|
|
import com.shawn.util.DateUtils;
|
|
import com.shawn.util.DateUtils;
|
|
import io.swagger.annotations.ApiModelProperty;
|
|
import io.swagger.annotations.ApiModelProperty;
|
|
@@ -12,21 +13,32 @@ import lombok.experimental.Accessors;
|
|
import org.springframework.format.annotation.DateTimeFormat;
|
|
import org.springframework.format.annotation.DateTimeFormat;
|
|
|
|
|
|
import java.util.Date;
|
|
import java.util.Date;
|
|
|
|
+import java.util.List;
|
|
|
|
|
|
@Accessors(chain = true)
|
|
@Accessors(chain = true)
|
|
@NoArgsConstructor
|
|
@NoArgsConstructor
|
|
@ToString
|
|
@ToString
|
|
public class TEquipmentDTO extends TEquipment {
|
|
public class TEquipmentDTO extends TEquipment {
|
|
-
|
|
|
|
|
|
+ @ApiModelProperty(value="所以报警信息")
|
|
|
|
+ private List<TAlarmRecord> alarmList;
|
|
@ApiModelProperty(value="最新报警信息")
|
|
@ApiModelProperty(value="最新报警信息")
|
|
private String alarmContent = "暂无数据";
|
|
private String alarmContent = "暂无数据";
|
|
|
|
|
|
@ApiModelProperty(value="当天是否存在告警")
|
|
@ApiModelProperty(value="当天是否存在告警")
|
|
private boolean hasTodayAlarm= false;
|
|
private boolean hasTodayAlarm= false;
|
|
|
|
|
|
|
|
+ public List<TAlarmRecord> getAlarmList() {
|
|
|
|
+ return alarmList;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public void setAlarmList(List<TAlarmRecord> alarmList) {
|
|
|
|
+ this.alarmList = alarmList;
|
|
|
|
+ }
|
|
|
|
+
|
|
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
|
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
|
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
|
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
|
@ApiModelProperty(value="报警发生时间")
|
|
@ApiModelProperty(value="报警发生时间")
|
|
|
|
+
|
|
private Date occurrenceTime;
|
|
private Date occurrenceTime;
|
|
|
|
|
|
public String getAlarmContent() {
|
|
public String getAlarmContent() {
|