From 86fdf7285657727a3f893496fd54c65e7788c51b Mon Sep 17 00:00:00 2001 From: koisi Date: Mon, 5 Aug 2024 15:40:24 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D=E8=AF=AD=E6=B3=95?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E5=AF=BC=E8=87=B4=E7=9A=84=E5=89=8D=E7=AB=AF?= =?UTF-8?q?=E7=BC=96=E8=AF=91=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 最新的一次合并，ConsoleNet.vue 少了个逗号。 --- web_src/src/components/console/ConsoleNet.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/src/components/console/ConsoleNet.vue b/web_src/src/components/console/ConsoleNet.vue index e0136807..6266f35a 100755 --- a/web_src/src/components/console/ConsoleNet.vue +++ b/web_src/src/components/console/ConsoleNet.vue @@ -103,7 +103,7 @@ export default { bottom: "15px", selected: {}, } - } + }, chartEvents: { legendselectchanged: (item) => { this.extend.legend.selected = item.selected; From c1a8e62f2341e380f25f9f5b5029865777c0118a Mon Sep 17 00:00:00 2001 From: koisi Date: Mon, 5 Aug 2024 17:04:58 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D6=E6=9C=8825=E6=97=A5?= =?UTF-8?q?=E5=90=88=E5=B9=B6271=E6=97=B6=EF=BC=8C=E5=8F=98=E9=87=8F?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=9C=AA=E5=90=8C=E6=AD=A5=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 处理ZLM推拉流事件的参数由StreamPushItem变更成OnStreamChangedHookParam了，然后有个地方没有同步更新。 --- .../genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java b/src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java index e70e195c..b33cad8a 100755 --- a/src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java +++ b/src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java @@ -10,7 +10,6 @@ import com.genersoft.iot.vmp.media.bean.MediaInfo; import com.genersoft.iot.vmp.media.bean.MediaServer; import com.genersoft.iot.vmp.media.event.media.MediaArrivalEvent; import com.genersoft.iot.vmp.media.zlm.dto.StreamAuthorityInfo; -import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem; import com.genersoft.iot.vmp.media.zlm.dto.hook.OnStreamChangedHookParam; import com.genersoft.iot.vmp.service.bean.GPSMsgInfo; import com.genersoft.iot.vmp.service.bean.MessageForPushChannel; @@ -707,7 +706,7 @@ public class RedisCatchStorageImpl implements IRedisCatchStorage { @Override public void removePushListItem(String app, String stream, String mediaServerId) { String key = VideoManagerConstants.PUSH_STREAM_LIST + app + "_" + stream; - StreamPushItem param = (StreamPushItem)redisTemplate.opsForValue().get(key); + OnStreamChangedHookParam param = (OnStreamChangedHookParam)redisTemplate.opsForValue().get(key); if (param != null && param.getMediaServerId().equalsIgnoreCase(mediaServerId)) { redisTemplate.delete(key); } From 5772d3f2315a70770cc357456a4a532c7130d2aa Mon Sep 17 00:00:00 2001 From: koisi Date: Mon, 5 Aug 2024 18:59:02 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=2087c071:=E5=90=88?= =?UTF-8?q?=E5=B9=B6271=E5=88=86=E6=94=AF=20=E7=9A=84=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E9=81=97=E6=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 将推流信息记录至redis，由StreamPushItem变更成OnStreamChangedHookParam时，漏了设置serverId。 --- .../genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java b/src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java index b33cad8a..f4647cdb 100755 --- a/src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java +++ b/src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java @@ -694,6 +694,7 @@ public class RedisCatchStorageImpl implements IRedisCatchStorage { @Override public void addPushListItem(String app, String stream, MediaArrivalEvent event) { String key = VideoManagerConstants.PUSH_STREAM_LIST + app + "_" + stream; + event.getHookParam().setSeverId(userSetting.getServerId()); redisTemplate.opsForValue().set(key, event.getHookParam()); }