From 5e4a673ecc95d6fb06aec6c5e2f3ec4ffb72584b Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 01 八月 2022 14:33:51 +0800
Subject: [PATCH] 修复视频播放点击音量报错 #557，修复编解码信息获取失败
---
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceControl.java | 105 ++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 101 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceControl.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceControl.java
index 20aa957..4db11e3 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceControl.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceControl.java
@@ -7,14 +7,12 @@
package com.genersoft.iot.vmp.vmanager.gb28181.device;
-import javax.sip.message.Response;
-
import com.alibaba.fastjson.JSONObject;
import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
-import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
+import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -40,7 +38,7 @@
private final static Logger logger = LoggerFactory.getLogger(DeviceQuery.class);
@Autowired
- private IVideoManagerStorager storager;
+ private IVideoManagerStorage storager;
@Autowired
private SIPCommander cmder;
@@ -296,4 +294,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璋冪敤锛宒eviceId锛�%s 锛宑hannelId锛�%s 锛宭ength锛�%d 锛寃idth锛�%d 锛宮idpointx锛�%d 锛宮idpointy锛�%d 锛宭engthx锛�%d 锛宭engthy锛�%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璋冪敤锛宒eviceId锛�%s 锛宑hannelId锛�%s 锛宭ength锛�%d 锛寃idth锛�%d 锛宮idpointx锛�%d 锛宮idpointy锛�%d 锛宭engthx锛�%d 锛宭engthy锛�%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);
+ }
}
--
Gitblit v1.8.0