添加logo

648540858

2021-08-30 e124cd37f1f9a342c04d5fe95b2fa1dc4383eb87

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

@@ -132,15 +132,14 @@
    */
   @ApiOperation("同步设备通道")
   @ApiImplicitParams({
         @ApiImplicitParam(name="deviceId", value = "设备id", required = true ,dataTypeClass = String.class),
         @ApiImplicitParam(name="deviceId", value = "设备id", required = true, dataTypeClass = String.class),
   })
   @PostMapping("/devices/{deviceId}/sync")
   public DeferredResult<ResponseEntity<Device>> devicesSync(@PathVariable String deviceId){
      
      if (logger.isDebugEnabled()) {
      }
         logger.debug("设备通道信息同步API调用，deviceId：" + deviceId);

      }
      Device device = storager.queryVideoDevice(deviceId);
        cmder.catalogQuery(device, event -> {
         Response response = event.getResponse();
@@ -149,7 +148,7 @@
         msg.setData(String.format("同步通道失败，错误码： %s, %s", response.getStatusCode(), response.getReasonPhrase()));
         resultHolder.invokeResult(msg);
      });
        DeferredResult<ResponseEntity<Device>> result = new DeferredResult<ResponseEntity<Device>>(2*1000L);
        DeferredResult<ResponseEntity<Device>> result = new DeferredResult<ResponseEntity<Device>>(15*1000L);
      result.onTimeout(()->{
         logger.warn(String.format("设备通道信息同步超时"));
         // 释放rtpserver
@@ -264,7 +263,7 @@
   @ApiImplicitParams({
         @ApiImplicitParam(name = "deviceId", value = "设备id", required = true, dataTypeClass = String.class),
         @ApiImplicitParam(name = "streamMode", value = "数据流传输模式, 取值：" +
               "UDP（udp传输），TCP-ACTIVE（tcp主动模式,暂不支持），TCP-PASSIVE（tcp被动模式）"),
               "UDP（udp传输），TCP-ACTIVE（tcp主动模式,暂不支持），TCP-PASSIVE（tcp被动模式）", dataTypeClass = String.class),
   })
   @PostMapping("/transport/{deviceId}/{streamMode}")
   public ResponseEntity<PageInfo> updateTransport(@PathVariable String deviceId, @PathVariable String streamMode){