Update --bug---.md

648540858

2023-04-15 f5d07c4c14a6555c0f1c80f5f47881a431570622

 src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushUploadFileHandler.java

@@ -8,44 +8,67 @@
import com.genersoft.iot.vmp.vmanager.bean.StreamPushExcelDto;
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.*;

public class StreamPushUploadFileHandler extends AnalysisEventListener<StreamPushExcelDto> {

    // 错误数据的回调，用于将错误数据发送给页面
    /**
     * 错误数据的回调，用于将错误数据发送给页面
     */
    private ErrorDataHandler errorDataHandler;

    // 推流的业务类用于存储数据
    /**
     * 推流的业务类用于存储数据
     */
    private IStreamPushService pushService;

    // 默认流媒体节点ID
    /**
     * 默认流媒体节点ID
     */
    private String defaultMediaServerId;

    // 用于存储不加过滤的所有数据
    /**
     * 用于存储不加过滤的所有数据
     */
    private List<StreamPushItem> streamPushItems = new ArrayList<>();

    // 用于存储更具APP+Stream过滤后的数据，可以直接存入stream_push表与gb_stream表
    /**
     * 用于存储更具APP+Stream过滤后的数据，可以直接存入stream_push表与gb_stream表
     */
    private Map<String,StreamPushItem> streamPushItemForSave = new HashMap<>();

    // 用于存储按照APP+Stream为KEY， 平台ID+目录Id 为value的数据，用于存储到gb_stream表后获取app+Stream对应的平台与目录信息，然后存入关联表
    /**
     * 用于存储按照APP+Stream为KEY， 平台ID+目录Id 为value的数据，用于存储到gb_stream表后获取app+Stream对应的平台与目录信息，然后存入关联表
     */
    private Map<String, List<String[]>> streamPushItemsForPlatform = new HashMap<>();

    // 用于判断文件是否存在重复的app+Stream+平台ID
    /**
     * 用于判断文件是否存在重复的app+Stream+平台ID
     */
    private Set<String> streamPushStreamSet = new HashSet<>();

    // 用于存储APP+Stream->国标ID 的数据结构, 数据一一对应，全局判断APP+Stream->国标ID是否存在不对应
    /**
     * 用于存储APP+Stream->国标ID 的数据结构, 数据一一对应，全局判断APP+Stream->国标ID是否存在不对应
     */
    private BiMap<String,String> gBMap = HashBiMap.create();

    // 记录错误的APP+Stream
    /**
     * 记录错误的APP+Stream
     */
    private List<String> errorStreamList = new ArrayList<>();


    // 记录错误的国标ID
    /**
     * 记录错误的国标ID
     */
    private List<String> errorGBList = new ArrayList<>();

    // 读取数量计数器
    /**
     * 读取数量计数器
     */
    private int loadedSize = 0;

    public StreamPushUploadFileHandler(IStreamPushService pushService, String defaultMediaServerId, ErrorDataHandler errorDataHandler) {
@@ -60,9 +83,9 @@

    @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;
        }

@@ -70,7 +93,6 @@
            try {
                gBMap.put(streamPushExcelDto.getApp() + streamPushExcelDto.getStream(), streamPushExcelDto.getGbId());
            }catch (IllegalArgumentException e) {
                e.printStackTrace();
                errorGBList.add(streamPushExcelDto.getGbId() + "(不同的app+stream使用了相同的国标ID)");
                return;
            }
@@ -93,7 +115,7 @@
        streamPushItem.setApp(streamPushExcelDto.getApp());
        streamPushItem.setStream(streamPushExcelDto.getStream());
        streamPushItem.setGbId(streamPushExcelDto.getGbId());
        streamPushItem.setStatus(false);
        streamPushItem.setStatus(streamPushExcelDto.getStatus());
        streamPushItem.setStreamType("push");
        streamPushItem.setCreateTime(DateUtil.getNow());
        streamPushItem.setMediaServerId(defaultMediaServerId);
@@ -108,7 +130,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<>();
@@ -116,7 +138,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};