From 2e98b20bea4463e4465e3c19059d0744a09aec06 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 27 Jun 2023 14:34:41 +0800
Subject: [PATCH] gb28181版本升级-补充
---
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceControl.java | 273 ++++++++++++++++++++++++++++--------------------------
1 files changed, 140 insertions(+), 133 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 183561a..1b866b9 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,31 +7,34 @@
package com.genersoft.iot.vmp.vmanager.gb28181.device;
-import javax.sip.message.Response;
-
import com.alibaba.fastjson.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.storager.IVideoManagerStorager;
+import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
-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.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.ObjectUtils;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.context.request.async.DeferredResult;
+import javax.sip.InvalidArgumentException;
+import javax.sip.SipException;
+import java.text.ParseException;
import java.util.UUID;
-@Api(tags = "国标设备控制")
+@Tag(name = "国标设备控制")
@CrossOrigin
@RestController
@RequestMapping("/api/device/control")
@@ -40,7 +43,7 @@
private final static Logger logger = LoggerFactory.getLogger(DeviceQuery.class);
@Autowired
- private IVideoManagerStorager storager;
+ private IVideoManagerStorage storager;
@Autowired
private SIPCommander cmder;
@@ -53,26 +56,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());
+ }
}
/**
@@ -82,13 +79,10 @@
* @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（手动录像），StopRecord（停止手动录像）",
- required = true ,dataTypeClass = String.class),
- })
+ @Operation(summary = "录像控制")
+ @Parameter(name = "deviceId", description = "设备国标编号", required = true)
+ @Parameter(name = "channelId", description = "通道国标编号", required = true)
+ @Parameter(name = "recordCmdStr", description = "命令， 可选值：Record（手动录像），StopRecord（停止手动录像）", required = true)
@GetMapping("/record/{deviceId}/{recordCmdStr}")
public DeferredResult<ResponseEntity<String>> recordApi(@PathVariable String deviceId,
@PathVariable String recordCmdStr, String channelId) {
@@ -112,13 +106,18 @@
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);
- });
+ 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);
+ });
+ } catch (InvalidArgumentException | SipException | ParseException e) {
+ logger.error("[命令发送失败] 开始/停止录像: {}", e.getMessage());
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "命令发送失败: " + e.getMessage());
+ }
return result;
}
@@ -129,29 +128,31 @@
* @param deviceId 设备ID
* @param guardCmdStr SetGuard：布防，ResetGuard：撤防
*/
- @ApiOperation("布防/撤防命令")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "deviceId", value = "设备ID", required = true, dataTypeClass = String.class),
- @ApiImplicitParam(name = "channelId", value ="通道编码" ,dataTypeClass = String.class),
- @ApiImplicitParam(name = "guardCmdStr", value ="命令， 可选值：SetGuard（布防），ResetGuard（撤防）", required = true,
- dataTypeClass = String.class)
- })
+ @Operation(summary = "布防/撤防命令")
+ @Parameter(name = "deviceId", description = "设备国标编号", required = true)
+ @Parameter(name = "channelId", description = "通道国标编号", required = true)
+ @Parameter(name = "guardCmdStr", description = "命令， 可选值：SetGuard（布防），ResetGuard（撤防）", required = true)
@GetMapping("/guard/{deviceId}/{guardCmdStr}")
- public DeferredResult<ResponseEntity<String>> guardApi(@PathVariable String deviceId, String channelId, @PathVariable String guardCmdStr) {
+ public DeferredResult<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 -> {
- RequestMessage msg = new RequestMessage();
- 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);
+ 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);
+ });
+ } 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("布防/撤防操作超时, 设备未返回应答指令"));
@@ -173,13 +174,11 @@
* @param alarmMethod 报警方式（可选）
* @param alarmType 报警类型（可选）
*/
- @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),
- })
+ @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, String channelId,
@RequestParam(required = false) String alarmMethod,
@@ -190,14 +189,19 @@
Device device = storager.queryVideoDevice(deviceId);
String uuid = UUID.randomUUID().toString();
String key = DeferredResultHolder.CALLBACK_CMD_DEVICECONTROL + deviceId + channelId;
- 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);
- });
- DeferredResult<ResponseEntity<String>> result = new DeferredResult<ResponseEntity<String>>(3 * 1000L);
+ 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);
+ });
+ } 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
@@ -217,29 +221,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("强制关键帧API调用");
}
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("强制关键帧API调用失败！");
- return new ResponseEntity<String>("强制关键帧API调用失败！", 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;
}
/**
@@ -251,17 +253,14 @@
* @param presetIndex 调用预置位编号（可选）
* @param channelId 通道编码（可选）
*/
- @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),
- @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,
@@ -269,17 +268,22 @@
if (logger.isDebugEnabled()) {
logger.debug("报警复位API调用");
}
- String key = DeferredResultHolder.CALLBACK_CMD_DEVICECONTROL + (StringUtils.isEmpty(channelId) ? deviceId : channelId);
+ 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 -> {
- RequestMessage msg = new RequestMessage();
- 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);
+ 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);
+ });
+ } 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
@@ -309,26 +313,23 @@
* @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),
- })
+ @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 ResponseEntity<String> dragZoomIn(@RequestParam String deviceId,
+ 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){
+ @RequestParam int lengthy) throws RuntimeException {
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));
}
@@ -342,8 +343,12 @@
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);
+ try {
+ cmder.dragZoomCmd(device, channelId, cmdXml.toString());
+ } catch (InvalidArgumentException | SipException | ParseException e) {
+ logger.error("[命令发送失败] 拉框放大: {}", e.getMessage());
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "命令发送失败: " + e.getMessage());
+ }
}
/**
@@ -358,19 +363,17 @@
* @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),
- })
+ @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 ResponseEntity<String> dragZoomOut(@RequestParam String deviceId,
+ public void dragZoomOut(@RequestParam String deviceId,
@RequestParam(required = false) String channelId,
@RequestParam int length,
@RequestParam int width,
@@ -392,7 +395,11 @@
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);
+ 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.9.3