From ad0e63a617b28cc7ab0e46ab4864e5cf71eba6fb Mon Sep 17 00:00:00 2001
From: pll <panleilei@kedacom.com>
Date: Wed, 7 Aug 2024 16:33:27 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E5=A4=84=E7=90=86json=E5=8F=8D?=
 =?UTF-8?q?=E5=BA=8F=E5=88=97=E5=8C=96=E6=97=B6=E5=AD=98=E5=9C=A8=E5=A4=9A?=
 =?UTF-8?q?=E4=BD=99=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/openatc/agent/model/VipRouteDevice.java   | 2 ++
 .../src/main/java/com/openatc/model/model/ControlPattern.java   | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/OpenATC-Admin-server/agent/src/main/java/com/openatc/agent/model/VipRouteDevice.java b/OpenATC-Admin-server/agent/src/main/java/com/openatc/agent/model/VipRouteDevice.java
index 14aeed364..24f0b4fd7 100644
--- a/OpenATC-Admin-server/agent/src/main/java/com/openatc/agent/model/VipRouteDevice.java
+++ b/OpenATC-Admin-server/agent/src/main/java/com/openatc/agent/model/VipRouteDevice.java
@@ -1,5 +1,6 @@
 package com.openatc.agent.model;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.openatc.model.model.ControlPattern;
 import com.openatc.model.model.MyGeometry;
 import com.vladmihalcea.hibernate.type.json.JsonBinaryType;
@@ -13,6 +14,7 @@ import javax.persistence.*;
 @Table(name = "vip_route_device")
 @Entity
 @TypeDef(name = "jsonb", typeClass = JsonBinaryType.class)
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class VipRouteDevice {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
diff --git a/OpenATC-Admin-server/model/src/main/java/com/openatc/model/model/ControlPattern.java b/OpenATC-Admin-server/model/src/main/java/com/openatc/model/model/ControlPattern.java
index a985ecb09..871580ff3 100644
--- a/OpenATC-Admin-server/model/src/main/java/com/openatc/model/model/ControlPattern.java
+++ b/OpenATC-Admin-server/model/src/main/java/com/openatc/model/model/ControlPattern.java
@@ -1,5 +1,6 @@
 package com.openatc.model.model;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.Data;
 
 /**
@@ -10,6 +11,7 @@ import lombok.Data;
  * @version: $
  */
 @Data
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class ControlPattern<T> {
     int control;
     int terminal;
-- 
Gitee


From dabfd9b287c5b9f04bc116b4d775b1ee14e34e0c Mon Sep 17 00:00:00 2001
From: pll <panleilei@kedacom.com>
Date: Wed, 7 Aug 2024 16:53:42 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0jackson=E4=BE=9D?=
 =?UTF-8?q?=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 OpenATC-Admin-server/model/pom.xml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/OpenATC-Admin-server/model/pom.xml b/OpenATC-Admin-server/model/pom.xml
index cc6f1e3c4..a34acdc8b 100644
--- a/OpenATC-Admin-server/model/pom.xml
+++ b/OpenATC-Admin-server/model/pom.xml
@@ -9,11 +9,12 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>model</artifactId>
-<!--    <dependencies>-->
-<!--        <dependency>-->
-<!--            <groupId>org.springframework.boot</groupId>-->
-<!--            <artifactId>spring-boot-starter-data-jpa</artifactId>-->
-<!--        </dependency>-->
-<!--    </dependencies>-->
+    <dependencies>
+            <dependency>
+                <groupId>com.fasterxml.jackson.core</groupId>
+                <artifactId>jackson-databind</artifactId>
+                <version>2.13.5</version>
+        </dependency>
+    </dependencies>
 
 </project>
\ No newline at end of file
-- 
Gitee