From 5639719879759c287a0c020818104b9e72ffc292 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 29 五月 2023 09:25:45 +0800
Subject: [PATCH] Merge branch 'postgresql' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushUploadFileHandler.java | 41 ++++++++++++++++++++++++++++-------------
1 files changed, 28 insertions(+), 13 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 1b21995..a127159 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
@@ -9,7 +9,6 @@
import com.google.common.collect.BiMap;
import com.google.common.collect.HashBiMap;
import org.springframework.util.ObjectUtils;
-import org.springframework.util.StringUtils;
import java.util.*;
@@ -33,38 +32,43 @@
/**
* 鐢ㄤ簬瀛樺偍涓嶅姞杩囨护鐨勬墍鏈夋暟鎹�
*/
- 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<>();
+ 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<>();
+ private final Map<String, List<String[]>> streamPushItemsForPlatform = new HashMap<>();
/**
* 鐢ㄤ簬鍒ゆ柇鏂囦欢鏄惁瀛樺湪閲嶅鐨刟pp+Stream+骞冲彴ID
*/
- private Set<String> streamPushStreamSet = new HashSet<>();
+ private final Set<String> streamPushStreamSet = new HashSet<>();
/**
* 鐢ㄤ簬瀛樺偍APP+Stream->鍥芥爣ID 鐨勬暟鎹粨鏋�, 鏁版嵁涓�涓�瀵瑰簲锛屽叏灞�鍒ゆ柇APP+Stream->鍥芥爣ID鏄惁瀛樺湪涓嶅搴�
*/
- private BiMap<String,String> gBMap = HashBiMap.create();
+ private final BiMap<String,String> gBMap = HashBiMap.create();
+
+ /**
+ * 鐢ㄤ簬瀛樺偍APP+Stream-> 鍦ㄦ暟鎹簱涓殑鏁版嵁
+ */
+ private final BiMap<String,String> pushMapInDb = HashBiMap.create();
/**
* 璁板綍閿欒鐨凙PP+Stream
*/
- private List<String> errorStreamList = new ArrayList<>();
+ private final List<String> errorStreamList = new ArrayList<>();
/**
* 璁板綍閿欒鐨勫浗鏍嘔D
*/
- private List<String> errorGBList = new ArrayList<>();
+ private final List<String> errorInfoList = new ArrayList<>();
/**
* 璇诲彇鏁伴噺璁℃暟鍣�
@@ -75,6 +79,13 @@
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{
@@ -88,26 +99,30 @@
|| 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) {
- 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());
}
@@ -165,7 +180,7 @@
gBMap.clear();
streamPushStreamSet.clear();
streamPushItemsForPlatform.clear();
- errorDataHandler.handle(errorStreamList, errorGBList);
+ errorDataHandler.handle(errorStreamList, errorInfoList);
}
private void saveData(){
--
Gitblit v1.8.0