From f1d079f9c0b3d384090477ca54e0548373d62b57 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 16 Jan 2025 11:56:39 +0800
Subject: [PATCH] 配置修改
---
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/record/GBRecordController.java | 138 ++++++++++++++++++++++++++++++++++++++-------
1 files changed, 116 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/record/GBRecordController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/record/GBRecordController.java
index e565981..6625ba4 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/record/GBRecordController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/record/GBRecordController.java
@@ -1,14 +1,21 @@
package com.genersoft.iot.vmp.vmanager.gb28181.record;
+import com.genersoft.iot.vmp.common.StreamInfo;
+import com.genersoft.iot.vmp.conf.exception.ControllerException;
+import com.genersoft.iot.vmp.conf.exception.SsrcTransactionNotFoundException;
import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage;
-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.service.IDeviceService;
+import com.genersoft.iot.vmp.service.IPlayService;
+import com.genersoft.iot.vmp.utils.DateUtil;
+import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
+import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
+
+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.ResponseEntity;
import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
@@ -20,11 +27,14 @@
import com.genersoft.iot.vmp.gb28181.bean.RecordInfo;
import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
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 javax.sip.InvalidArgumentException;
+import javax.sip.SipException;
+import java.text.ParseException;
import java.util.UUID;
-@Api(tags = "国标录像")
+@Tag(name = "国标录像")
@CrossOrigin
@RestController
@RequestMapping("/api/gb_record")
@@ -36,45 +46,129 @@
private SIPCommander cmder;
@Autowired
- private IVideoManagerStorager storager;
+ private IVideoManagerStorage storager;
@Autowired
private DeferredResultHolder resultHolder;
- @ApiOperation("录像查询")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "deviceId", value = "设备ID", dataTypeClass = String.class),
- @ApiImplicitParam(name = "channelId", value = "通道ID", dataTypeClass = String.class),
- @ApiImplicitParam(name = "startTime", value = "开始时间", dataTypeClass = String.class),
- @ApiImplicitParam(name = "endTime", value = "结束时间", dataTypeClass = String.class),
- })
+ @Autowired
+ private IPlayService playService;
+
+ @Autowired
+ private IDeviceService deviceService;
+
+
+
+
+ @Operation(summary = "录像查询")
+ @Parameter(name = "deviceId", description = "设备国标编号", required = true)
+ @Parameter(name = "channelId", description = "通道国标编号", required = true)
+ @Parameter(name = "startTime", description = "开始时间", required = true)
+ @Parameter(name = "endTime", description = "结束时间", required = true)
@GetMapping("/query/{deviceId}/{channelId}")
- public DeferredResult<ResponseEntity<RecordInfo>> recordinfo(@PathVariable String deviceId,@PathVariable String channelId, String startTime, String endTime){
+ public DeferredResult<WVPResult<RecordInfo>> recordinfo(@PathVariable String deviceId, @PathVariable String channelId, String startTime, String endTime){
if (logger.isDebugEnabled()) {
- logger.debug(String.format("录像信息查询 API调用，deviceId：%s ，startTime：%s， startTime：%s",deviceId, startTime, endTime));
+ logger.debug(String.format("录像信息查询 API调用，deviceId：%s ，startTime：%s， endTime：%s",deviceId, startTime, endTime));
+ }
+ DeferredResult<WVPResult<RecordInfo>> result = new DeferredResult<>();
+ if (!DateUtil.verification(startTime, DateUtil.formatter)){
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "startTime error, format is " + DateUtil.PATTERN);
+ }
+ if (!DateUtil.verification(endTime, DateUtil.formatter)){
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "endTime error, format is " + DateUtil.PATTERN);
}
Device device = storager.queryVideoDevice(deviceId);
// 指定超时时间 1分钟30秒
- DeferredResult<ResponseEntity<RecordInfo>> result = new DeferredResult<>(90*1000L);
String uuid = UUID.randomUUID().toString();
int sn = (int)((Math.random()*9+1)*100000);
String key = DeferredResultHolder.CALLBACK_CMD_RECORDINFO + deviceId + sn;
RequestMessage msg = new RequestMessage();
msg.setId(uuid);
msg.setKey(key);
- cmder.recordInfoQuery(device, channelId, startTime, endTime, sn, null, null, null, (eventResult -> {
- msg.setData("查询录像失败, status: " + eventResult.statusCode + ", message: " + eventResult.msg );
- resultHolder.invokeResult(msg);
- }));
+ try {
+ cmder.recordInfoQuery(device, channelId, startTime, endTime, sn, null, null, null, (eventResult -> {
+ WVPResult<RecordInfo> wvpResult = new WVPResult<>();
+ wvpResult.setCode(ErrorCode.ERROR100.getCode());
+ wvpResult.setMsg("查询录像失败, status: " + eventResult.statusCode + ", message: " + eventResult.msg);
+ msg.setData(wvpResult);
+ resultHolder.invokeResult(msg);
+ }));
+ } catch (InvalidArgumentException | SipException | ParseException e) {
+ logger.error("[命令发送失败] 查询录像: {}", e.getMessage());
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "命令发送失败: " + e.getMessage());
+ }
// 录像查询以channelId作为deviceId查询
resultHolder.put(key, uuid, result);
result.onTimeout(()->{
msg.setData("timeout");
+ WVPResult<RecordInfo> wvpResult = new WVPResult<>();
+ wvpResult.setCode(ErrorCode.ERROR100.getCode());
+ wvpResult.setMsg("timeout");
+ msg.setData(wvpResult);
resultHolder.invokeResult(msg);
});
return result;
}
+
+
+ @Operation(summary = "开始历史媒体下载")
+ @Parameter(name = "deviceId", description = "设备国标编号", required = true)
+ @Parameter(name = "channelId", description = "通道国标编号", required = true)
+ @Parameter(name = "startTime", description = "开始时间", required = true)
+ @Parameter(name = "endTime", description = "结束时间", required = true)
+ @Parameter(name = "downloadSpeed", description = "下载倍速", required = true)
+ @GetMapping("/download/start/{deviceId}/{channelId}")
+ public DeferredResult<WVPResult<StreamInfo>> download(@PathVariable String deviceId, @PathVariable String channelId,
+ String startTime, String endTime, String downloadSpeed) {
+
+ if (logger.isDebugEnabled()) {
+ logger.debug(String.format("历史媒体下载 API调用，deviceId：%s，channelId：%s，downloadSpeed：%s", deviceId, channelId, downloadSpeed));
+ }
+
+ DeferredResult<WVPResult<StreamInfo>> result = playService.download(deviceId, channelId, startTime, endTime, Integer.parseInt(downloadSpeed), null, hookCallBack->{
+ resultHolder.invokeResult(hookCallBack.getData());
+ });
+
+ return result;
+ }
+
+ @Operation(summary = "停止历史媒体下载")
+ @Parameter(name = "deviceId", description = "设备国标编号", required = true)
+ @Parameter(name = "channelId", description = "通道国标编号", required = true)
+ @Parameter(name = "stream", description = "流ID", required = true)
+ @GetMapping("/download/stop/{deviceId}/{channelId}/{stream}")
+ public void playStop(@PathVariable String deviceId, @PathVariable String channelId, @PathVariable String stream) {
+
+ if (logger.isDebugEnabled()) {
+ logger.debug(String.format("设备历史媒体下载停止 API调用，deviceId/channelId：%s_%s", deviceId, channelId));
+ }
+
+ if (deviceId == null || channelId == null) {
+ throw new ControllerException(ErrorCode.ERROR400);
+ }
+
+ Device device = deviceService.getDevice(deviceId);
+ if (device == null) {
+ throw new ControllerException(ErrorCode.ERROR400.getCode(), "设备：" + deviceId + "未找到");
+ }
+
+ try {
+ cmder.streamByeCmd(device, channelId, stream, null);
+ } catch (InvalidArgumentException | ParseException | SipException | SsrcTransactionNotFoundException e) {
+ logger.error("[停止历史媒体下载]停止历史媒体下载，发送BYE失败 {}", e.getMessage());
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), e.getMessage());
+ }
+ }
+
+ @Operation(summary = "获取历史媒体下载进度")
+ @Parameter(name = "deviceId", description = "设备国标编号", required = true)
+ @Parameter(name = "channelId", description = "通道国标编号", required = true)
+ @Parameter(name = "stream", description = "流ID", required = true)
+ @GetMapping("/download/progress/{deviceId}/{channelId}/{stream}")
+ public StreamInfo getProgress(@PathVariable String deviceId, @PathVariable String channelId, @PathVariable String stream) {
+ return playService.getDownLoadInfo(deviceId, channelId, stream);
+ }
}
--
Gitblit v1.9.3