From 29191373aa1e8940d3ca6ce5a052182f99b37ba9 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 01 三月 2022 22:07:01 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' into wvp-pro-record
---
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