From c19fae68a34e3ebb5fbac779c531f0a47133989d Mon Sep 17 00:00:00 2001
From: lin <648540858@qq.com>
Date: Mon, 19 May 2025 11:26:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7fastjson=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E4=BB=A5=E8=A7=A3=E5=86=B3json=E5=BA=8F=E5=88=97=E5=8C=96BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                  | 9 +++++++--
 .../redisMsg/control/RedisRpcPlatformController.java     | 2 +-
 .../genersoft/iot/vmp/streamPush/bean/StreamPush.java    | 3 +++
 src/main/resources/application.yml                       | 2 +-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index a53cd8947..2eb3ab962 100644
--- a/pom.xml
+++ b/pom.xml
@@ -242,12 +242,17 @@
         <dependency>
             <groupId>com.alibaba.fastjson2</groupId>
             <artifactId>fastjson2</artifactId>
-            <version>2.0.17</version>
+            <version>2.0.57</version>
         </dependency>
         <dependency>
             <groupId>com.alibaba.fastjson2</groupId>
             <artifactId>fastjson2-extension</artifactId>
-            <version>2.0.17</version>
+            <version>2.0.57</version>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba.fastjson2</groupId>
+            <artifactId>fastjson2-extension-spring5</artifactId>
+            <version>2.0.57</version>
         </dependency>
 
         <!-- okhttp -->
diff --git a/src/main/java/com/genersoft/iot/vmp/service/redisMsg/control/RedisRpcPlatformController.java b/src/main/java/com/genersoft/iot/vmp/service/redisMsg/control/RedisRpcPlatformController.java
index c5a9f4604..cf037934d 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/redisMsg/control/RedisRpcPlatformController.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/redisMsg/control/RedisRpcPlatformController.java
@@ -9,7 +9,6 @@ import com.genersoft.iot.vmp.conf.redis.bean.RedisRpcResponse;
 import com.genersoft.iot.vmp.gb28181.bean.CommonGBChannel;
 import com.genersoft.iot.vmp.gb28181.bean.Platform;
 import com.genersoft.iot.vmp.gb28181.event.EventPublisher;
-import com.genersoft.iot.vmp.gb28181.event.subscribe.catalog.CatalogEvent;
 import com.genersoft.iot.vmp.gb28181.service.IPlatformChannelService;
 import com.genersoft.iot.vmp.gb28181.service.IPlatformService;
 import com.genersoft.iot.vmp.service.redisMsg.dto.RedisRpcController;
@@ -72,6 +71,7 @@ public class RedisRpcPlatformController extends RpcController {
     public RedisRpcResponse catalogEventPublish(RedisRpcRequest request) {
         JSONObject jsonObject = JSONObject.parseObject(request.getParam().toString());
         Platform platform = jsonObject.getObject("platform", Platform.class);
+
         List<CommonGBChannel> channels = jsonObject.getJSONArray("channels").toJavaList(CommonGBChannel.class);
         String type = jsonObject.getString("type");
         eventPublisher.catalogEventPublish(platform, channels, type, false);
diff --git a/src/main/java/com/genersoft/iot/vmp/streamPush/bean/StreamPush.java b/src/main/java/com/genersoft/iot/vmp/streamPush/bean/StreamPush.java
index 5b282c2d7..7ae700471 100755
--- a/src/main/java/com/genersoft/iot/vmp/streamPush/bean/StreamPush.java
+++ b/src/main/java/com/genersoft/iot/vmp/streamPush/bean/StreamPush.java
@@ -8,6 +8,7 @@ import com.genersoft.iot.vmp.utils.DateUtil;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.util.ObjectUtils;
 
@@ -15,6 +16,7 @@ import org.springframework.util.ObjectUtils;
 @Data
 @Schema(description = "推流信息")
 @EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor
 public class StreamPush extends CommonGBChannel implements Comparable<StreamPush>{
 
     /**
@@ -105,6 +107,7 @@ public class StreamPush extends CommonGBChannel implements Comparable<StreamPush
 
     private Integer dataType = ChannelDataType.STREAM_PUSH.value;
 
+
     @Override
     public int compareTo(@NotNull StreamPush streamPushItem) {
         return Long.valueOf(DateUtil.yyyy_MM_dd_HH_mm_ssToTimestamp(this.createTime)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 80de5efb4..2164909c6 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -2,4 +2,4 @@ spring:
   application:
     name: wvp
   profiles:
-    active: dev
\ No newline at end of file
+    active: 273