From 86a701ce885871d2468ec31eb13be5595673a01b Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 28 三月 2024 10:24:13 +0800
Subject: [PATCH] Merge branch 'master' into dev/abl支持
---
src/main/java/com/genersoft/iot/vmp/service/IDeviceChannelService.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/service/IDeviceChannelService.java b/src/main/java/com/genersoft/iot/vmp/service/IDeviceChannelService.java
old mode 100644
new mode 100755
index 66dbe07..5a20841
--- a/src/main/java/com/genersoft/iot/vmp/service/IDeviceChannelService.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/IDeviceChannelService.java
@@ -2,7 +2,7 @@
import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
-import com.genersoft.iot.vmp.vmanager.bean.ResourceBaceInfo;
+import com.genersoft.iot.vmp.vmanager.bean.ResourceBaseInfo;
import com.genersoft.iot.vmp.vmanager.gb28181.platform.bean.ChannelReduce;
import java.util.List;
@@ -38,7 +38,7 @@
* 鑾峰彇缁熻淇℃伅
* @return
*/
- ResourceBaceInfo getOverview();
+ ResourceBaseInfo getOverview();
/**
* 鏌ヨ鎵�鏈夋湭鍒嗛厤鐨勯�氶亾
@@ -87,4 +87,9 @@
* 鐩存帴鎵归噺娣诲姞
*/
void batchAddChannel(List<DeviceChannel> deviceChannels);
+
+ /**
+ * 淇敼閫氶亾鐨勭爜娴佺被鍨�
+ */
+ void updateChannelStreamIdentification(DeviceChannel channel);
}
--
Gitblit v1.8.0