From 1cb1b0bd363e2b1beeae2e3f944d73677b2c2241 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: Thu, 4 Jul 2024 18:00:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gb28181/dao/CommonGBChannelMapper.java | 14 ++++ .../dao/DeviceAlarmMapper.java | 2 +- .../dao/DeviceChannelMapper.java | 2 +- .../dao/DeviceMapper.java | 2 +- .../dao/DeviceMobilePositionMapper.java | 2 +- .../dao/ParentPlatformMapper.java | 2 +- .../dao/PlatformCatalogMapper.java | 2 +- .../dao/PlatformChannelMapper.java | 2 +- .../dao/PlatformGbStreamMapper.java | 2 +- .../service/impl/GbChannelServiceImpl.java | 67 +++++++++++++++++++ .../service/impl/DeviceAlarmServiceImpl.java | 2 +- .../impl/DeviceChannelServiceImpl.java | 8 +-- .../vmp/service/impl/DeviceServiceImpl.java | 6 +- .../impl/MobilePositionServiceImpl.java | 4 +- .../impl/PlatformChannelServiceImpl.java | 8 +-- .../vmp/service/impl/PlatformServiceImpl.java | 2 +- .../storager/impl/RedisCatchStorageImpl.java | 4 +- .../impl/VideoManagerStorageImpl.java | 1 + .../service/impl/StreamProxyServiceImpl.java | 2 +- 19 files changed, 108 insertions(+), 26 deletions(-) create mode 100644 src/main/java/com/genersoft/iot/vmp/gb28181/dao/CommonGBChannelMapper.java rename src/main/java/com/genersoft/iot/vmp/{storager => gb28181}/dao/DeviceAlarmMapper.java (98%) rename src/main/java/com/genersoft/iot/vmp/{storager => gb28181}/dao/DeviceChannelMapper.java (99%) rename src/main/java/com/genersoft/iot/vmp/{storager => gb28181}/dao/DeviceMapper.java (99%) rename src/main/java/com/genersoft/iot/vmp/{storager => gb28181}/dao/DeviceMobilePositionMapper.java (98%) rename src/main/java/com/genersoft/iot/vmp/{storager => gb28181}/dao/ParentPlatformMapper.java (99%) rename src/main/java/com/genersoft/iot/vmp/{storager => gb28181}/dao/PlatformCatalogMapper.java (98%) rename src/main/java/com/genersoft/iot/vmp/{storager => gb28181}/dao/PlatformChannelMapper.java (99%) rename src/main/java/com/genersoft/iot/vmp/{storager => gb28181}/dao/PlatformGbStreamMapper.java (99%) diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/dao/CommonGBChannelMapper.java b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/CommonGBChannelMapper.java new file mode 100644 index 00000000..6cb43fc1 --- /dev/null +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/CommonGBChannelMapper.java @@ -0,0 +1,14 @@ +package com.genersoft.iot.vmp.gb28181.dao; + +import com.genersoft.iot.vmp.gb28181.bean.CommonGBChannel; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; +import org.springframework.stereotype.Repository; + +@Mapper +@Repository +public interface CommonGBChannelMapper { + + @Select() + CommonGBChannel queryByDeviceId(String gbDeviceId); +} diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceAlarmMapper.java b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/DeviceAlarmMapper.java similarity index 98% rename from src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceAlarmMapper.java rename to src/main/java/com/genersoft/iot/vmp/gb28181/dao/DeviceAlarmMapper.java index 589e6f2a..e885e6b4 100755 --- a/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceAlarmMapper.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/DeviceAlarmMapper.java @@ -1,4 +1,4 @@ -package com.genersoft.iot.vmp.storager.dao; +package com.genersoft.iot.vmp.gb28181.dao; import com.genersoft.iot.vmp.gb28181.bean.DeviceAlarm; import org.apache.ibatis.annotations.Delete; diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/DeviceChannelMapper.java similarity index 99% rename from src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java rename to src/main/java/com/genersoft/iot/vmp/gb28181/dao/DeviceChannelMapper.java index 5cd50b94..bcddfa90 100755 --- a/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/DeviceChannelMapper.java @@ -1,4 +1,4 @@ -package com.genersoft.iot.vmp.storager.dao; +package com.genersoft.iot.vmp.gb28181.dao; import com.genersoft.iot.vmp.gb28181.bean.Device; import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel; diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/DeviceMapper.java similarity index 99% rename from src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java rename to src/main/java/com/genersoft/iot/vmp/gb28181/dao/DeviceMapper.java index f41bf725..87005016 100755 --- a/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/DeviceMapper.java @@ -1,4 +1,4 @@ -package com.genersoft.iot.vmp.storager.dao; +package com.genersoft.iot.vmp.gb28181.dao; import com.genersoft.iot.vmp.gb28181.bean.Device; import org.apache.ibatis.annotations.*; diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMobilePositionMapper.java b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/DeviceMobilePositionMapper.java similarity index 98% rename from src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMobilePositionMapper.java rename to src/main/java/com/genersoft/iot/vmp/gb28181/dao/DeviceMobilePositionMapper.java index 51243106..d5059c5e 100755 --- a/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMobilePositionMapper.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/DeviceMobilePositionMapper.java @@ -1,4 +1,4 @@ -package com.genersoft.iot.vmp.storager.dao; +package com.genersoft.iot.vmp.gb28181.dao; import com.genersoft.iot.vmp.gb28181.bean.MobilePosition; import org.apache.ibatis.annotations.Delete; diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/ParentPlatformMapper.java b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/ParentPlatformMapper.java similarity index 99% rename from src/main/java/com/genersoft/iot/vmp/storager/dao/ParentPlatformMapper.java rename to src/main/java/com/genersoft/iot/vmp/gb28181/dao/ParentPlatformMapper.java index 63b19bb4..890e5d14 100755 --- a/src/main/java/com/genersoft/iot/vmp/storager/dao/ParentPlatformMapper.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/ParentPlatformMapper.java @@ -1,4 +1,4 @@ -package com.genersoft.iot.vmp.storager.dao; +package com.genersoft.iot.vmp.gb28181.dao; import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform; import com.genersoft.iot.vmp.storager.dao.dto.ChannelSourceInfo; diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformCatalogMapper.java b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/PlatformCatalogMapper.java similarity index 98% rename from src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformCatalogMapper.java rename to src/main/java/com/genersoft/iot/vmp/gb28181/dao/PlatformCatalogMapper.java index 62d61019..feaf5ecc 100755 --- a/src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformCatalogMapper.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/PlatformCatalogMapper.java @@ -1,4 +1,4 @@ -package com.genersoft.iot.vmp.storager.dao; +package com.genersoft.iot.vmp.gb28181.dao; import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel; import com.genersoft.iot.vmp.gb28181.bean.PlatformCatalog; diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformChannelMapper.java b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/PlatformChannelMapper.java similarity index 99% rename from src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformChannelMapper.java rename to src/main/java/com/genersoft/iot/vmp/gb28181/dao/PlatformChannelMapper.java index d894a3d0..0fc0a0db 100755 --- a/src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformChannelMapper.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/PlatformChannelMapper.java @@ -1,4 +1,4 @@ -package com.genersoft.iot.vmp.storager.dao; +package com.genersoft.iot.vmp.gb28181.dao; import com.genersoft.iot.vmp.gb28181.bean.*; import com.genersoft.iot.vmp.vmanager.gb28181.platform.bean.ChannelReduce; diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformGbStreamMapper.java b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/PlatformGbStreamMapper.java similarity index 99% rename from src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformGbStreamMapper.java rename to src/main/java/com/genersoft/iot/vmp/gb28181/dao/PlatformGbStreamMapper.java index ddbb8621..9eb8453a 100755 --- a/src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformGbStreamMapper.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/PlatformGbStreamMapper.java @@ -1,4 +1,4 @@ -package com.genersoft.iot.vmp.storager.dao; +package com.genersoft.iot.vmp.gb28181.dao; import com.genersoft.iot.vmp.gb28181.bean.GbStream; import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform; diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelServiceImpl.java index eb31b94a..792acc3a 100644 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelServiceImpl.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelServiceImpl.java @@ -1,12 +1,79 @@ package com.genersoft.iot.vmp.gb28181.service.impl; +import com.genersoft.iot.vmp.gb28181.bean.CommonGBChannel; +import com.genersoft.iot.vmp.gb28181.dao.CommonGBChannelMapper; import com.genersoft.iot.vmp.gb28181.service.IGbChannelService; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Collections; +import java.util.List; + @Slf4j @Service public class GbChannelServiceImpl implements IGbChannelService { + @Autowired + private CommonGBChannelMapper commonGBChannelMapper; + @Override + public CommonGBChannel queryByDeviceId(String gbDeviceId) { + return commonGBChannelMapper.queryByDeviceId(gbDeviceId); + } + + @Override + public int add(CommonGBChannel commonGBChannel) { + return 0; + } + + @Override + public int delete(int gbId) { + return 0; + } + + @Override + public int update(CommonGBChannel commonGBChannel) { + return 0; + } + + @Override + public int offline(CommonGBChannel commonGBChannel) { + return 0; + } + + @Override + public int offline(List commonGBChannelList) { + return 0; + } + + @Override + public int online(CommonGBChannel commonGBChannel) { + return 0; + } + + @Override + public int online(List commonGBChannelList) { + return 0; + } + + @Override + public void closeSend(CommonGBChannel commonGBChannel) { + + } + + @Override + public void batchAdd(List commonGBChannels) { + + } + + @Override + public void updateStatus(List channelList) { + + } + + @Override + public List queryByPlatformId(Integer platformId) { + return Collections.emptyList(); + } } diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceAlarmServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceAlarmServiceImpl.java index afc9c3a1..a4b283d5 100755 --- a/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceAlarmServiceImpl.java +++ b/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceAlarmServiceImpl.java @@ -3,7 +3,7 @@ package com.genersoft.iot.vmp.service.impl; import com.baomidou.dynamic.datasource.annotation.DS; import com.genersoft.iot.vmp.gb28181.bean.DeviceAlarm; import com.genersoft.iot.vmp.service.IDeviceAlarmService; -import com.genersoft.iot.vmp.storager.dao.DeviceAlarmMapper; +import com.genersoft.iot.vmp.gb28181.dao.DeviceAlarmMapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import org.springframework.beans.factory.annotation.Autowired; 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 dfdb6553..45decc9d 100755 --- a/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceChannelServiceImpl.java +++ b/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceChannelServiceImpl.java @@ -13,10 +13,10 @@ import com.genersoft.iot.vmp.gb28181.event.subscribe.catalog.CatalogEvent; import com.genersoft.iot.vmp.service.IDeviceChannelService; import com.genersoft.iot.vmp.service.IInviteStreamService; import com.genersoft.iot.vmp.storager.IRedisCatchStorage; -import com.genersoft.iot.vmp.storager.dao.DeviceChannelMapper; -import com.genersoft.iot.vmp.storager.dao.DeviceMapper; -import com.genersoft.iot.vmp.storager.dao.DeviceMobilePositionMapper; -import com.genersoft.iot.vmp.storager.dao.PlatformChannelMapper; +import com.genersoft.iot.vmp.gb28181.dao.DeviceChannelMapper; +import com.genersoft.iot.vmp.gb28181.dao.DeviceMapper; +import com.genersoft.iot.vmp.gb28181.dao.DeviceMobilePositionMapper; +import com.genersoft.iot.vmp.gb28181.dao.PlatformChannelMapper; import com.genersoft.iot.vmp.utils.DateUtil; import com.genersoft.iot.vmp.vmanager.bean.ResourceBaseInfo; import com.genersoft.iot.vmp.vmanager.gb28181.platform.bean.ChannelReduce; diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java index b0f66383..86733db8 100755 --- a/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java +++ b/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java @@ -20,9 +20,9 @@ import com.genersoft.iot.vmp.service.IDeviceChannelService; import com.genersoft.iot.vmp.service.IDeviceService; import com.genersoft.iot.vmp.service.IInviteStreamService; import com.genersoft.iot.vmp.storager.IRedisCatchStorage; -import com.genersoft.iot.vmp.storager.dao.DeviceChannelMapper; -import com.genersoft.iot.vmp.storager.dao.DeviceMapper; -import com.genersoft.iot.vmp.storager.dao.PlatformChannelMapper; +import com.genersoft.iot.vmp.gb28181.dao.DeviceChannelMapper; +import com.genersoft.iot.vmp.gb28181.dao.DeviceMapper; +import com.genersoft.iot.vmp.gb28181.dao.PlatformChannelMapper; import com.genersoft.iot.vmp.utils.DateUtil; import com.genersoft.iot.vmp.vmanager.bean.ResourceBaseInfo; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/MobilePositionServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/MobilePositionServiceImpl.java index ff2eca5e..52042739 100644 --- a/src/main/java/com/genersoft/iot/vmp/service/impl/MobilePositionServiceImpl.java +++ b/src/main/java/com/genersoft/iot/vmp/service/impl/MobilePositionServiceImpl.java @@ -4,8 +4,8 @@ import com.genersoft.iot.vmp.conf.UserSetting; import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel; import com.genersoft.iot.vmp.gb28181.bean.MobilePosition; import com.genersoft.iot.vmp.service.IMobilePositionService; -import com.genersoft.iot.vmp.storager.dao.DeviceChannelMapper; -import com.genersoft.iot.vmp.storager.dao.DeviceMobilePositionMapper; +import com.genersoft.iot.vmp.gb28181.dao.DeviceChannelMapper; +import com.genersoft.iot.vmp.gb28181.dao.DeviceMobilePositionMapper; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/PlatformChannelServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/PlatformChannelServiceImpl.java index 5882a0c1..0a5c72a6 100755 --- a/src/main/java/com/genersoft/iot/vmp/service/impl/PlatformChannelServiceImpl.java +++ b/src/main/java/com/genersoft/iot/vmp/service/impl/PlatformChannelServiceImpl.java @@ -5,10 +5,10 @@ import com.genersoft.iot.vmp.gb28181.bean.*; import com.genersoft.iot.vmp.gb28181.event.EventPublisher; import com.genersoft.iot.vmp.gb28181.event.subscribe.catalog.CatalogEvent; import com.genersoft.iot.vmp.service.IPlatformChannelService; -import com.genersoft.iot.vmp.storager.dao.DeviceChannelMapper; -import com.genersoft.iot.vmp.storager.dao.ParentPlatformMapper; -import com.genersoft.iot.vmp.storager.dao.PlatformCatalogMapper; -import com.genersoft.iot.vmp.storager.dao.PlatformChannelMapper; +import com.genersoft.iot.vmp.gb28181.dao.DeviceChannelMapper; +import com.genersoft.iot.vmp.gb28181.dao.ParentPlatformMapper; +import com.genersoft.iot.vmp.gb28181.dao.PlatformCatalogMapper; +import com.genersoft.iot.vmp.gb28181.dao.PlatformChannelMapper; import com.genersoft.iot.vmp.vmanager.gb28181.platform.bean.ChannelReduce; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java index 7b3aeb8c..6af3c1f2 100755 --- a/src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java +++ b/src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java @@ -25,7 +25,7 @@ import com.genersoft.iot.vmp.service.IPlayService; import com.genersoft.iot.vmp.service.bean.*; import com.genersoft.iot.vmp.storager.IRedisCatchStorage; import com.genersoft.iot.vmp.storager.dao.GbStreamMapper; -import com.genersoft.iot.vmp.storager.dao.ParentPlatformMapper; +import com.genersoft.iot.vmp.gb28181.dao.ParentPlatformMapper; import com.genersoft.iot.vmp.utils.DateUtil; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; diff --git a/src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java b/src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java index 95a3ef78..288fe931 100755 --- a/src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java +++ b/src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java @@ -14,8 +14,8 @@ import com.genersoft.iot.vmp.media.zlm.dto.hook.OnStreamChangedHookParam; import com.genersoft.iot.vmp.service.bean.GPSMsgInfo; import com.genersoft.iot.vmp.service.bean.MessageForPushChannel; import com.genersoft.iot.vmp.storager.IRedisCatchStorage; -import com.genersoft.iot.vmp.storager.dao.DeviceChannelMapper; -import com.genersoft.iot.vmp.storager.dao.DeviceMapper; +import com.genersoft.iot.vmp.gb28181.dao.DeviceChannelMapper; +import com.genersoft.iot.vmp.gb28181.dao.DeviceMapper; import com.genersoft.iot.vmp.storager.dao.dto.PlatformRegisterInfo; import com.genersoft.iot.vmp.streamPush.bean.StreamPush; import com.genersoft.iot.vmp.utils.DateUtil; diff --git a/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java b/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java index 10fa7dbf..4f991985 100755 --- a/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java +++ b/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java @@ -4,6 +4,7 @@ import com.baomidou.dynamic.datasource.annotation.DS; import com.genersoft.iot.vmp.conf.SipConfig; import com.genersoft.iot.vmp.conf.UserSetting; import com.genersoft.iot.vmp.gb28181.bean.*; +import com.genersoft.iot.vmp.gb28181.dao.*; import com.genersoft.iot.vmp.gb28181.event.EventPublisher; import com.genersoft.iot.vmp.gb28181.event.subscribe.catalog.CatalogEvent; import com.genersoft.iot.vmp.service.bean.GPSMsgInfo; diff --git a/src/main/java/com/genersoft/iot/vmp/streamProxy/service/impl/StreamProxyServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/streamProxy/service/impl/StreamProxyServiceImpl.java index 51e9acde..4a0360d7 100755 --- a/src/main/java/com/genersoft/iot/vmp/streamProxy/service/impl/StreamProxyServiceImpl.java +++ b/src/main/java/com/genersoft/iot/vmp/streamProxy/service/impl/StreamProxyServiceImpl.java @@ -19,7 +19,7 @@ import com.genersoft.iot.vmp.media.service.IMediaServerService; import com.genersoft.iot.vmp.media.zlm.dto.hook.OriginType; import com.genersoft.iot.vmp.storager.IRedisCatchStorage; import com.genersoft.iot.vmp.storager.IVideoManagerStorage; -import com.genersoft.iot.vmp.storager.dao.PlatformGbStreamMapper; +import com.genersoft.iot.vmp.gb28181.dao.PlatformGbStreamMapper; import com.genersoft.iot.vmp.streamProxy.bean.StreamProxy; import com.genersoft.iot.vmp.streamProxy.dao.StreamProxyMapper; import com.genersoft.iot.vmp.streamProxy.service.IStreamProxyService;