From 66cadafd1c4f6a7c84fec90cf7c073060a0b9d5f Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 27 一月 2022 17:40:59 +0800
Subject: [PATCH] 优化直播推流的CivilCode
---
src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushUploadFileHandler.java | 39 +++++++++++++++++++++++++++++++++++++--
1 files changed, 37 insertions(+), 2 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 de7307c..586b5b4 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
@@ -5,23 +5,51 @@
import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem;
import com.genersoft.iot.vmp.service.IStreamPushService;
import com.genersoft.iot.vmp.vmanager.bean.StreamPushExcelDto;
+import org.springframework.util.StringUtils;
import java.util.ArrayList;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
public class StreamPushUploadFileHandler extends AnalysisEventListener<StreamPushExcelDto> {
+ private ErrorDataHandler errorDataHandler;
private IStreamPushService pushService;
private String defaultMediaServerId;
private List<StreamPushItem> streamPushItems = new ArrayList<>();
+ private Set<String> streamPushStreamSet = new HashSet<>();
+ private Set<String> streamPushGBSet = new HashSet<>();
+ private List<String> errorStreamList = new ArrayList<>();
+ private List<String> errorGBList = new ArrayList<>();
- public StreamPushUploadFileHandler(IStreamPushService pushService, String defaultMediaServerId) {
+ public StreamPushUploadFileHandler(IStreamPushService pushService, String defaultMediaServerId, ErrorDataHandler errorDataHandler) {
this.pushService = pushService;
this.defaultMediaServerId = defaultMediaServerId;
+ this.errorDataHandler = errorDataHandler;
+ }
+
+ public interface ErrorDataHandler{
+ void handle(List<String> streams, List<String> gbId);
}
@Override
public void invoke(StreamPushExcelDto streamPushExcelDto, AnalysisContext analysisContext) {
+ if (StringUtils.isEmpty(streamPushExcelDto.getApp())
+ || StringUtils.isEmpty(streamPushExcelDto.getStream())
+ || StringUtils.isEmpty(streamPushExcelDto.getGbId())) {
+ return;
+ }
+ if (streamPushGBSet.contains(streamPushExcelDto.getGbId())) {
+ errorGBList.add(streamPushExcelDto.getGbId());
+ }
+ if (streamPushStreamSet.contains(streamPushExcelDto.getApp() + streamPushExcelDto.getStream())) {
+ errorStreamList.add(streamPushExcelDto.getApp() + "/" + streamPushExcelDto.getStream());
+ }
+ if (streamPushGBSet.contains(streamPushExcelDto.getGbId()) || streamPushStreamSet.contains(streamPushExcelDto.getApp() + streamPushExcelDto.getStream())) {
+ return;
+ }
+
StreamPushItem streamPushItem = new StreamPushItem();
streamPushItem.setApp(streamPushExcelDto.getApp());
streamPushItem.setStream(streamPushExcelDto.getStream());
@@ -35,6 +63,8 @@
streamPushItem.setOriginTypeStr("rtsp_push");
streamPushItem.setTotalReaderCount("0");
streamPushItems.add(streamPushItem);
+ streamPushGBSet.add(streamPushExcelDto.getGbId());
+ streamPushStreamSet.add(streamPushExcelDto.getApp()+streamPushExcelDto.getStream());
if (streamPushItems.size() > 300) {
pushService.batchAdd(streamPushItems);
// 瀛樺偍瀹屾垚娓呯悊 list
@@ -45,6 +75,11 @@
@Override
public void doAfterAllAnalysed(AnalysisContext analysisContext) {
// 杩欓噷涔熻淇濆瓨鏁版嵁锛岀‘淇濇渶鍚庨仐鐣欑殑鏁版嵁涔熷瓨鍌ㄥ埌鏁版嵁搴�
- pushService.batchAdd(streamPushItems);
+ if (streamPushItems.size() > 0) {
+ pushService.batchAdd(streamPushItems);
+ }
+ streamPushGBSet.clear();
+ streamPushStreamSet.clear();
+ errorDataHandler.handle(errorStreamList, errorGBList);
}
}
--
Gitblit v1.8.0