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..722c74e02b1a43e1de61bc077e424415c37bca46 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;
/**
@@ -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..e909977545467ddeac80b0c9911301fd585fb41c 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
@@ -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..e21c9c44bf5c39f449abd12dbe8d08a2ec7154ca 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
@@ -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;
diff --git a/pom.xml b/pom.xml
index beb95a8814fe7be6e1d10c32c9b368d923df014d..9a4a0f091ec528ffc0c6bde2655f911abd964df7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,7 +43,7 @@
2.7.22
4.1.86.Final
3.5.7
- 31.1-jre
+ 32.0.1-jre
4.3.0
1.8.2
5.4.24.Final