增加接收Bye请求后停止向上级推流功能

lawrencehj

2021-03-10 2c1dbe63de3d370d0b0f20fea474326e88b9ca23

 src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java

@@ -6,11 +6,13 @@
import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
import com.genersoft.iot.vmp.gb28181.bean.ParentPlatformCatch;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.gb28181.bean.MobilePosition;
import com.genersoft.iot.vmp.storager.dao.DeviceChannelMapper;
import com.genersoft.iot.vmp.storager.dao.DeviceMapper;
import com.genersoft.iot.vmp.storager.dao.ParentPlatformMapper;
import com.genersoft.iot.vmp.storager.dao.PatformChannelMapper;
import com.genersoft.iot.vmp.vmanager.platform.bean.ChannelReduce;
import com.genersoft.iot.vmp.storager.dao.DeviceMobilePositionMapper;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import org.springframework.beans.factory.annotation.Autowired;
@@ -25,6 +27,7 @@
 * @author: swwheihei
 * @date:   2020年5月6日 下午2:31:42
 */
@SuppressWarnings("rawtypes")
@Component
public class VideoManagerStoragerImpl implements IVideoManagerStorager {

@@ -32,7 +35,10 @@
    private DeviceMapper deviceMapper;

   @Autowired
    private DeviceChannelMapper deviceChannelMapper;
   private DeviceChannelMapper deviceChannelMapper;

   @Autowired
   private DeviceMobilePositionMapper deviceMobilePositionMapper;

   @Autowired
    private ParentPlatformMapper platformMapper;
@@ -194,11 +200,11 @@
   @Override
   public synchronized boolean online(String deviceId) {
      Device device = deviceMapper.getDeviceByDeviceId(deviceId);
      device.setOnline(1);
      System.out.println("更新设备在线");
      if (device == null) {
         return false;
      }
      device.setOnline(1);
      System.out.println("更新设备在线");
      return deviceMapper.update(device) > 0;
   }

@@ -216,10 +222,33 @@
      return deviceMapper.update(device) > 0;
   }


   /**
    * 清空通道
    * @param deviceId
    */
   @Override
   public void cleanChannelsForDevice(String deviceId) {
      int result = deviceChannelMapper.cleanChannelsByDeviceId(deviceId);
      deviceChannelMapper.cleanChannelsByDeviceId(deviceId);
   }

   /**
    * 添加Mobile Position设备移动位置
    * @param MobilePosition
    */
   @Override
   public synchronized boolean insertMobilePosition(MobilePosition mobilePosition) {
      return deviceMobilePositionMapper.insertNewPosition(mobilePosition) > 0;
   }

   /**
    * 查询移动位置轨迹
    * @param deviceId
    * @param startTime
    * @param endTime
    */
   @Override
   public synchronized List<MobilePosition> queryMobilePositions(String deviceId, String startTime, String endTime) {
      return deviceMobilePositionMapper.queryPositionByDeviceIdAndTime(deviceId, startTime, endTime);
   }

   @Override
@@ -231,14 +260,14 @@
   @Override
   public boolean updateParentPlatform(ParentPlatform parentPlatform) {
      int result = 0;
      ParentPlatformCatch parentPlatformCatch = redisCatchStorage.queryPlatformCatchInfo(parentPlatform.getDeviceGBId());
      if ( platformMapper.getParentPlatById(parentPlatform.getDeviceGBId()) == null) {
      ParentPlatformCatch parentPlatformCatch = redisCatchStorage.queryPlatformCatchInfo(parentPlatform.getServerGBId()); // .getDeviceGBId());
      if ( platformMapper.getParentPlatById(parentPlatform.getServerGBId()) == null) {
         result = platformMapper.addParentPlatform(parentPlatform);

         if (parentPlatformCatch == null) {
            parentPlatformCatch = new ParentPlatformCatch();
            parentPlatformCatch.setParentPlatform(parentPlatform);
            parentPlatformCatch.setId(parentPlatform.getDeviceGBId());
            parentPlatformCatch.setId(parentPlatform.getServerGBId());
         }
      }else {
         result = platformMapper.updateParentPlatform(parentPlatform);
@@ -254,7 +283,7 @@
   public boolean deleteParentPlatform(ParentPlatform parentPlatform) {
      int result = platformMapper.delParentPlatform(parentPlatform);
      // 删除关联的通道
      patformChannelMapper.cleanChannelForGB(parentPlatform.getDeviceGBId());
      patformChannelMapper.cleanChannelForGB(parentPlatform.getServerGBId());
      return result > 0;
   }

@@ -283,7 +312,7 @@

   @Override
   public PageInfo<ChannelReduce> queryAllChannelList(int page, int count, String query, Boolean online,
                                           Boolean channelType, String platformId, Boolean inPlatform) {
                                          Boolean channelType, String platformId, Boolean inPlatform) {
      PageHelper.startPage(page, count);
      List<ChannelReduce> all = deviceChannelMapper.queryChannelListInAll(query, online, channelType, platformId, inPlatform);
      return new PageInfo<>(all);
@@ -329,4 +358,34 @@

      return result;
   }

   @Override
   public DeviceChannel queryChannelInParentPlatform(String platformId, String channelId) {
      DeviceChannel channel = patformChannelMapper.queryChannelInParentPlatform(platformId, channelId);
      return channel;
   }

   @Override
   public Device queryVideoDeviceByPlatformIdAndChannelId(String platformId, String channelId) {
      Device device = patformChannelMapper.queryVideoDeviceByPlatformIdAndChannelId(platformId, channelId);
      return device;
   }

   /**
    * 查询最新移动位置
    * @param deviceId
    */
   @Override
   public MobilePosition queryLatestPosition(String deviceId) {
      return deviceMobilePositionMapper.queryLatestPositionByDevice(deviceId);
   }

   /**
    * 删除指定设备的所有移动位置
    * @param deviceId
    */
   public int clearMobilePositionsByDeviceId(String deviceId) {
      return deviceMobilePositionMapper.clearMobilePositionsByDeviceId(deviceId);
   }

}