实现国标录像级联播放，优化点播流程，加快点播速度

648540858

2022-02-27 e94b99d11c46246532edc93cd25cbf8c0b88f03f

 src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceQuery.java

@@ -10,8 +10,10 @@
import com.genersoft.iot.vmp.service.IDeviceService;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
import com.genersoft.iot.vmp.vmanager.bean.DeviceChannelTree;
import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
import com.github.pagehelper.PageInfo;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -25,6 +27,7 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.web.context.request.async.DeferredResult;

import java.util.List;
import java.util.UUID;

@Api(tags = "国标设备查询", value = "国标设备查询")
@@ -153,12 +156,15 @@
      // 默认超时时间为30分钟
      DeferredResult<ResponseEntity<Device>> result = new DeferredResult<ResponseEntity<Device>>(30*60*1000L);
      result.onTimeout(()->{
         logger.warn(String.format("设备通道信息同步超时"));
         logger.warn("设备[{}]通道信息同步超时", deviceId);
         // 释放rtpserver
         RequestMessage msg = new RequestMessage();
         msg.setKey(key);
         msg.setId(uuid);
         WVPResult<Object> wvpResult = new WVPResult<>();
         wvpResult.setCode(0);
         wvpResult.setMsg("Timeout");
         wvpResult.setCode(-1);
         wvpResult.setData(device);
         wvpResult.setMsg("更新超时");
         msg.setData(wvpResult);
         resultHolder.invokeAllResult(msg);

@@ -170,8 +176,10 @@
        cmder.catalogQuery(device, event -> {
         RequestMessage msg = new RequestMessage();
         msg.setKey(key);
         msg.setId(uuid);
         WVPResult<Object> wvpResult = new WVPResult<>();
         wvpResult.setCode(0);
         wvpResult.setCode(-1);
         wvpResult.setData(device);
         wvpResult.setMsg(String.format("同步通道失败，错误码： %s, %s", event.statusCode, event.msg));
         msg.setData(wvpResult);
         resultHolder.invokeAllResult(msg);
@@ -311,7 +319,8 @@
         if (!StringUtils.isEmpty(device.getCharset())) deviceInStore.setCharset(device.getCharset());
         if (!StringUtils.isEmpty(device.getMediaServerId())) deviceInStore.setMediaServerId(device.getMediaServerId());

         if (deviceInStore.getSubscribeCycleForCatalog() <=0 && device.getSubscribeCycleForCatalog() > 0) {
         if ((deviceInStore.getSubscribeCycleForCatalog() <=0 && device.getSubscribeCycleForCatalog() > 0)
               || deviceInStore.getSubscribeCycleForCatalog() != device.getSubscribeCycleForCatalog()) {
            deviceInStore.setSubscribeCycleForCatalog(device.getSubscribeCycleForCatalog());
            // 开启订阅
            deviceService.addCatalogSubscribe(deviceInStore);
@@ -425,5 +434,9 @@
      return result;
   }


   @GetMapping("/{deviceId}/tree")
   @ApiOperation(value = "通道树形结构", notes = "通道树形结构")
   public WVPResult<List<DeviceChannelTree>> tree(@PathVariable String deviceId) {
      return WVPResult.Data(storager.tree(deviceId));
   }
}