From d739bfa5976e36ced26f906ab16f83c20c8cb27c Mon Sep 17 00:00:00 2001
From: xiaoxie <hotcoffie@163.com>
Date: 星期一, 23 五月 2022 09:44:21 +0800
Subject: [PATCH] 处理冲突
---
src/main/java/com/genersoft/iot/vmp/service/IStreamPushService.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/service/IStreamPushService.java b/src/main/java/com/genersoft/iot/vmp/service/IStreamPushService.java
index 1d57d46..acf0d27 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/IStreamPushService.java
+++ b/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);
}
--
Gitblit v1.8.0