From 42a2772d1aa7493bcc4fac3e24ee8eda4eebc23d Mon Sep 17 00:00:00 2001
From: xubinbin <1323875150@qq.com>
Date: 星期二, 12 十二月 2023 17:09:04 +0800
Subject: [PATCH] bugfix：请求头带token， SecurityUtils 获取用户id 一直为0 #1195
---
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceControl.java | 361 ++++++++++++++++++++++++++++++++++-----------------
1 files changed, 242 insertions(+), 119 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
old mode 100644
new mode 100755
index 874d9a9..bf0acb5
--- 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,31 +7,32 @@
package com.genersoft.iot.vmp.vmanager.gb28181.device;
-import javax.sip.message.Response;
-
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONObject;
+import com.genersoft.iot.vmp.conf.exception.ControllerException;
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 io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
+import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
+import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
-import org.springframework.util.StringUtils;
+import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.context.request.async.DeferredResult;
-@Api(tags = "鍥芥爣璁惧鎺у埗")
-@CrossOrigin
+import javax.sip.InvalidArgumentException;
+import javax.sip.SipException;
+import java.text.ParseException;
+import java.util.UUID;
+
+@Tag(name = "鍥芥爣璁惧鎺у埗")
+
@RestController
@RequestMapping("/api/device/control")
public class DeviceControl {
@@ -39,7 +40,7 @@
private final static Logger logger = LoggerFactory.getLogger(DeviceQuery.class);
@Autowired
- private IVideoManagerStorager storager;
+ private IVideoManagerStorage storager;
@Autowired
private SIPCommander cmder;
@@ -52,26 +53,20 @@
*
* @param deviceId 璁惧ID
*/
- @ApiOperation("杩滅▼鍚姩鎺у埗鍛戒护")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "deviceId", value ="璁惧ID", required = true, dataTypeClass = String.class),
- })
+ @Operation(summary = "杩滅▼鍚姩鎺у埗鍛戒护")
+ @Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
@GetMapping("/teleboot/{deviceId}")
- public ResponseEntity<String> teleBootApi(@PathVariable String deviceId) {
+ public void teleBootApi(@PathVariable String deviceId) {
if (logger.isDebugEnabled()) {
logger.debug("璁惧杩滅▼鍚姩API璋冪敤");
}
Device device = storager.queryVideoDevice(deviceId);
- boolean sucsess = cmder.teleBootCmd(device);
- if (sucsess) {
- JSONObject json = new JSONObject();
- json.put("DeviceID", deviceId);
- json.put("Result", "OK");
- return new ResponseEntity<>(json.toJSONString(), HttpStatus.OK);
- } else {
- logger.warn("璁惧杩滅▼鍚姩API璋冪敤澶辫触锛�");
- return new ResponseEntity<String>("璁惧杩滅▼鍚姩API璋冪敤澶辫触锛�", HttpStatus.INTERNAL_SERVER_ERROR);
- }
+ try {
+ cmder.teleBootCmd(device);
+ } catch (InvalidArgumentException | SipException | ParseException e) {
+ logger.error("[鍛戒护鍙戦�佸け璐 杩滅▼鍚姩: {}", e.getMessage());
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "鍛戒护鍙戦�佸け璐�: " + e.getMessage());
+ }
}
/**
@@ -81,37 +76,46 @@
* @param recordCmdStr Record锛氭墜鍔ㄥ綍鍍忥紝StopRecord锛氬仠姝㈡墜鍔ㄥ綍鍍�
* @param channelId 閫氶亾缂栫爜锛堝彲閫夛級
*/
- @ApiOperation("褰曞儚鎺у埗鍛戒护")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "deviceId", value ="璁惧ID", required = true, dataTypeClass = String.class),
- @ApiImplicitParam(name = "channelId", value ="閫氶亾缂栫爜" ,dataTypeClass = String.class),
- @ApiImplicitParam(name = "recordCmdStr", value ="鍛戒护锛� 鍙�夊�硷細Record锛堟墜鍔ㄥ綍鍍忥級锛孲topRecord锛堝仠姝㈡墜鍔ㄥ綍鍍忥級",
- required = true ,dataTypeClass = String.class),
- })
+ @Operation(summary = "褰曞儚鎺у埗")
+ @Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
+ @Parameter(name = "channelId", description = "閫氶亾鍥芥爣缂栧彿", required = true)
+ @Parameter(name = "recordCmdStr", description = "鍛戒护锛� 鍙�夊�硷細Record锛堟墜鍔ㄥ綍鍍忥級锛孲topRecord锛堝仠姝㈡墜鍔ㄥ綍鍍忥級", required = true)
@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);
+ try {
+ 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);
+ },null);
+ } catch (InvalidArgumentException | SipException | ParseException e) {
+ logger.error("[鍛戒护鍙戦�佸け璐 寮�濮�/鍋滄褰曞儚: {}", e.getMessage());
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "鍛戒护鍙戦�佸け璐�: " + e.getMessage());
+ }
+
return result;
}
@@ -121,35 +125,41 @@
* @param deviceId 璁惧ID
* @param guardCmdStr SetGuard锛氬竷闃诧紝ResetGuard锛氭挙闃�
*/
- @ApiOperation("甯冮槻/鎾ら槻鍛戒护")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "deviceId", value = "璁惧ID", required = true, dataTypeClass = String.class),
- @ApiImplicitParam(name = "guardCmdStr", value ="鍛戒护锛� 鍙�夊�硷細SetGuard锛堝竷闃诧級锛孯esetGuard锛堟挙闃诧級", required = true,
- dataTypeClass = String.class)
- })
+ @Operation(summary = "甯冮槻/鎾ら槻鍛戒护")
+ @Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
+ @Parameter(name = "guardCmdStr", description = "鍛戒护锛� 鍙�夊�硷細SetGuard锛堝竷闃诧級锛孯esetGuard锛堟挙闃诧級", required = true)
@GetMapping("/guard/{deviceId}/{guardCmdStr}")
- public DeferredResult<ResponseEntity<String>> guardApi(@PathVariable String deviceId, @PathVariable String guardCmdStr) {
+ public DeferredResult<String> guardApi(@PathVariable String deviceId, @PathVariable String guardCmdStr) {
if (logger.isDebugEnabled()) {
logger.debug("甯冮槻/鎾ら槻API璋冪敤");
}
Device device = storager.queryVideoDevice(deviceId);
- 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()));
- resultHolder.invokeResult(msg);
- });
- DeferredResult<ResponseEntity<String>> result = new DeferredResult<ResponseEntity<String>>(3 * 1000L);
+ String key = DeferredResultHolder.CALLBACK_CMD_DEVICECONTROL + deviceId + deviceId;
+ String uuid =UUID.randomUUID().toString();
+ try {
+ cmder.guardCmd(device, guardCmdStr, event -> {
+ RequestMessage msg = new RequestMessage();
+ msg.setId(uuid);
+ msg.setKey(key);
+ msg.setData(String.format("甯冮槻/鎾ら槻鎿嶄綔澶辫触锛岄敊璇爜锛� %s, %s", event.statusCode, event.msg));
+ resultHolder.invokeResult(msg);
+ },null);
+ } catch (InvalidArgumentException | SipException | ParseException e) {
+ logger.error("[鍛戒护鍙戦�佸け璐 甯冮槻/鎾ら槻鎿嶄綔: {}", e.getMessage());
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "鍛戒护鍙戦��: " + e.getMessage());
+ }
+ DeferredResult<String> result = new DeferredResult<>(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;
}
@@ -160,37 +170,44 @@
* @param alarmMethod 鎶ヨ鏂瑰紡锛堝彲閫夛級
* @param alarmType 鎶ヨ绫诲瀷锛堝彲閫夛級
*/
- @ApiOperation("鎶ヨ澶嶄綅")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "deviceId", value = "璁惧ID", required = true, dataTypeClass = String.class),
- @ApiImplicitParam(name = "alarmMethod", value ="鎶ヨ鏂瑰紡", dataTypeClass = String.class),
- @ApiImplicitParam(name = "alarmType", value ="鎶ヨ绫诲瀷", dataTypeClass = String.class),
- })
+ @Operation(summary = "鎶ヨ澶嶄綅")
+ @Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
+ @Parameter(name = "channelId", description = "閫氶亾鍥芥爣缂栧彿", required = true)
+ @Parameter(name = "alarmMethod", description = "鎶ヨ鏂瑰紡")
+ @Parameter(name = "alarmType", description = "鎶ヨ绫诲瀷")
@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);
- 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()));
- 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;
+ try {
+ cmder.alarmCmd(device, alarmMethod, alarmType, event -> {
+ RequestMessage msg = new RequestMessage();
+ msg.setId(uuid);
+ msg.setKey(key);
+ msg.setData(String.format("鎶ヨ澶嶄綅鎿嶄綔澶辫触锛岄敊璇爜锛� %s, %s", event.statusCode, event.msg));
+ resultHolder.invokeResult(msg);
+ },null);
+ } catch (InvalidArgumentException | SipException | ParseException e) {
+ logger.error("[鍛戒护鍙戦�佸け璐 鎶ヨ澶嶄綅: {}", e.getMessage());
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "鍛戒护鍙戦�佸け璐�: " + e.getMessage());
+ }
+ 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 + 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;
}
@@ -200,29 +217,27 @@
* @param deviceId 璁惧ID
* @param channelId 閫氶亾ID
*/
- @ApiOperation("寮哄埗鍏抽敭甯�")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "deviceId", value = "璁惧ID", required = true, dataTypeClass = String.class),
- @ApiImplicitParam(name = "channelId", value ="閫氶亾ID", required = true, dataTypeClass = String.class),
- })
+ @Operation(summary = "寮哄埗鍏抽敭甯�")
+ @Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
+ @Parameter(name = "channelId", description = "閫氶亾鍥芥爣缂栧彿")
@GetMapping("/i_frame/{deviceId}")
- public ResponseEntity<String> iFrame(@PathVariable String deviceId,
+ public JSONObject iFrame(@PathVariable String deviceId,
@RequestParam(required = false) String channelId) {
if (logger.isDebugEnabled()) {
logger.debug("寮哄埗鍏抽敭甯PI璋冪敤");
}
Device device = storager.queryVideoDevice(deviceId);
- boolean sucsess = cmder.iFrameCmd(device, channelId);
- if (sucsess) {
- JSONObject json = new JSONObject();
- json.put("DeviceID", deviceId);
- json.put("ChannelID", channelId);
- json.put("Result", "OK");
- return new ResponseEntity<>(json.toJSONString(), HttpStatus.OK);
- } else {
- logger.warn("寮哄埗鍏抽敭甯PI璋冪敤澶辫触锛�");
- return new ResponseEntity<String>("寮哄埗鍏抽敭甯PI璋冪敤澶辫触锛�", HttpStatus.INTERNAL_SERVER_ERROR);
+ try {
+ cmder.iFrameCmd(device, channelId);
+ } catch (InvalidArgumentException | SipException | ParseException e) {
+ logger.error("[鍛戒护鍙戦�佸け璐 寮哄埗鍏抽敭甯�: {}", e.getMessage());
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "鍛戒护鍙戦�佸け璐�: " + e.getMessage());
}
+ JSONObject json = new JSONObject();
+ json.put("DeviceID", deviceId);
+ json.put("ChannelID", channelId);
+ json.put("Result", "OK");
+ return json;
}
/**
@@ -234,37 +249,43 @@
* @param presetIndex 璋冪敤棰勭疆浣嶇紪鍙凤紙鍙�夛級
* @param channelId 閫氶亾缂栫爜锛堝彲閫夛級
*/
- @ApiOperation("鐪嬪畧浣嶆帶鍒�")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "deviceId", value = "璁惧ID", required = true, 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),
- @ApiImplicitParam(name = "channelId", value ="閫氶亾ID", dataTypeClass = String.class),
- })
+ @Operation(summary = "鐪嬪畧浣嶆帶鍒�")
+ @Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
+ @Parameter(name = "channelId", description = "閫氶亾鍥芥爣缂栧彿", required = true)
+ @Parameter(name = "enabled", description = "鏄惁寮�鍚湅瀹堜綅 1:寮�鍚�,0:鍏抽棴", required = true)
+ @Parameter(name = "presetIndex", description = "璋冪敤棰勭疆浣嶇紪鍙�")
+ @Parameter(name = "resetTime", description = "鑷姩褰掍綅鏃堕棿闂撮殧")
@GetMapping("/home_position/{deviceId}/{enabled}")
- public DeferredResult<ResponseEntity<String>> homePositionApi(@PathVariable String deviceId,
+ public DeferredResult<String> homePositionApi(@PathVariable String deviceId,
@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 + (ObjectUtils.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()));
- resultHolder.invokeResult(msg);
- });
- DeferredResult<ResponseEntity<String>> result = new DeferredResult<ResponseEntity<String>>(3 * 1000L);
+ try {
+ cmder.homePositionCmd(device, channelId, enabled, resetTime, presetIndex, event -> {
+ RequestMessage msg = new RequestMessage();
+ msg.setId(uuid);
+ msg.setKey(key);
+ msg.setData(String.format("鐪嬪畧浣嶆帶鍒舵搷浣滃け璐ワ紝閿欒鐮侊細 %s, %s", event.statusCode, event.msg));
+ resultHolder.invokeResult(msg);
+ },null);
+ } catch (InvalidArgumentException | SipException | ParseException e) {
+ logger.error("[鍛戒护鍙戦�佸け璐 鐪嬪畧浣嶆帶鍒�: {}", e.getMessage());
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "鍛戒护鍙戦�佸け璐�: " + e.getMessage());
+ }
+ DeferredResult<String> result = new DeferredResult<>(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.setId(uuid);
+ msg.setKey(key);
JSONObject json = new JSONObject();
json.put("DeviceID", deviceId);
json.put("Status", "Timeout");
@@ -272,7 +293,109 @@
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
+ */
+ @Operation(summary = "鎷夋鏀惧ぇ")
+ @Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
+ @Parameter(name = "channelId", description = "閫氶亾鍥芥爣缂栧彿", required = true)
+ @Parameter(name = "length", description = "鎾斁绐楀彛闀垮害鍍忕礌鍊�", required = true)
+ @Parameter(name = "midpointx", description = "鎷夋涓績鐨勬í杞村潗鏍囧儚绱犲��", required = true)
+ @Parameter(name = "midpointy", description = "鎷夋涓績鐨勭旱杞村潗鏍囧儚绱犲��", required = true)
+ @Parameter(name = "lengthx", description = "鎷夋闀垮害鍍忕礌鍊�", required = true)
+ @Parameter(name = "lengthy", description = "lengthy", required = true)
+ @GetMapping("drag_zoom/zoom_in")
+ public void 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) throws RuntimeException {
+ 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");
+ try {
+ cmder.dragZoomCmd(device, channelId, cmdXml.toString());
+ } catch (InvalidArgumentException | SipException | ParseException e) {
+ logger.error("[鍛戒护鍙戦�佸け璐 鎷夋鏀惧ぇ: {}", e.getMessage());
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "鍛戒护鍙戦�佸け璐�: " + e.getMessage());
+ }
+ }
+
+ /**
+ * 鎷夋缂╁皬
+ * @param deviceId 璁惧id
+ * @param channelId 閫氶亾id
+ * @param length 鎾斁绐楀彛闀垮害鍍忕礌鍊�
+ * @param width 鎾斁绐楀彛瀹藉害鍍忕礌鍊�
+ * @param midpointx 鎷夋涓績鐨勬í杞村潗鏍囧儚绱犲��
+ * @param midpointy 鎷夋涓績鐨勭旱杞村潗鏍囧儚绱犲��
+ * @param lengthx 鎷夋闀垮害鍍忕礌鍊�
+ * @param lengthy 鎷夋瀹藉害鍍忕礌鍊�
+ * @return
+ */
+ @Operation(summary = "鎷夋鏀惧ぇ")
+ @Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
+ @Parameter(name = "channelId", description = "閫氶亾鍥芥爣缂栧彿")
+ @Parameter(name = "length", description = "鎾斁绐楀彛闀垮害鍍忕礌鍊�", required = true)
+ @Parameter(name = "width", description = "鎷夋涓績鐨勬í杞村潗鏍囧儚绱犲��", required = true)
+ @Parameter(name = "midpointx", description = "鎷夋涓績鐨勬í杞村潗鏍囧儚绱犲��", required = true)
+ @Parameter(name = "midpointy", description = "鎷夋涓績鐨勭旱杞村潗鏍囧儚绱犲��", required = true)
+ @Parameter(name = "lengthx", description = "鎷夋闀垮害鍍忕礌鍊�", required = true)
+ @Parameter(name = "lengthy", description = "鎷夋瀹藉害鍍忕礌鍊�", required = true)
+ @GetMapping("/drag_zoom/zoom_out")
+ public void 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");
+ try {
+ cmder.dragZoomCmd(device, channelId, cmdXml.toString());
+ } catch (InvalidArgumentException | SipException | ParseException e) {
+ logger.error("[鍛戒护鍙戦�佸け璐 鎷夋缂╁皬: {}", e.getMessage());
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "鍛戒护鍙戦�佸け璐�: " + e.getMessage());
+ }
+ }
}
--
Gitblit v1.8.0