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 | 188 ++++++++++++++++++++++++++++++++++++++--------
1 files changed, 153 insertions(+), 35 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 874d9a9..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,15 +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.gb28181.utils.XmlUtil;
-import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
+import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -30,6 +27,8 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.web.context.request.async.DeferredResult;
+import java.util.UUID;
+
@Api(tags = "鍥芥爣璁惧鎺у埗")
@CrossOrigin
@RestController
@@ -39,7 +38,7 @@
private final static Logger logger = LoggerFactory.getLogger(DeviceQuery.class);
@Autowired
- private IVideoManagerStorager storager;
+ private IVideoManagerStorage storager;
@Autowired
private SIPCommander cmder;
@@ -90,28 +89,35 @@
})
@GetMapping("/record/{deviceId}/{recordCmdStr}")
public DeferredResult<ResponseEntity<String>> recordApi(@PathVariable String deviceId,
- @PathVariable String recordCmdStr, @RequestParam(required = false) String channelId) {
+ @PathVariable String recordCmdStr, String channelId) {
if (logger.isDebugEnabled()) {
logger.debug("寮�濮�/鍋滄褰曞儚API璋冪敤");
}
Device device = storager.queryVideoDevice(deviceId);
- cmder.recordCmd(device, channelId, recordCmdStr, event -> {
- Response response = event.getResponse();
- RequestMessage msg = new RequestMessage();
- msg.setId(DeferredResultHolder.CALLBACK_CMD_DEVICECONTROL + (StringUtils.isEmpty(channelId) ? deviceId : channelId));
- msg.setData(String.format("寮�濮�/鍋滄褰曞儚鎿嶄綔澶辫触锛岄敊璇爜锛� %s, %s", response.getStatusCode(), response.getReasonPhrase()));
- resultHolder.invokeResult(msg);
- });
- DeferredResult<ResponseEntity<String>> result = new DeferredResult<ResponseEntity<String>>(3 * 1000L);
+ String uuid = UUID.randomUUID().toString();
+ String key = DeferredResultHolder.CALLBACK_CMD_DEVICECONTROL + deviceId + channelId;
+ DeferredResult<ResponseEntity<String>> result = new DeferredResult<ResponseEntity<String>>(3 * 1000L);
result.onTimeout(() -> {
logger.warn(String.format("寮�濮�/鍋滄褰曞儚鎿嶄綔瓒呮椂, 璁惧鏈繑鍥炲簲绛旀寚浠�"));
// 閲婃斁rtpserver
RequestMessage msg = new RequestMessage();
- msg.setId(DeferredResultHolder.CALLBACK_CMD_DEVICECONTROL + (StringUtils.isEmpty(channelId) ? deviceId : channelId));
+ msg.setKey(key);
+ msg.setId(uuid);
msg.setData("Timeout. Device did not response to this command.");
- resultHolder.invokeResult(msg);
+ resultHolder.invokeAllResult(msg);
});
- resultHolder.put(DeferredResultHolder.CALLBACK_CMD_DEVICECONTROL + (StringUtils.isEmpty(channelId) ? deviceId : channelId), result);
+ if (resultHolder.exist(key, null)){
+ return result;
+ }
+ resultHolder.put(key, uuid, result);
+ cmder.recordCmd(device, channelId, recordCmdStr, event -> {
+ RequestMessage msg = new RequestMessage();
+ msg.setId(uuid);
+ msg.setKey(key);
+ msg.setData(String.format("寮�濮�/鍋滄褰曞儚鎿嶄綔澶辫触锛岄敊璇爜锛� %s, %s", event.statusCode, event.msg));
+ resultHolder.invokeAllResult(msg);
+ });
+
return result;
}
@@ -124,32 +130,37 @@
@ApiOperation("甯冮槻/鎾ら槻鍛戒护")
@ApiImplicitParams({
@ApiImplicitParam(name = "deviceId", value = "璁惧ID", required = true, dataTypeClass = String.class),
+ @ApiImplicitParam(name = "channelId", value ="閫氶亾缂栫爜" ,dataTypeClass = String.class),
@ApiImplicitParam(name = "guardCmdStr", value ="鍛戒护锛� 鍙�夊�硷細SetGuard锛堝竷闃诧級锛孯esetGuard锛堟挙闃诧級", required = true,
dataTypeClass = String.class)
})
@GetMapping("/guard/{deviceId}/{guardCmdStr}")
- public DeferredResult<ResponseEntity<String>> guardApi(@PathVariable String deviceId, @PathVariable String guardCmdStr) {
+ public DeferredResult<ResponseEntity<String>> guardApi(@PathVariable String deviceId, String channelId, @PathVariable String guardCmdStr) {
if (logger.isDebugEnabled()) {
logger.debug("甯冮槻/鎾ら槻API璋冪敤");
}
Device device = storager.queryVideoDevice(deviceId);
+ 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(DeferredResultHolder.CALLBACK_CMD_DEVICECONTROL + deviceId);
- msg.setData(String.format("甯冮槻/鎾ら槻鎿嶄綔澶辫触锛岄敊璇爜锛� %s, %s", response.getStatusCode(), response.getReasonPhrase()));
+ msg.setId(uuid);
+ msg.setKey(key);
+ msg.setData(String.format("甯冮槻/鎾ら槻鎿嶄綔澶辫触锛岄敊璇爜锛� %s, %s", event.statusCode, event.msg));
resultHolder.invokeResult(msg);
});
DeferredResult<ResponseEntity<String>> result = new DeferredResult<ResponseEntity<String>>(3 * 1000L);
+ resultHolder.put(key, uuid, result);
result.onTimeout(() -> {
logger.warn(String.format("甯冮槻/鎾ら槻鎿嶄綔瓒呮椂, 璁惧鏈繑鍥炲簲绛旀寚浠�"));
// 閲婃斁rtpserver
RequestMessage msg = new RequestMessage();
- msg.setId(DeferredResultHolder.CALLBACK_CMD_DEVICECONTROL + deviceId);
+ msg.setKey(key);
+ msg.setId(uuid);
msg.setData("Timeout. Device did not response to this command.");
resultHolder.invokeResult(msg);
});
- resultHolder.put(DeferredResultHolder.CALLBACK_CMD_DEVICECONTROL + deviceId, result);
+
return result;
}
@@ -163,22 +174,25 @@
@ApiOperation("鎶ヨ澶嶄綅")
@ApiImplicitParams({
@ApiImplicitParam(name = "deviceId", value = "璁惧ID", required = true, dataTypeClass = String.class),
+ @ApiImplicitParam(name = "channelId", value ="閫氶亾缂栫爜" ,dataTypeClass = String.class),
@ApiImplicitParam(name = "alarmMethod", value ="鎶ヨ鏂瑰紡", dataTypeClass = String.class),
@ApiImplicitParam(name = "alarmType", value ="鎶ヨ绫诲瀷", dataTypeClass = String.class),
})
@GetMapping("/reset_alarm/{deviceId}")
- public DeferredResult<ResponseEntity<String>> resetAlarmApi(@PathVariable String deviceId,
+ public DeferredResult<ResponseEntity<String>> resetAlarmApi(@PathVariable String deviceId, String channelId,
@RequestParam(required = false) String alarmMethod,
@RequestParam(required = false) String alarmType) {
if (logger.isDebugEnabled()) {
logger.debug("鎶ヨ澶嶄綅API璋冪敤");
}
Device device = storager.queryVideoDevice(deviceId);
+ 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(DeferredResultHolder.CALLBACK_CMD_DEVICECONTROL + deviceId);
- msg.setData(String.format("鎶ヨ澶嶄綅鎿嶄綔澶辫触锛岄敊璇爜锛� %s, %s", response.getStatusCode(), response.getReasonPhrase()));
+ msg.setId(uuid);
+ msg.setKey(key);
+ msg.setData(String.format("鎶ヨ澶嶄綅鎿嶄綔澶辫触锛岄敊璇爜锛� %s, %s", event.statusCode, event.msg));
resultHolder.invokeResult(msg);
});
DeferredResult<ResponseEntity<String>> result = new DeferredResult<ResponseEntity<String>>(3 * 1000L);
@@ -186,11 +200,12 @@
logger.warn(String.format("鎶ヨ澶嶄綅鎿嶄綔瓒呮椂, 璁惧鏈繑鍥炲簲绛旀寚浠�"));
// 閲婃斁rtpserver
RequestMessage msg = new RequestMessage();
- msg.setId(DeferredResultHolder.CALLBACK_CMD_DEVICECONTROL + deviceId);
+ msg.setId(uuid);
+ msg.setKey(key);
msg.setData("Timeout. Device did not response to this command.");
resultHolder.invokeResult(msg);
});
- resultHolder.put(DeferredResultHolder.CALLBACK_CMD_DEVICECONTROL + deviceId, result);
+ resultHolder.put(key, uuid, result);
return result;
}
@@ -237,6 +252,7 @@
@ApiOperation("鐪嬪畧浣嶆帶鍒�")
@ApiImplicitParams({
@ApiImplicitParam(name = "deviceId", value = "璁惧ID", required = true, dataTypeClass = String.class),
+ @ApiImplicitParam(name = "channelId", value ="閫氶亾缂栫爜" ,dataTypeClass = String.class),
@ApiImplicitParam(name = "enabled", value = "鏄惁寮�鍚湅瀹堜綅 1:寮�鍚�,0:鍏抽棴", required = true, dataTypeClass = String.class),
@ApiImplicitParam(name = "resetTime", value = "鑷姩褰掍綅鏃堕棿闂撮殧", dataTypeClass = String.class),
@ApiImplicitParam(name = "presetIndex", value = "璋冪敤棰勭疆浣嶇紪鍙�", dataTypeClass = String.class),
@@ -247,16 +263,18 @@
@PathVariable String enabled,
@RequestParam(required = false) String resetTime,
@RequestParam(required = false) String presetIndex,
- @RequestParam(required = false) String channelId) {
+ String channelId) {
if (logger.isDebugEnabled()) {
logger.debug("鎶ヨ澶嶄綅API璋冪敤");
}
+ String key = DeferredResultHolder.CALLBACK_CMD_DEVICECONTROL + (StringUtils.isEmpty(channelId) ? deviceId : channelId);
+ 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(DeferredResultHolder.CALLBACK_CMD_DEVICECONTROL + (StringUtils.isEmpty(channelId) ? deviceId : channelId));
- msg.setData(String.format("鐪嬪畧浣嶆帶鍒舵搷浣滃け璐ワ紝閿欒鐮侊細 %s, %s", response.getStatusCode(), response.getReasonPhrase()));
+ msg.setId(uuid);
+ msg.setKey(key);
+ msg.setData(String.format("鐪嬪畧浣嶆帶鍒舵搷浣滃け璐ワ紝閿欒鐮侊細 %s, %s", event.statusCode, event.msg));
resultHolder.invokeResult(msg);
});
DeferredResult<ResponseEntity<String>> result = new DeferredResult<ResponseEntity<String>>(3 * 1000L);
@@ -264,7 +282,8 @@
logger.warn(String.format("鐪嬪畧浣嶆帶鍒舵搷浣滆秴鏃�, 璁惧鏈繑鍥炲簲绛旀寚浠�"));
// 閲婃斁rtpserver
RequestMessage msg = new RequestMessage();
- msg.setId(DeferredResultHolder.CALLBACK_CMD_DEVICECONTROL + (StringUtils.isEmpty(channelId) ? deviceId : channelId));
+ msg.setId(uuid);
+ msg.setKey(key);
JSONObject json = new JSONObject();
json.put("DeviceID", deviceId);
json.put("Status", "Timeout");
@@ -272,7 +291,106 @@
msg.setData(json); //("鐪嬪畧浣嶆帶鍒舵搷浣滆秴鏃�, 璁惧鏈繑鍥炲簲绛旀寚浠�");
resultHolder.invokeResult(msg);
});
- resultHolder.put(DeferredResultHolder.CALLBACK_CMD_DEVICECONTROL + (StringUtils.isEmpty(channelId) ? deviceId : channelId), result);
+ 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