From 38a85d432ae9bb861dbcbf090d68fb3dca0d85f6 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 29 十一月 2022 17:51:45 +0800
Subject: [PATCH] 修复合并的bug
---
src/main/java/com/genersoft/iot/vmp/service/impl/DeviceChannelServiceImpl.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceChannelServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceChannelServiceImpl.java
index 99ad3de..9db2d68 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceChannelServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceChannelServiceImpl.java
@@ -9,6 +9,8 @@
import com.genersoft.iot.vmp.storager.dao.DeviceChannelMapper;
import com.genersoft.iot.vmp.storager.dao.DeviceMapper;
import com.genersoft.iot.vmp.utils.DateUtil;
+import com.genersoft.iot.vmp.vmanager.bean.ResourceBaceInfo;
+import com.genersoft.iot.vmp.vmanager.gb28181.platform.bean.ChannelReduce;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -162,4 +164,17 @@
}
return addChannels.size() + updateChannels.size();
}
+
+ @Override
+ public ResourceBaceInfo getOverview() {
+ return channelMapper.getOverview();
+ }
+
+
+ @Override
+ public List<ChannelReduce> queryAllChannelList(String platformId) {
+ return channelMapper.queryChannelListInAll(null, null, null, platformId, null);
+ }
+
+
}
--
Gitblit v1.8.0