From ad02873c32b75e38e3f75be07e74fd0c0865c93a Mon Sep 17 00:00:00 2001
From: liuwy <1421132346@qq.com>
Date: Fri, 16 Jun 2023 10:40:25 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E9=83=A8=E5=88=86=20FastJson=20=E5=AE=9E?=
 =?UTF-8?q?=E4=BD=93=E8=A1=A5=E5=85=85=20toStackBean=20=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=E3=80=82=20=20-=20FastJsonNormalData=E3=80=82=20=20-=20FastJso?=
 =?UTF-8?q?nFilteredData=E3=80=82=20=20-=20FastJsonTriggeredData=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 更新依赖版本，以规避漏洞。
 - 更新 guava 版本。 31.1-jre --> 32.0.1-jre
---
 .../sdk/bean/dto/FastJsonFilteredData.java    | 33 +++++++++++++++++--
 .../fdr/sdk/bean/dto/FastJsonNormalData.java  | 12 +++++++
 .../sdk/bean/dto/FastJsonTriggeredData.java   | 14 ++++++++
 pom.xml                                       |  2 +-
 4 files changed, 58 insertions(+), 3 deletions(-)

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 85559f70..722c74e0 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 b8c0b6bc..e9099775 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 8961e132..e21c9c44 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 beb95a88..9a4a0f09 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,7 +43,7 @@
         <dubbo.version>2.7.22</dubbo.version>
         <netty.version>4.1.86.Final</netty.version>
         <zookeeper.version>3.5.7</zookeeper.version>
-        <guava.version>31.1-jre</guava.version>
+        <guava.version>32.0.1-jre</guava.version>
         <curator.version>4.3.0</curator.version>
         <aspectj.version>1.8.2</aspectj.version>
         <hibernate.version>5.4.24.Final</hibernate.version>
-- 
Gitee