From 335916f1f15eb9d0b34dea38cacee2300eac0606 Mon Sep 17 00:00:00 2001 From: 李防 <liguofang0703@126.com> Date: 星期一, 07 三月 2022 14:20:27 +0800 Subject: [PATCH] InviteRequestProcessor类中,channelid从invite消息的header subject获取,不再从第一行request line获取。原因是和第三方平台对接时,发送的invite消息第一行为国标平台编码而不是设备通道编码,导致报错通道不存在,返回404。 --- src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushServiceImpl.java | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushServiceImpl.java index 8a015d9..a13dc29 100644 --- a/src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushServiceImpl.java +++ b/src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushServiceImpl.java @@ -377,7 +377,7 @@ if (streamPushItemsForPlatform.size() > 0) { List<StreamPushItem> streamPushItemListFroPlatform = new ArrayList<>(); - Map<String, List<StreamPushItem>> platformForEvent = new HashMap<>(); + Map<String, List<GbStream>> platformForEvent = new HashMap<>(); // 閬嶅巻瀛樺偍缁撴灉锛屾煡鎵綼pp+Stream->platformId+catalogId鐨勫搴斿叧绯伙紝鐒跺悗鎵ц鎵归噺鍐欏叆 for (StreamPushItem streamPushItem : streamPushItemsForPlatform) { List<String[]> platFormInfoList = streamPushItemsForAll.get(streamPushItem.getApp() + streamPushItem.getStream()); @@ -390,16 +390,17 @@ // 鏁扮粍 platFormInfoArray 0 涓哄钩鍙癐D銆� 1涓虹洰褰旾D streamPushItemForPlatform.setPlatformId(platFormInfoArray[0]); - List<StreamPushItem> streamPushItemsInPlatform = platformForEvent.get(streamPushItem.getPlatformId()); - if (streamPushItemsInPlatform == null) { - streamPushItemsInPlatform = new ArrayList<>(); - platformForEvent.put(platFormInfoArray[0], streamPushItemsInPlatform); + List<GbStream> gbStreamList = platformForEvent.get(streamPushItem.getPlatformId()); + if (gbStreamList == null) { + gbStreamList = new ArrayList<>(); + platformForEvent.put(platFormInfoArray[0], gbStreamList); } // 涓哄彂閫侀�氱煡鏁寸悊鏁版嵁 + streamPushItemForPlatform.setName(streamPushItem.getName()); streamPushItemForPlatform.setApp(streamPushItem.getApp()); streamPushItemForPlatform.setStream(streamPushItem.getStream()); streamPushItemForPlatform.setGbId(streamPushItem.getGbId()); - streamPushItemsInPlatform.add(streamPushItemForPlatform); + gbStreamList.add(streamPushItemForPlatform); } if (platFormInfoArray.length > 1) { streamPushItemForPlatform.setCatalogId(platFormInfoArray[1]); @@ -416,7 +417,7 @@ // 鍙戦�侀�氱煡 for (String platformId : platformForEvent.keySet()) { eventPublisher.catalogEventPublishForStream( - platformId, platformForEvent.get(platformId).toArray(new GbStream[0]), CatalogEvent.ADD); + platformId, platformForEvent.get(platformId), CatalogEvent.ADD); } } } -- Gitblit v1.8.0