diff --git a/pom.xml b/pom.xml index c2958ae22..dc929b5d2 100644 --- a/pom.xml +++ b/pom.xml @@ -242,12 +242,17 @@ com.alibaba.fastjson2 fastjson2 - 2.0.17 + 2.0.57 com.alibaba.fastjson2 fastjson2-extension - 2.0.17 + 2.0.57 + + + com.alibaba.fastjson2 + fastjson2-extension-spring5 + 2.0.57 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 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{ /** @@ -105,6 +107,7 @@ public class StreamPush extends CommonGBChannel implements Comparable