From 17a7b232398717ea0e75e3a87b595a8770900b05 Mon Sep 17 00:00:00 2001 From: Iwan Lebron <105045937+iwanlebron@users.noreply.github.com> Date: Mon, 19 May 2025 10:39:24 +0800 Subject: [PATCH 1/4] fix sql err --- .../iot/vmp/gb28181/dao/provider/DeviceChannelProvider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/dao/provider/DeviceChannelProvider.java b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/provider/DeviceChannelProvider.java index 9578682be..6cfafb7c7 100644 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/dao/provider/DeviceChannelProvider.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/provider/DeviceChannelProvider.java @@ -101,7 +101,7 @@ public class DeviceChannelProvider { } sqlBuild.append(" )"); } - sqlBuild.append("ORDER BY device_id"); + sqlBuild.append(" ORDER BY device_id"); return sqlBuild.toString(); } 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 2/4] =?UTF-8?q?=E5=8D=87=E7=BA=A7fastjson=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E4=BB=A5=E8=A7=A3=E5=86=B3json=E5=BA=8F=E5=88=97?= =?UTF-8?q?=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 @@ 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 Date: Mon, 19 May 2025 11:32:55 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8DCatalogEventLister?= =?UTF-8?q?=E6=9C=AA=E5=88=A4=E7=A9=BAServerGBId=E5=BC=95=E5=8F=91?= =?UTF-8?q?=E7=9A=84=E7=A9=BA=E6=8C=87=E9=92=88=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gb28181/event/subscribe/catalog/CatalogEventLister.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/event/subscribe/catalog/CatalogEventLister.java b/src/main/java/com/genersoft/iot/vmp/gb28181/event/subscribe/catalog/CatalogEventLister.java index 08a329022..beb1c6917 100755 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/event/subscribe/catalog/CatalogEventLister.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/event/subscribe/catalog/CatalogEventLister.java @@ -44,6 +44,9 @@ public class CatalogEventLister implements ApplicationListener { Map channelMap = new HashMap<>(); if (event.getPlatform() != null) { parentPlatform = event.getPlatform(); + if (parentPlatform.getServerGBId() == null) { + return; + } subscribe = subscribeHolder.getCatalogSubscribe(parentPlatform.getServerGBId()); if (subscribe == null) { return; @@ -156,4 +159,4 @@ public class CatalogEventLister implements ApplicationListener { } } } - \ No newline at end of file + From 2dcd070fbeb56f073818d587244d171b505b2c57 Mon Sep 17 00:00:00 2001 From: lin <648540858@qq.com> Date: Mon, 19 May 2025 14:42:26 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=B0=83=E6=95=B4PR=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iot/vmp/gb28181/bean/SubscribeHolder.java | 3 +++ .../event/subscribe/catalog/CatalogEventLister.java | 13 +++++-------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/SubscribeHolder.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/SubscribeHolder.java index a15de224a..e6ab72556 100755 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/SubscribeHolder.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/SubscribeHolder.java @@ -41,6 +41,9 @@ public class SubscribeHolder { } public SubscribeInfo getCatalogSubscribe(String platformId) { + if (platformId == null) { + return null; + } return catalogMap.get(platformId); } diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/event/subscribe/catalog/CatalogEventLister.java b/src/main/java/com/genersoft/iot/vmp/gb28181/event/subscribe/catalog/CatalogEventLister.java index beb1c6917..855633478 100755 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/event/subscribe/catalog/CatalogEventLister.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/event/subscribe/catalog/CatalogEventLister.java @@ -1,14 +1,11 @@ package com.genersoft.iot.vmp.gb28181.event.subscribe.catalog; -import com.genersoft.iot.vmp.conf.UserSetting; import com.genersoft.iot.vmp.gb28181.bean.CommonGBChannel; import com.genersoft.iot.vmp.gb28181.bean.Platform; import com.genersoft.iot.vmp.gb28181.bean.SubscribeHolder; import com.genersoft.iot.vmp.gb28181.bean.SubscribeInfo; import com.genersoft.iot.vmp.gb28181.service.IPlatformChannelService; -import com.genersoft.iot.vmp.gb28181.service.IPlatformService; import com.genersoft.iot.vmp.gb28181.transmit.cmd.ISIPCommanderForPlatform; -import com.genersoft.iot.vmp.service.redisMsg.IRedisRpcService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationListener; @@ -17,7 +14,10 @@ import org.springframework.stereotype.Component; import javax.sip.InvalidArgumentException; import javax.sip.SipException; import java.text.ParseException; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * catalog事件 @@ -44,9 +44,6 @@ public class CatalogEventLister implements ApplicationListener { Map channelMap = new HashMap<>(); if (event.getPlatform() != null) { parentPlatform = event.getPlatform(); - if (parentPlatform.getServerGBId() == null) { - return; - } subscribe = subscribeHolder.getCatalogSubscribe(parentPlatform.getServerGBId()); if (subscribe == null) { return; @@ -159,4 +156,4 @@ public class CatalogEventLister implements ApplicationListener { } } } - +