处理冲突

xiaoxie

2022-05-23 d739bfa5976e36ced26f906ab16f83c20c8cb27c

 src/main/java/com/genersoft/iot/vmp/service/IStreamPushService.java

@@ -9,6 +9,7 @@
import com.github.pagehelper.PageInfo;

import java.util.List;
import java.util.Map;

public interface IStreamPushService {

@@ -69,5 +70,5 @@

    boolean batchStop(List<GbStream> streamPushItems);

    void batchAddForUpload(String platformId, String catalogId, List<StreamPushItem> streamPushItems);
    void batchAddForUpload(List<StreamPushItem> streamPushItems, Map<String, List<String[]>> streamPushItemsForAll);
}