From b6702f7c052c25dd263a09d3765c798eb597e0c2 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 21 一月 2022 16:05:02 +0800
Subject: [PATCH] 修改mysql脚本
---
src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushUploadFileHandler.java | 22 ++++++++++++++++++++--
1 files changed, 20 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 a68f5e9..16924df 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
@@ -14,15 +14,23 @@
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
@@ -32,9 +40,16 @@
|| 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());
@@ -60,8 +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