临时提交

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);
+}

src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceAlarmMapper.java → 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;

src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java → 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;

src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java → 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.*;

src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMobilePositionMapper.java → 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;

src/main/java/com/genersoft/iot/vmp/storager/dao/ParentPlatformMapper.java → 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;

src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformCatalogMapper.java → 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;

src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformChannelMapper.java → 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;

src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformGbStreamMapper.java → 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;

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<CommonGBChannel> commonGBChannelList) {
+        return 0;
+    }
+
+    @Override
+    public int online(CommonGBChannel commonGBChannel) {
+        return 0;
+    }
+
+    @Override
+    public int online(List<CommonGBChannel> commonGBChannelList) {
+        return 0;
+    }
+
+    @Override
+    public void closeSend(CommonGBChannel commonGBChannel) {
+
+    }
+
+    @Override
+    public void batchAdd(List<CommonGBChannel> commonGBChannels) {
+
+    }
+
+    @Override
+    public void updateStatus(List<CommonGBChannel> channelList) {
+
+    }
 
+    @Override
+    public List<CommonGBChannel> queryByPlatformId(Integer platformId) {
+        return Collections.emptyList();
+    }
 }

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;

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;

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;

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;

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;

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;

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;

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;

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;