Merge remote-tracking branch 'github/wvp-28181-2.0' into wvp-28181-2.0

648540858

2022-02-11 b663a8ab41efc072ca629391bb14ff42e26eb0cb

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

@@ -108,16 +108,15 @@
         msg.setData("Timeout. Device did not response to this command.");
         resultHolder.invokeAllResult(msg);
      });
      resultHolder.put(key, uuid, result);
      if (resultHolder.exist(key, null)){
         return result;
      }
      resultHolder.put(key, uuid, result);
      cmder.recordCmd(device, channelId, recordCmdStr, event -> {
            Response response = event.getResponse();
            RequestMessage msg = new RequestMessage();
         msg.setId(uuid);
         msg.setKey(key);
         msg.setData(String.format("开始/停止录像操作失败，错误码： %s, %s", response.getStatusCode(), response.getReasonPhrase()));
         msg.setData(String.format("开始/停止录像操作失败，错误码： %s, %s", event.statusCode, event.msg));
         resultHolder.invokeAllResult(msg);
      });

@@ -146,11 +145,10 @@
      String key = DeferredResultHolder.CALLBACK_CMD_DEVICECONTROL + deviceId + channelId;
      String uuid =UUID.randomUUID().toString();
      cmder.guardCmd(device, guardCmdStr, event -> {
         Response response = event.getResponse();
         RequestMessage msg = new RequestMessage();
         msg.setId(uuid);
         msg.setKey(key);
         msg.setData(String.format("布防/撤防操作失败，错误码： %s, %s", response.getStatusCode(), response.getReasonPhrase()));
         msg.setData(String.format("布防/撤防操作失败，错误码： %s, %s", event.statusCode, event.msg));
         resultHolder.invokeResult(msg);
      });
        DeferredResult<ResponseEntity<String>> result = new DeferredResult<ResponseEntity<String>>(3 * 1000L);
@@ -193,11 +191,10 @@
      String uuid = UUID.randomUUID().toString();
      String key = DeferredResultHolder.CALLBACK_CMD_DEVICECONTROL + deviceId + channelId;
      cmder.alarmCmd(device, alarmMethod, alarmType, event -> {
         Response response = event.getResponse();
         RequestMessage msg = new RequestMessage();
         msg.setId(uuid);
         msg.setKey(key);
         msg.setData(String.format("报警复位操作失败，错误码： %s, %s", response.getStatusCode(), response.getReasonPhrase()));
         msg.setData(String.format("报警复位操作失败，错误码： %s, %s", event.statusCode, event.msg));
         resultHolder.invokeResult(msg);
      });
        DeferredResult<ResponseEntity<String>> result = new DeferredResult<ResponseEntity<String>>(3 * 1000L);
@@ -276,11 +273,10 @@
      String uuid = UUID.randomUUID().toString();
      Device device = storager.queryVideoDevice(deviceId);
      cmder.homePositionCmd(device, channelId, enabled, resetTime, presetIndex, event -> {
         Response response = event.getResponse();
         RequestMessage msg = new RequestMessage();
         msg.setId(uuid);
         msg.setKey(key);
         msg.setData(String.format("看守位控制操作失败，错误码： %s, %s", response.getStatusCode(), response.getReasonPhrase()));
         msg.setData(String.format("看守位控制操作失败，错误码： %s, %s", event.statusCode, event.msg));
         resultHolder.invokeResult(msg);
      });
        DeferredResult<ResponseEntity<String>> result = new DeferredResult<ResponseEntity<String>>(3 * 1000L);
@@ -300,4 +296,103 @@
      resultHolder.put(key, uuid, result);
      return result;
   }

   /**
    * 拉框放大
    * @param deviceId 设备id
    * @param channelId 通道id
    * @param length 播放窗口长度像素值
    * @param width 播放窗口宽度像素值
    * @param midpointx 拉框中心的横轴坐标像素值
    * @param midpointy 拉框中心的纵轴坐标像素值
    * @param lengthx 拉框长度像素值
    * @param lengthy 拉框宽度像素值
    * @return
    */
   @ApiOperation("拉框放大")
   @ApiImplicitParams({
         @ApiImplicitParam(name = "deviceId", value = "设备ID", required = true, dataTypeClass = String.class),
         @ApiImplicitParam(name = "channelId", value = "通道ID", dataTypeClass = String.class),
         @ApiImplicitParam(name = "length", value = "播放窗口长度像素值", required = true, dataTypeClass = Integer.class),
         @ApiImplicitParam(name = "width", value = "播放窗口宽度像素值", required = true, dataTypeClass = Integer.class),
         @ApiImplicitParam(name = "midpointx", value = "拉框中心的横轴坐标像素值", required = true, dataTypeClass = Integer.class),
         @ApiImplicitParam(name = "midpointy", value = "拉框中心的纵轴坐标像素值", required = true, dataTypeClass = Integer.class),
         @ApiImplicitParam(name = "lengthx", value = "拉框长度像素值", required = true, dataTypeClass = Integer.class),
         @ApiImplicitParam(name = "lengthy", value = "拉框宽度像素值", required = true, dataTypeClass = Integer.class),
   })
   @GetMapping("drag_zoom/zoom_in")
   public ResponseEntity<String> dragZoomIn(@RequestParam String deviceId,
                                  @RequestParam(required = false) String channelId,
                                  @RequestParam int length,
                                  @RequestParam int width,
                                  @RequestParam int midpointx,
                                  @RequestParam int midpointy,
                                  @RequestParam int lengthx,
                                  @RequestParam int lengthy){
      if (logger.isDebugEnabled()) {
         logger.debug(String.format("设备拉框放大 API调用，deviceId：%s ，channelId：%s ，length：%d ，width：%d ，midpointx：%d ，midpointy：%d ，lengthx：%d ，lengthy：%d",deviceId, channelId, length, width, midpointx, midpointy,lengthx, lengthy));
      }
      Device device = storager.queryVideoDevice(deviceId);
      StringBuffer cmdXml = new StringBuffer(200);
      cmdXml.append("<DragZoomIn>\r\n");
      cmdXml.append("<Length>" + length+ "</Length>\r\n");
      cmdXml.append("<Width>" + width+ "</Width>\r\n");
      cmdXml.append("<MidPointX>" + midpointx+ "</MidPointX>\r\n");
      cmdXml.append("<MidPointY>" + midpointy+ "</MidPointY>\r\n");
      cmdXml.append("<LengthX>" + lengthx+ "</LengthX>\r\n");
      cmdXml.append("<LengthY>" + lengthy+ "</LengthY>\r\n");
      cmdXml.append("</DragZoomIn>\r\n");
      cmder.dragZoomCmd(device, channelId, cmdXml.toString());
      return new ResponseEntity<String>("success", HttpStatus.OK);
   }

   /**
    * 拉框缩小
    * @param deviceId 设备id
    * @param channelId 通道id
    * @param length 播放窗口长度像素值
    * @param width 播放窗口宽度像素值
    * @param midpointx 拉框中心的横轴坐标像素值
    * @param midpointy 拉框中心的纵轴坐标像素值
    * @param lengthx 拉框长度像素值
    * @param lengthy 拉框宽度像素值
    * @return
    */
   @ApiOperation("拉框缩小")
   @ApiImplicitParams({
         @ApiImplicitParam(name = "deviceId", value = "设备ID", required = true, dataTypeClass = String.class),
         @ApiImplicitParam(name = "channelId", value = "通道ID", dataTypeClass = String.class),
         @ApiImplicitParam(name = "length", value = "播放窗口长度像素值", required = true, dataTypeClass = Integer.class),
         @ApiImplicitParam(name = "width", value = "播放窗口宽度像素值", required = true, dataTypeClass = Integer.class),
         @ApiImplicitParam(name = "midpointx", value = "拉框中心的横轴坐标像素值", required = true, dataTypeClass = Integer.class),
         @ApiImplicitParam(name = "midpointy", value = "拉框中心的纵轴坐标像素值", required = true, dataTypeClass = Integer.class),
         @ApiImplicitParam(name = "lengthx", value = "拉框长度像素值", required = true, dataTypeClass = Integer.class),
         @ApiImplicitParam(name = "lengthy", value = "拉框宽度像素值", required = true, dataTypeClass = Integer.class),
   })
   @GetMapping("/drag_zoom/zoom_out")
   public ResponseEntity<String> dragZoomOut(@RequestParam String deviceId,
                                   @RequestParam(required = false) String channelId,
                                   @RequestParam int length,
                                   @RequestParam int width,
                                   @RequestParam int midpointx,
                                   @RequestParam int midpointy,
                                   @RequestParam int lengthx,
                                   @RequestParam int lengthy){

      if (logger.isDebugEnabled()) {
         logger.debug(String.format("设备拉框缩小 API调用，deviceId：%s ，channelId：%s ，length：%d ，width：%d ，midpointx：%d ，midpointy：%d ，lengthx：%d ，lengthy：%d",deviceId, channelId, length, width, midpointx, midpointy,lengthx, lengthy));
      }
      Device device = storager.queryVideoDevice(deviceId);
      StringBuffer cmdXml = new StringBuffer(200);
      cmdXml.append("<DragZoomOut>\r\n");
      cmdXml.append("<Length>" + length+ "</Length>\r\n");
      cmdXml.append("<Width>" + width+ "</Width>\r\n");
      cmdXml.append("<MidPointX>" + midpointx+ "</MidPointX>\r\n");
      cmdXml.append("<MidPointY>" + midpointy+ "</MidPointY>\r\n");
      cmdXml.append("<LengthX>" + lengthx+ "</LengthX>\r\n");
      cmdXml.append("<LengthY>" + lengthy+ "</LengthY>\r\n");
      cmdXml.append("</DragZoomOut>\r\n");
      cmder.dragZoomCmd(device, channelId, cmdXml.toString());
      return new ResponseEntity<String>("success",HttpStatus.OK);
   }
}