From 0e692512812a2c0a0c62e97b34bf7519ca4f9f58 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 15 三月 2022 11:44:11 +0800
Subject: [PATCH] 修复多平台同时导入时的bug

---
 src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushServiceImpl.java                             |   58 ++++++++++++++--------------
 src/main/java/com/genersoft/iot/vmp/vmanager/streamPush/StreamPushController.java                       |   10 -----
 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/response/impl/RegisterResponseProcessor.java |    1 
 3 files changed, 29 insertions(+), 40 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/response/impl/RegisterResponseProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/response/impl/RegisterResponseProcessor.java
index 1cb1128..6c33406 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/response/impl/RegisterResponseProcessor.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/response/impl/RegisterResponseProcessor.java
@@ -100,7 +100,6 @@
 				subscribeHolder.removeCatalogSubscribe(platformGBId);
 				subscribeHolder.removeMobilePositionSubscribe(platformGBId);
 			}
-
 		}
 	}
 
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 e59a090..aab2282 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
@@ -411,38 +411,38 @@
             // 閬嶅巻瀛樺偍缁撴灉锛屾煡鎵綼pp+Stream->platformId+catalogId鐨勫搴斿叧绯伙紝鐒跺悗鎵ц鎵归噺鍐欏叆
             for (StreamPushItem streamPushItem : streamPushItemsForPlatform) {
                 List<String[]> platFormInfoList = streamPushItemsForAll.get(streamPushItem.getApp() + streamPushItem.getStream());
-                if (platFormInfoList != null) {
-                    if (platFormInfoList.size() > 0) {
-                        for (String[] platFormInfoArray : platFormInfoList) {
-                            StreamPushItem streamPushItemForPlatform = new StreamPushItem();
-                            streamPushItemForPlatform.setGbStreamId(streamPushItem.getGbStreamId());
-                            if (platFormInfoArray.length > 0) {
-                                // 鏁扮粍 platFormInfoArray 0 涓哄钩鍙癐D銆� 1涓虹洰褰旾D
-                                // 涓嶅瓨鍦ㄨ繖涓钩鍙帮紝鍒欏拷鐣ュ鍏ユ鍏宠仈鍏崇郴
-                                if (platformInfoMap.get(platFormInfoArray[0]) == null
-                                        || platformInfoMap.get(platFormInfoArray[0]).get(platFormInfoArray[1]) == null) {
-                                    logger.info("瀵煎叆鏁版嵁鏃朵笉瀛樺湪骞冲彴鎴栫洰褰晎}/{},宸插鍏ユ湭鍒嗛厤", platFormInfoArray[0], platFormInfoArray[1] );
-                                    continue;
-                                }
-                                streamPushItemForPlatform.setPlatformId(platFormInfoArray[0]);
-
-                                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());
-                                gbStreamList.add(streamPushItemForPlatform);
+                if (platFormInfoList != null && platFormInfoList.size() > 0) {
+                    for (String[] platFormInfoArray : platFormInfoList) {
+                        StreamPushItem streamPushItemForPlatform = new StreamPushItem();
+                        streamPushItemForPlatform.setGbStreamId(streamPushItem.getGbStreamId());
+                        if (platFormInfoArray.length > 0) {
+                            // 鏁扮粍 platFormInfoArray 0 涓哄钩鍙癐D銆� 1涓虹洰褰旾D
+                            // 涓嶅瓨鍦ㄨ繖涓钩鍙帮紝鍒欏拷鐣ュ鍏ユ鍏宠仈鍏崇郴
+                            if (platformInfoMap.get(platFormInfoArray[0]) == null
+                                    || platformInfoMap.get(platFormInfoArray[0]).get(platFormInfoArray[1]) == null) {
+                                logger.info("瀵煎叆鏁版嵁鏃朵笉瀛樺湪骞冲彴鎴栫洰褰晎}/{},宸插鍏ユ湭鍒嗛厤", platFormInfoArray[0], platFormInfoArray[1] );
+                                continue;
                             }
-                            if (platFormInfoArray.length > 1) {
-                                streamPushItemForPlatform.setCatalogId(platFormInfoArray[1]);
+                            streamPushItemForPlatform.setPlatformId(platFormInfoArray[0]);
+                            if (platFormInfoArray[0].equals("34020000002110000001")) {
+                                System.out.println(111);
                             }
-                            streamPushItemListFroPlatform.add(streamPushItemForPlatform);
+                            List<GbStream> gbStreamList = platformForEvent.get(platFormInfoArray[0]);
+                            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());
+                            gbStreamList.add(streamPushItemForPlatform);
                         }
+                        if (platFormInfoArray.length > 1) {
+                            streamPushItemForPlatform.setCatalogId(platFormInfoArray[1]);
+                        }
+                        streamPushItemListFroPlatform.add(streamPushItemForPlatform);
                     }
 
                 }
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/streamPush/StreamPushController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/streamPush/StreamPushController.java
index 36545b3..cf0fed8 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/streamPush/StreamPushController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/streamPush/StreamPushController.java
@@ -168,16 +168,6 @@
             result.setResult(ResponseEntity.status(HttpStatus.BAD_REQUEST).body(wvpResult));
             return result;
         }
-//        if (!file.getContentType().endsWith(".xls")
-//            && !file.getContentType().endsWith(".csv")
-//            && !file.getContentType().endsWith(".xlsx") ) {
-//            logger.warn("閫氶亾瀵煎叆鏂囦欢绫诲瀷閿欒: {}",file.getContentType() );
-//            WVPResult<Object> wvpResult = new WVPResult<>();
-//            wvpResult.setCode(-1);
-//            wvpResult.setMsg("鏂囦欢绫诲瀷閿欒锛岃浣跨敤");
-//            result.setResult(ResponseEntity.status(HttpStatus.BAD_REQUEST).body(wvpResult));
-//            return result;
-//        }
         // 鍚屾椂鍙鐞嗕竴涓枃浠�
         if (resultHolder.exist(key, null)) {
             logger.warn("宸叉湁瀵煎叆浠诲姟姝e湪鎵ц");

--
Gitblit v1.8.0