From b86f0aaae2f0212bc01ddfd3e5d646c22eb1d8c0 Mon Sep 17 00:00:00 2001
From: panll <m18010473990@163.com>
Date: 星期五, 08 三月 2024 09:33:38 +0800
Subject: [PATCH] !28 语音对讲合并 语音对讲合并
---
src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushUploadFileHandler.java | 102 +++++++++++++++++++++++++++++++++++----------------
1 files changed, 70 insertions(+), 32 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
old mode 100644
new mode 100755
index 87e084b..a127159
--- 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,53 +4,88 @@
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 org.springframework.util.ObjectUtils;
import java.util.*;
public class StreamPushUploadFileHandler extends AnalysisEventListener<StreamPushExcelDto> {
- // 閿欒鏁版嵁鐨勫洖璋冿紝鐢ㄤ簬灏嗛敊璇暟鎹彂閫佺粰椤甸潰
+ /**
+ * 閿欒鏁版嵁鐨勫洖璋冿紝鐢ㄤ簬灏嗛敊璇暟鎹彂閫佺粰椤甸潰
+ */
private ErrorDataHandler errorDataHandler;
- // 鎺ㄦ祦鐨勪笟鍔＄被鐢ㄤ簬瀛樺偍鏁版嵁
+ /**
+ * 鎺ㄦ祦鐨勪笟鍔＄被鐢ㄤ簬瀛樺偍鏁版嵁
+ */
private IStreamPushService pushService;
- // 榛樿娴佸獟浣撹妭鐐笽D
+ /**
+ * 榛樿娴佸獟浣撹妭鐐笽D
+ */
private String defaultMediaServerId;
- // 鐢ㄤ簬瀛樺偍涓嶅姞杩囨护鐨勬墍鏈夋暟鎹�
- private List<StreamPushItem> streamPushItems = new ArrayList<>();
+ /**
+ * 鐢ㄤ簬瀛樺偍涓嶅姞杩囨护鐨勬墍鏈夋暟鎹�
+ */
+ private final List<StreamPushItem> streamPushItems = new ArrayList<>();
- // 鐢ㄤ簬瀛樺偍鏇村叿APP+Stream杩囨护鍚庣殑鏁版嵁锛屽彲浠ョ洿鎺ュ瓨鍏tream_push琛ㄤ笌gb_stream琛�
- private Map<String,StreamPushItem> streamPushItemForSave = new HashMap<>();
+ /**
+ * 鐢ㄤ簬瀛樺偍鏇村叿APP+Stream杩囨护鍚庣殑鏁版嵁锛屽彲浠ョ洿鎺ュ瓨鍏tream_push琛ㄤ笌gb_stream琛�
+ */
+ private final Map<String,StreamPushItem> streamPushItemForSave = new HashMap<>();
- // 鐢ㄤ簬瀛樺偍鎸夌収APP+Stream涓篕EY锛� 骞冲彴ID+鐩綍Id 涓簐alue鐨勬暟鎹紝鐢ㄤ簬瀛樺偍鍒癵b_stream琛ㄥ悗鑾峰彇app+Stream瀵瑰簲鐨勫钩鍙颁笌鐩綍淇℃伅锛岀劧鍚庡瓨鍏ュ叧鑱旇〃
- private Map<String, List<String[]>> streamPushItemsForPlatform = new HashMap<>();
+ /**
+ * 鐢ㄤ簬瀛樺偍鎸夌収APP+Stream涓篕EY锛� 骞冲彴ID+鐩綍Id 涓簐alue鐨勬暟鎹紝鐢ㄤ簬瀛樺偍鍒癵b_stream琛ㄥ悗鑾峰彇app+Stream瀵瑰簲鐨勫钩鍙颁笌鐩綍淇℃伅锛岀劧鍚庡瓨鍏ュ叧鑱旇〃
+ */
+ private final Map<String, List<String[]>> streamPushItemsForPlatform = new HashMap<>();
- // 鐢ㄤ簬鍒ゆ柇鏂囦欢鏄惁瀛樺湪閲嶅鐨刟pp+Stream+骞冲彴ID
- private Set<String> streamPushStreamSet = new HashSet<>();
+ /**
+ * 鐢ㄤ簬鍒ゆ柇鏂囦欢鏄惁瀛樺湪閲嶅鐨刟pp+Stream+骞冲彴ID
+ */
+ private final Set<String> streamPushStreamSet = new HashSet<>();
- // 鐢ㄤ簬瀛樺偍APP+Stream->鍥芥爣ID 鐨勬暟鎹粨鏋�, 鏁版嵁涓�涓�瀵瑰簲锛屽叏灞�鍒ゆ柇APP+Stream->鍥芥爣ID鏄惁瀛樺湪涓嶅搴�
- private BiMap<String,String> gBMap = HashBiMap.create();
+ /**
+ * 鐢ㄤ簬瀛樺偍APP+Stream->鍥芥爣ID 鐨勬暟鎹粨鏋�, 鏁版嵁涓�涓�瀵瑰簲锛屽叏灞�鍒ゆ柇APP+Stream->鍥芥爣ID鏄惁瀛樺湪涓嶅搴�
+ */
+ private final BiMap<String,String> gBMap = HashBiMap.create();
- // 璁板綍閿欒鐨凙PP+Stream
- private List<String> errorStreamList = new ArrayList<>();
+ /**
+ * 鐢ㄤ簬瀛樺偍APP+Stream-> 鍦ㄦ暟鎹簱涓殑鏁版嵁
+ */
+ private final BiMap<String,String> pushMapInDb = HashBiMap.create();
+
+ /**
+ * 璁板綍閿欒鐨凙PP+Stream
+ */
+ private final List<String> errorStreamList = new ArrayList<>();
- // 璁板綍閿欒鐨勫浗鏍嘔D
- private List<String> errorGBList = new ArrayList<>();
+ /**
+ * 璁板綍閿欒鐨勫浗鏍嘔D
+ */
+ private final List<String> errorInfoList = new ArrayList<>();
- // 璇诲彇鏁伴噺璁℃暟鍣�
+ /**
+ * 璇诲彇鏁伴噺璁℃暟鍣�
+ */
private int loadedSize = 0;
public StreamPushUploadFileHandler(IStreamPushService pushService, String defaultMediaServerId, ErrorDataHandler errorDataHandler) {
this.pushService = pushService;
this.defaultMediaServerId = defaultMediaServerId;
this.errorDataHandler = errorDataHandler;
+ // 鑾峰彇鏁版嵁搴撳凡鏈夌殑鏁版嵁锛屽凡缁忓瓨鍦ㄧ殑鍒欏拷鐣�
+ List<String> allAppAndStreams = pushService.getAllAppAndStream();
+ if (allAppAndStreams.size() > 0) {
+ for (String allAppAndStream : allAppAndStreams) {
+ pushMapInDb.put(allAppAndStream, allAppAndStream);
+ }
+ }
}
public interface ErrorDataHandler{
@@ -59,32 +94,35 @@
@Override
public void invoke(StreamPushExcelDto streamPushExcelDto, AnalysisContext analysisContext) {
- if (StringUtils.isEmpty(streamPushExcelDto.getApp())
- || StringUtils.isEmpty(streamPushExcelDto.getStream())
- || StringUtils.isEmpty(streamPushExcelDto.getGbId())) {
+ if (ObjectUtils.isEmpty(streamPushExcelDto.getApp())
+ || ObjectUtils.isEmpty(streamPushExcelDto.getStream())
+ || ObjectUtils.isEmpty(streamPushExcelDto.getGbId())) {
return;
}
+ Integer rowIndex = analysisContext.readRowHolder().getRowIndex();
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)");
+ errorInfoList.add("琛岋細" + rowIndex + ", " + streamPushExcelDto.getGbId() + " 鍥芥爣ID閲嶅浣跨敤");
return;
}
}else {
if (!gBMap.get(streamPushExcelDto.getApp() + streamPushExcelDto.getStream()).equals(streamPushExcelDto.getGbId())) {
- errorGBList.add(streamPushExcelDto.getGbId() + "(鍚屼竴缁刟pp+stream浣跨敤浜嗕笉鍚岀殑鍥芥爣ID)");
+ errorInfoList.add("琛岋細" + rowIndex + ", " + streamPushExcelDto.getGbId() + " 鍚屾牱鐨勫簲鐢ㄥ悕鍜屾祦ID浣跨敤浜嗕笉鍚岀殑鍥芥爣ID");
return;
}
}
if (streamPushStreamSet.contains(streamPushExcelDto.getApp() + streamPushExcelDto.getStream() + streamPushExcelDto.getPlatformId())) {
- errorStreamList.add(streamPushExcelDto.getApp() + "/" + streamPushExcelDto.getStream()+ "/" +
- streamPushExcelDto.getPlatformId() + "(鍚屼竴缁刟pp+stream娣诲姞鍦ㄤ簡鍚屼竴涓钩鍙颁笅)");
+ errorStreamList.add("琛岋細" + rowIndex + ", " + streamPushExcelDto.getApp() + "/" + streamPushExcelDto.getStream()+ " 骞冲彴淇℃伅閲嶅");
return;
}else {
+ if (pushMapInDb.get(streamPushExcelDto.getApp()+streamPushExcelDto.getStream()) != null) {
+ errorStreamList.add("琛岋細" + rowIndex + ", " + streamPushExcelDto.getApp() + "/" + streamPushExcelDto.getStream()+ " 鏁版嵁宸插瓨鍦�");
+ return;
+ }
streamPushStreamSet.add(streamPushExcelDto.getApp()+streamPushExcelDto.getStream() + streamPushExcelDto.getPlatformId());
}
@@ -92,9 +130,9 @@
streamPushItem.setApp(streamPushExcelDto.getApp());
streamPushItem.setStream(streamPushExcelDto.getStream());
streamPushItem.setGbId(streamPushExcelDto.getGbId());
- streamPushItem.setStatus(false);
+ streamPushItem.setStatus(streamPushExcelDto.getStatus());
streamPushItem.setStreamType("push");
- streamPushItem.setCreateStamp(System.currentTimeMillis());
+ streamPushItem.setCreateTime(DateUtil.getNow());
streamPushItem.setMediaServerId(defaultMediaServerId);
streamPushItem.setName(streamPushExcelDto.getName());
streamPushItem.setOriginType(2);
@@ -107,7 +145,7 @@
streamPushItems.add(streamPushItem);
streamPushItemForSave.put(streamPushItem.getApp() + streamPushItem.getStream(), streamPushItem);
- if (!StringUtils.isEmpty(streamPushExcelDto.getPlatformId())) {
+ if (!ObjectUtils.isEmpty(streamPushExcelDto.getPlatformId())) {
List<String[]> platformList = streamPushItemsForPlatform.get(streamPushItem.getApp() + streamPushItem.getStream());
if (platformList == null) {
platformList = new ArrayList<>();
@@ -115,7 +153,7 @@
}
String platformId = streamPushExcelDto.getPlatformId();
String catalogId = streamPushExcelDto.getCatalogId();
- if (StringUtils.isEmpty(streamPushExcelDto.getCatalogId())) {
+ if (ObjectUtils.isEmpty(streamPushExcelDto.getCatalogId())) {
catalogId = null;
}
String[] platFormInfoArray = new String[]{platformId, catalogId};
@@ -142,7 +180,7 @@
gBMap.clear();
streamPushStreamSet.clear();
streamPushItemsForPlatform.clear();
- errorDataHandler.handle(errorStreamList, errorGBList);
+ errorDataHandler.handle(errorStreamList, errorInfoList);
}
private void saveData(){
--
Gitblit v1.8.0