diff --git a/fdr-sdk/src/main/java/com/dwarfeng/fdr/sdk/bean/dto/FastJsonFilteredData.java b/fdr-sdk/src/main/java/com/dwarfeng/fdr/sdk/bean/dto/FastJsonFilteredData.java index 85559f70188ea42d7765de11b4ddfcd3c56a3c29..65f4a291c8b2c4fd1a6ef601d4fd047d75ec4f2d 100644 --- a/fdr-sdk/src/main/java/com/dwarfeng/fdr/sdk/bean/dto/FastJsonFilteredData.java +++ b/fdr-sdk/src/main/java/com/dwarfeng/fdr/sdk/bean/dto/FastJsonFilteredData.java @@ -5,6 +5,7 @@ import com.dwarfeng.fdr.stack.bean.dto.FilteredData; import com.dwarfeng.subgrade.sdk.bean.key.FastJsonLongIdKey; import com.dwarfeng.subgrade.stack.bean.dto.Dto; +import java.util.Date; import java.util.Objects; /** @@ -15,7 +16,7 @@ import java.util.Objects; */ public class FastJsonFilteredData implements Dto { - private static final long serialVersionUID = 698750099137226890L; + private static final long serialVersionUID = -4327156985482796275L; public static FastJsonFilteredData of(FilteredData filteredData) { if (Objects.isNull(filteredData)) { @@ -25,7 +26,22 @@ public class FastJsonFilteredData implements Dto { FastJsonLongIdKey.of(filteredData.getPointKey()), FastJsonLongIdKey.of(filteredData.getFilterKey()), filteredData.getValue(), - filteredData.getMessage() + filteredData.getMessage(), + filteredData.getHappenedDate() + ); + } + } + + public static FilteredData toStackBean(FastJsonFilteredData fastFilteredData) { + if (Objects.isNull(fastFilteredData)) { + return null; + } else { + return new FilteredData( + FastJsonLongIdKey.toStackBean(fastFilteredData.getPointKey()), + FastJsonLongIdKey.toStackBean(fastFilteredData.getFilterKey()), + fastFilteredData.getValue(), + fastFilteredData.getMessage(), + fastFilteredData.getHappenedDate() ); } } @@ -42,14 +58,18 @@ public class FastJsonFilteredData implements Dto { @JSONField(name = "message", ordinal = 4) private String message; + @JSONField(name = "happened_date", ordinal = 5) + private Date happenedDate; + public FastJsonFilteredData() { } - public FastJsonFilteredData(FastJsonLongIdKey pointKey, FastJsonLongIdKey filterKey, Object value, String message) { + public FastJsonFilteredData(FastJsonLongIdKey pointKey, FastJsonLongIdKey filterKey, Object value, String message, Date happenedDate) { this.pointKey = pointKey; this.filterKey = filterKey; this.value = value; this.message = message; + this.happenedDate = happenedDate; } public FastJsonLongIdKey getPointKey() { @@ -84,6 +104,14 @@ public class FastJsonFilteredData implements Dto { this.message = message; } + public Date getHappenedDate() { + return happenedDate; + } + + public void setHappenedDate(Date happenedDate) { + this.happenedDate = happenedDate; + } + @Override public String toString() { return "FastJsonFilteredData{" + @@ -91,6 +119,7 @@ public class FastJsonFilteredData implements Dto { ", filterKey=" + filterKey + ", value=" + value + ", message='" + message + '\'' + + ", happenedDate=" + happenedDate + '}'; } } diff --git a/fdr-sdk/src/main/java/com/dwarfeng/fdr/sdk/bean/dto/FastJsonNormalData.java b/fdr-sdk/src/main/java/com/dwarfeng/fdr/sdk/bean/dto/FastJsonNormalData.java index b8c0b6bcf2c89dd44a4135d13c1525fa950b5020..b20924162cdd7ba34377eca482ac7bbb7a05654e 100644 --- a/fdr-sdk/src/main/java/com/dwarfeng/fdr/sdk/bean/dto/FastJsonNormalData.java +++ b/fdr-sdk/src/main/java/com/dwarfeng/fdr/sdk/bean/dto/FastJsonNormalData.java @@ -16,7 +16,7 @@ import java.util.Objects; */ public class FastJsonNormalData implements Dto { - private static final long serialVersionUID = 982118660866333641L; + private static final long serialVersionUID = 4268721908843113764L; public static FastJsonNormalData of(NormalData normalData) { if (Objects.isNull(normalData)) { @@ -30,6 +30,18 @@ public class FastJsonNormalData implements Dto { } } + public static NormalData toStackBean(FastJsonNormalData fastNormalData) { + if (Objects.isNull(fastNormalData)) { + return null; + } else { + return new NormalData( + FastJsonLongIdKey.toStackBean(fastNormalData.getPointKey()), + fastNormalData.getValue(), + fastNormalData.getHappenedDate() + ); + } + } + @JSONField(name = "point_key", ordinal = 1) private FastJsonLongIdKey pointKey; diff --git a/fdr-sdk/src/main/java/com/dwarfeng/fdr/sdk/bean/dto/FastJsonTriggeredData.java b/fdr-sdk/src/main/java/com/dwarfeng/fdr/sdk/bean/dto/FastJsonTriggeredData.java index 8961e1323b64cb659c277be69deaf44185497c3d..4b778293fbdf7805e753bb0a599f6c551189900e 100644 --- a/fdr-sdk/src/main/java/com/dwarfeng/fdr/sdk/bean/dto/FastJsonTriggeredData.java +++ b/fdr-sdk/src/main/java/com/dwarfeng/fdr/sdk/bean/dto/FastJsonTriggeredData.java @@ -16,7 +16,7 @@ import java.util.Objects; */ public class FastJsonTriggeredData implements Dto { - private static final long serialVersionUID = 7136563316840846416L; + private static final long serialVersionUID = -6656308841919266388L; public static FastJsonTriggeredData of(TriggeredData triggeredData) { if (Objects.isNull(triggeredData)) { @@ -32,6 +32,20 @@ public class FastJsonTriggeredData implements Dto { } } + public static TriggeredData toStackBean(FastJsonTriggeredData fastTriggeredData) { + if (Objects.isNull(fastTriggeredData)) { + return null; + } else { + return new TriggeredData( + FastJsonLongIdKey.toStackBean(fastTriggeredData.getPointKey()), + FastJsonLongIdKey.toStackBean(fastTriggeredData.getTriggerKey()), + fastTriggeredData.getValue(), + fastTriggeredData.getMessage(), + fastTriggeredData.getHappenedDate() + ); + } + } + @JSONField(name = "point_key", ordinal = 1) private FastJsonLongIdKey pointKey;