From 7462e2776bc064748c6ddfd9dd53d07b498e1a42 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 15 九月 2022 10:49:31 +0800
Subject: [PATCH] Merge pull request #608 from wenyanjun/wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/record/GBRecordController.java | 114 +++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 94 insertions(+), 20 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 5b33826..755b37b 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,13 +1,22 @@
package com.genersoft.iot.vmp.vmanager.gb28181.record;
+import com.alibaba.fastjson.JSONObject;
+import com.genersoft.iot.vmp.common.StreamInfo;
+import com.genersoft.iot.vmp.conf.exception.ControllerException;
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.IMediaServerService;
+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.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.GetMapping;
@@ -20,11 +29,12 @@
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 java.time.LocalDate;
import java.util.UUID;
-@Api(tags = "鍥芥爣褰曞儚")
+@Tag(name = "鍥芥爣褰曞儚")
@CrossOrigin
@RestController
@RequestMapping("/api/gb_record")
@@ -36,35 +46,46 @@
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;
+
+ @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璋冪敤锛宒eviceId锛�%s 锛宻tartTime锛�%s锛� startTime锛�%s",deviceId, startTime, endTime));
+ logger.debug(String.format("褰曞儚淇℃伅鏌ヨ API璋冪敤锛宒eviceId锛�%s 锛宻tartTime锛�%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();
- String key = DeferredResultHolder.CALLBACK_CMD_RECORDINFO + deviceId + channelId;
+ 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, (eventResult -> {
- msg.setData("鏌ヨ褰曞儚澶辫触, status: " + eventResult.statusCode + ", message: " + eventResult.msg );
+ 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);
}));
@@ -72,8 +93,61 @@
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璋冪敤锛宒eviceId锛�%s锛宑hannelId锛�%s锛宒ownloadSpeed锛�%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 = "娴両D", required = true)
+ @GetMapping("/download/stop/{deviceId}/{channelId}/{stream}")
+ public void playStop(@PathVariable String deviceId, @PathVariable String channelId, @PathVariable String stream) {
+
+ cmder.streamByeCmd(deviceId, channelId, stream, null);
+
+ if (logger.isDebugEnabled()) {
+ logger.debug(String.format("璁惧鍘嗗彶濯掍綋涓嬭浇鍋滄 API璋冪敤锛宒eviceId/channelId锛�%s_%s", deviceId, channelId));
+ }
+
+ if (deviceId == null || channelId == null) {
+ throw new ControllerException(ErrorCode.ERROR100);
+ }
+ }
+
+ @Operation(summary = "鑾峰彇鍘嗗彶濯掍綋涓嬭浇杩涘害")
+ @Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
+ @Parameter(name = "channelId", description = "閫氶亾鍥芥爣缂栧彿", required = true)
+ @Parameter(name = "stream", description = "娴両D", 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.8.0