From 44b06e1b6e2cfcaf4c637ea66a375bf6fcbcf901 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 11 七月 2022 15:26:25 +0800
Subject: [PATCH] 修复默认用户信息插入
---
src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushUploadFileHandler.java | 129 ++++++++++++++++++++++++-------------------
1 files changed, 72 insertions(+), 57 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushUploadFileHandler.java b/src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushUploadFileHandler.java
index 2f94709..45cbcf6 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushUploadFileHandler.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushUploadFileHandler.java
@@ -4,22 +4,47 @@
import com.alibaba.excel.event.AnalysisEventListener;
import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem;
import com.genersoft.iot.vmp.service.IStreamPushService;
+import com.genersoft.iot.vmp.utils.DateUtil;
import com.genersoft.iot.vmp.vmanager.bean.StreamPushExcelDto;
+import com.google.common.collect.BiMap;
+import com.google.common.collect.HashBiMap;
import org.springframework.util.StringUtils;
import java.util.*;
public class StreamPushUploadFileHandler extends AnalysisEventListener<StreamPushExcelDto> {
+ // 閿欒鏁版嵁鐨勫洖璋冿紝鐢ㄤ簬灏嗛敊璇暟鎹彂閫佺粰椤甸潰
private ErrorDataHandler errorDataHandler;
+
+ // 鎺ㄦ祦鐨勪笟鍔＄被鐢ㄤ簬瀛樺偍鏁版嵁
private IStreamPushService pushService;
+
+ // 榛樿娴佸獟浣撹妭鐐笽D
private String defaultMediaServerId;
+
+ // 鐢ㄤ簬瀛樺偍涓嶅姞杩囨护鐨勬墍鏈夋暟鎹�
private List<StreamPushItem> streamPushItems = new ArrayList<>();
- private Map<String, UploadData> streamPushItemsForPlatform = new HashMap<>();
+
+ // 鐢ㄤ簬瀛樺偍鏇村叿APP+Stream杩囨护鍚庣殑鏁版嵁锛屽彲浠ョ洿鎺ュ瓨鍏tream_push琛ㄤ笌gb_stream琛�
+ private Map<String,StreamPushItem> streamPushItemForSave = new HashMap<>();
+
+ // 鐢ㄤ簬瀛樺偍鎸夌収APP+Stream涓篕EY锛� 骞冲彴ID+鐩綍Id 涓簐alue鐨勬暟鎹紝鐢ㄤ簬瀛樺偍鍒癵b_stream琛ㄥ悗鑾峰彇app+Stream瀵瑰簲鐨勫钩鍙颁笌鐩綍淇℃伅锛岀劧鍚庡瓨鍏ュ叧鑱旇〃
+ private Map<String, List<String[]>> streamPushItemsForPlatform = new HashMap<>();
+
+ // 鐢ㄤ簬鍒ゆ柇鏂囦欢鏄惁瀛樺湪閲嶅鐨刟pp+Stream+骞冲彴ID
private Set<String> streamPushStreamSet = new HashSet<>();
- private Set<String> streamPushGBSet = new HashSet<>();
+
+ // 鐢ㄤ簬瀛樺偍APP+Stream->鍥芥爣ID 鐨勬暟鎹粨鏋�, 鏁版嵁涓�涓�瀵瑰簲锛屽叏灞�鍒ゆ柇APP+Stream->鍥芥爣ID鏄惁瀛樺湪涓嶅搴�
+ private BiMap<String,String> gBMap = HashBiMap.create();
+
+ // 璁板綍閿欒鐨凙PP+Stream
private List<String> errorStreamList = new ArrayList<>();
+
+
+ // 璁板綍閿欒鐨勫浗鏍嘔D
private List<String> errorGBList = new ArrayList<>();
+
// 璇诲彇鏁伴噺璁℃暟鍣�
private int loadedSize = 0;
@@ -33,16 +58,6 @@
void handle(List<String> streams, List<String> gbId);
}
- private class UploadData{
- public String platformId;
- public Map<String, List<StreamPushItem>> catalogData = new HashMap<>();
- public List<StreamPushItem> streamPushItems = new ArrayList<>();
-
- public UploadData(String platformId) {
- this.platformId = platformId;
- }
- }
-
@Override
public void invoke(StreamPushExcelDto streamPushExcelDto, AnalysisContext analysisContext) {
if (StringUtils.isEmpty(streamPushExcelDto.getApp())
@@ -50,14 +65,28 @@
|| StringUtils.isEmpty(streamPushExcelDto.getGbId())) {
return;
}
- if (streamPushGBSet.contains(streamPushExcelDto.getGbId())) {
- errorGBList.add(streamPushExcelDto.getGbId());
+
+ if (gBMap.get(streamPushExcelDto.getApp() + streamPushExcelDto.getStream()) == null) {
+ try {
+ gBMap.put(streamPushExcelDto.getApp() + streamPushExcelDto.getStream(), streamPushExcelDto.getGbId());
+ }catch (IllegalArgumentException e) {
+ e.printStackTrace();
+ errorGBList.add(streamPushExcelDto.getGbId() + "(涓嶅悓鐨刟pp+stream浣跨敤浜嗙浉鍚岀殑鍥芥爣ID)");
+ return;
+ }
+ }else {
+ if (!gBMap.get(streamPushExcelDto.getApp() + streamPushExcelDto.getStream()).equals(streamPushExcelDto.getGbId())) {
+ errorGBList.add(streamPushExcelDto.getGbId() + "(鍚屼竴缁刟pp+stream浣跨敤浜嗕笉鍚岀殑鍥芥爣ID)");
+ return;
+ }
}
+
if (streamPushStreamSet.contains(streamPushExcelDto.getApp() + streamPushExcelDto.getStream() + streamPushExcelDto.getPlatformId())) {
- errorStreamList.add(streamPushExcelDto.getApp() + "/" + streamPushExcelDto.getStream());
- }
- if (streamPushGBSet.contains(streamPushExcelDto.getGbId()) || streamPushStreamSet.contains(streamPushExcelDto.getApp() + streamPushExcelDto.getStream() + streamPushExcelDto.getPlatformId())) {
+ errorStreamList.add(streamPushExcelDto.getApp() + "/" + streamPushExcelDto.getStream()+ "/" +
+ streamPushExcelDto.getPlatformId() + "(鍚屼竴缁刟pp+stream娣诲姞鍦ㄤ簡鍚屼竴涓钩鍙颁笅)");
return;
+ }else {
+ streamPushStreamSet.add(streamPushExcelDto.getApp()+streamPushExcelDto.getStream() + streamPushExcelDto.getPlatformId());
}
StreamPushItem streamPushItem = new StreamPushItem();
@@ -66,7 +95,7 @@
streamPushItem.setGbId(streamPushExcelDto.getGbId());
streamPushItem.setStatus(false);
streamPushItem.setStreamType("push");
- streamPushItem.setCreateStamp(System.currentTimeMillis());
+ streamPushItem.setCreateTime(DateUtil.getNow());
streamPushItem.setMediaServerId(defaultMediaServerId);
streamPushItem.setName(streamPushExcelDto.getName());
streamPushItem.setOriginType(2);
@@ -74,33 +103,31 @@
streamPushItem.setTotalReaderCount("0");
streamPushItem.setPlatformId(streamPushExcelDto.getPlatformId());
streamPushItem.setCatalogId(streamPushExcelDto.getCatalogId());
- if (StringUtils.isEmpty(streamPushExcelDto.getPlatformId())) {
- streamPushItems.add(streamPushItem);
- }else {
- UploadData uploadData = streamPushItemsForPlatform.get(streamPushExcelDto.getPlatformId());
- if (uploadData == null) {
- uploadData = new UploadData(streamPushExcelDto.getPlatformId());
- streamPushItemsForPlatform.put(streamPushExcelDto.getPlatformId(), uploadData);
- }
- if (!StringUtils.isEmpty(streamPushExcelDto.getCatalogId())) {
- List<StreamPushItem> streamPushItems = uploadData.catalogData.get(streamPushExcelDto.getCatalogId());
- if (streamPushItems == null) {
- streamPushItems = new ArrayList<>();
- uploadData.catalogData.put(streamPushExcelDto.getCatalogId(), streamPushItems);
- }
- streamPushItems.add(streamPushItem);
- }else {
- uploadData.streamPushItems.add(streamPushItem);
- }
+ // 瀛樺叆鎵�鏈夌殑閫氶亾淇℃伅
+ streamPushItems.add(streamPushItem);
+ streamPushItemForSave.put(streamPushItem.getApp() + streamPushItem.getStream(), streamPushItem);
+
+ if (!StringUtils.isEmpty(streamPushExcelDto.getPlatformId())) {
+ List<String[]> platformList = streamPushItemsForPlatform.get(streamPushItem.getApp() + streamPushItem.getStream());
+ if (platformList == null) {
+ platformList = new ArrayList<>();
+ streamPushItemsForPlatform.put(streamPushItem.getApp() + streamPushItem.getStream(), platformList);
+ }
+ String platformId = streamPushExcelDto.getPlatformId();
+ String catalogId = streamPushExcelDto.getCatalogId();
+ if (StringUtils.isEmpty(streamPushExcelDto.getCatalogId())) {
+ catalogId = null;
+ }
+ String[] platFormInfoArray = new String[]{platformId, catalogId};
+ platformList.add(platFormInfoArray);
}
- streamPushGBSet.add(streamPushExcelDto.getGbId());
- streamPushStreamSet.add(streamPushExcelDto.getApp()+streamPushExcelDto.getStream());
loadedSize ++;
if (loadedSize > 1000) {
saveData();
streamPushItems.clear();
+ streamPushItemForSave.clear();
streamPushItemsForPlatform.clear();
loadedSize = 0;
}
@@ -111,30 +138,18 @@
public void doAfterAllAnalysed(AnalysisContext analysisContext) {
// 杩欓噷涔熻淇濆瓨鏁版嵁锛岀‘淇濇渶鍚庨仐鐣欑殑鏁版嵁涔熷瓨鍌ㄥ埌鏁版嵁搴�
saveData();
- streamPushGBSet.clear();
+ streamPushItems.clear();
+ streamPushItemForSave.clear();
+ gBMap.clear();
streamPushStreamSet.clear();
+ streamPushItemsForPlatform.clear();
errorDataHandler.handle(errorStreamList, errorGBList);
}
private void saveData(){
- if (streamPushItems.size() > 0) {
- pushService.batchAddForUpload(null, null, streamPushItems);
- }
- // 澶勭悊宸插垎閰嶅埌骞冲彴鐨勬祦
- if (streamPushItemsForPlatform.size() > 0){
- for (String platformId : streamPushItemsForPlatform.keySet()) {
- UploadData uploadData = streamPushItemsForPlatform.get(platformId);
- if (uploadData.streamPushItems.size() > 0) {
- pushService.batchAddForUpload(platformId, null, uploadData.streamPushItems);
- }
- if (uploadData.catalogData.size() > 0) {
- for (String catalogId : uploadData.catalogData.keySet()) {
- if (uploadData.catalogData.get(catalogId).size() > 0) {
- pushService.batchAddForUpload(platformId, catalogId, uploadData.catalogData.get(catalogId));
- }
- }
- }
- }
+ if (streamPushItemForSave.size() > 0) {
+ // 鍚戞暟鎹簱鏌ヨ鏄惁瀛樺湪閲嶅鐨刟pp
+ pushService.batchAddForUpload(new ArrayList<>(streamPushItemForSave.values()), streamPushItemsForPlatform);
}
}
}
--
Gitblit v1.8.0