From c5ddf5985892f052263240a02e21215027e6ee05 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 19 一月 2022 17:40:03 +0800
Subject: [PATCH] 修改readme
---
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceControl.java | 113 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 104 insertions(+), 9 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 3b34c7d..183561a 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
@@ -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璋冪敤锛宒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