From 42a2772d1aa7493bcc4fac3e24ee8eda4eebc23d Mon Sep 17 00:00:00 2001
From: xubinbin <1323875150@qq.com>
Date: 星期二, 12 十二月 2023 17:09:04 +0800
Subject: [PATCH] bugfix：请求头带token， SecurityUtils 获取用户id 一直为0 #1195
---
src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushUploadFileHandler.java | 171 ++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 139 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 16924df..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,29 +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 org.springframework.util.StringUtils;
+import com.google.common.collect.BiMap;
+import com.google.common.collect.HashBiMap;
+import org.springframework.util.ObjectUtils;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+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 Set<String> streamPushStreamSet = new HashSet<>();
- private Set<String> streamPushGBSet = new HashSet<>();
- private List<String> errorStreamList = new ArrayList<>();
- private List<String> errorGBList = new ArrayList<>();
+
+ /**
+ * 鐢ㄤ簬瀛樺偍涓嶅姞杩囨护鐨勬墍鏈夋暟鎹�
+ */
+ private final List<StreamPushItem> streamPushItems = new ArrayList<>();
+
+ /**
+ * 鐢ㄤ簬瀛樺偍鏇村叿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 final Map<String, List<String[]>> streamPushItemsForPlatform = new HashMap<>();
+
+ /**
+ * 鐢ㄤ簬鍒ゆ柇鏂囦欢鏄惁瀛樺湪閲嶅鐨刟pp+Stream+骞冲彴ID
+ */
+ private final Set<String> streamPushStreamSet = new HashSet<>();
+
+ /**
+ * 鐢ㄤ簬瀛樺偍APP+Stream->鍥芥爣ID 鐨勬暟鎹粨鏋�, 鏁版嵁涓�涓�瀵瑰簲锛屽叏灞�鍒ゆ柇APP+Stream->鍥芥爣ID鏄惁瀛樺湪涓嶅搴�
+ */
+ private final BiMap<String,String> gBMap = HashBiMap.create();
+
+ /**
+ * 鐢ㄤ簬瀛樺偍APP+Stream-> 鍦ㄦ暟鎹簱涓殑鏁版嵁
+ */
+ private final BiMap<String,String> pushMapInDb = HashBiMap.create();
+
+ /**
+ * 璁板綍閿欒鐨凙PP+Stream
+ */
+ private final List<String> errorStreamList = 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{
@@ -35,51 +94,99 @@
@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;
}
- if (streamPushGBSet.contains(streamPushExcelDto.getGbId())) {
- errorGBList.add(streamPushExcelDto.getGbId());
+ 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) {
+ errorInfoList.add("琛岋細" + rowIndex + ", " + streamPushExcelDto.getGbId() + " 鍥芥爣ID閲嶅浣跨敤");
+ return;
+ }
+ }else {
+ if (!gBMap.get(streamPushExcelDto.getApp() + streamPushExcelDto.getStream()).equals(streamPushExcelDto.getGbId())) {
+ errorInfoList.add("琛岋細" + rowIndex + ", " + streamPushExcelDto.getGbId() + " 鍚屾牱鐨勫簲鐢ㄥ悕鍜屾祦ID浣跨敤浜嗕笉鍚岀殑鍥芥爣ID");
+ return;
+ }
}
- if (streamPushStreamSet.contains(streamPushExcelDto.getApp() + streamPushExcelDto.getStream())) {
- errorStreamList.add(streamPushExcelDto.getApp() + "/" + streamPushExcelDto.getStream());
- }
- if (streamPushGBSet.contains(streamPushExcelDto.getGbId()) || streamPushStreamSet.contains(streamPushExcelDto.getApp() + streamPushExcelDto.getStream())) {
+
+ if (streamPushStreamSet.contains(streamPushExcelDto.getApp() + streamPushExcelDto.getStream() + streamPushExcelDto.getPlatformId())) {
+ 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());
}
StreamPushItem streamPushItem = new StreamPushItem();
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()/1000);
+ streamPushItem.setCreateTime(DateUtil.getNow());
streamPushItem.setMediaServerId(defaultMediaServerId);
streamPushItem.setName(streamPushExcelDto.getName());
streamPushItem.setOriginType(2);
streamPushItem.setOriginTypeStr("rtsp_push");
streamPushItem.setTotalReaderCount("0");
+ streamPushItem.setPlatformId(streamPushExcelDto.getPlatformId());
+ streamPushItem.setCatalogId(streamPushExcelDto.getCatalogId());
+
+ // 瀛樺叆鎵�鏈夌殑閫氶亾淇℃伅
streamPushItems.add(streamPushItem);
- streamPushGBSet.add(streamPushExcelDto.getGbId());
- streamPushStreamSet.add(streamPushExcelDto.getApp()+streamPushExcelDto.getStream());
- if (streamPushItems.size() > 300) {
- pushService.batchAdd(streamPushItems);
- // 瀛樺偍瀹屾垚娓呯悊 list
- streamPushItems.clear();
+ streamPushItemForSave.put(streamPushItem.getApp() + streamPushItem.getStream(), streamPushItem);
+
+ if (!ObjectUtils.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 (ObjectUtils.isEmpty(streamPushExcelDto.getCatalogId())) {
+ catalogId = null;
+ }
+ String[] platFormInfoArray = new String[]{platformId, catalogId};
+ platformList.add(platFormInfoArray);
}
+
+ loadedSize ++;
+ if (loadedSize > 1000) {
+ saveData();
+ streamPushItems.clear();
+ streamPushItemForSave.clear();
+ streamPushItemsForPlatform.clear();
+ loadedSize = 0;
+ }
+
}
@Override
public void doAfterAllAnalysed(AnalysisContext analysisContext) {
// 杩欓噷涔熻淇濆瓨鏁版嵁锛岀‘淇濇渶鍚庨仐鐣欑殑鏁版嵁涔熷瓨鍌ㄥ埌鏁版嵁搴�
- if (streamPushItems.size() > 0) {
- pushService.batchAdd(streamPushItems);
- }
- streamPushGBSet.clear();
+ saveData();
+ streamPushItems.clear();
+ streamPushItemForSave.clear();
+ gBMap.clear();
streamPushStreamSet.clear();
- errorDataHandler.handle(errorStreamList, errorGBList);
+ streamPushItemsForPlatform.clear();
+ errorDataHandler.handle(errorStreamList, errorInfoList);
+ }
+
+ private void saveData(){
+ if (streamPushItemForSave.size() > 0) {
+ // 鍚戞暟鎹簱鏌ヨ鏄惁瀛樺湪閲嶅鐨刟pp
+ pushService.batchAddForUpload(new ArrayList<>(streamPushItemForSave.values()), streamPushItemsForPlatform);
+ }
}
}
--
Gitblit v1.8.0