From 01ecb07a2fac4ed96a318280bca88f3b9689500c Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 15 十二月 2023 17:54:56 +0800
Subject: [PATCH] Merge branch 'wvp-28181-record' into feature/record
---
src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java | 45 ++++++++++++++++++++++++++-------------------
1 files changed, 26 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java
index 48ff15a..dd7de2b 100755
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java
@@ -10,6 +10,7 @@
import com.genersoft.iot.vmp.service.ICloudRecordService;
import com.genersoft.iot.vmp.service.IMediaServerService;
import com.genersoft.iot.vmp.service.bean.CloudRecordItem;
+import com.genersoft.iot.vmp.service.bean.DownloadFileInfo;
import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
import com.github.pagehelper.PageInfo;
import io.swagger.v3.oas.annotations.Operation;
@@ -172,11 +173,14 @@
@Parameter(name = "mediaServerId", description = "娴佸獟浣揑D", required = false)
@Parameter(name = "isEnd", description = "鏄惁缁撴潫", required = false)
public JSONArray queryTaskList(
+ @RequestParam(required = false) String app,
+ @RequestParam(required = false) String stream,
+ @RequestParam(required = false) String callId,
@RequestParam(required = false) String taskId,
@RequestParam(required = false) String mediaServerId,
@RequestParam(required = false) Boolean isEnd
){
- return cloudRecordService.queryTask(taskId, mediaServerId, isEnd);
+ return cloudRecordService.queryTask(app, stream, callId, taskId, mediaServerId, isEnd);
}
@ResponseBody
@@ -188,24 +192,22 @@
@Parameter(name = "startTime", description = "閴存潈ID", required = false)
@Parameter(name = "endTime", description = "閴存潈ID", required = false)
@Parameter(name = "callId", description = "閴存潈ID", required = false)
- @Parameter(name = "collectType", description = "鏀惰棌绫诲瀷, collect/reserve", required = false)
- public void addCollect(
+ @Parameter(name = "recordId", description = "褰曞儚璁板綍鐨処D锛岀敤浜庣簿鍑嗘敹钘忎竴涓棰戞枃浠�", required = false)
+ public int addCollect(
@RequestParam(required = false) String app,
@RequestParam(required = false) String stream,
@RequestParam(required = false) String mediaServerId,
@RequestParam(required = false) String startTime,
@RequestParam(required = false) String endTime,
@RequestParam(required = false) String callId,
- @RequestParam(required = false) String collectType,
@RequestParam(required = false) Integer recordId
){
- if (!"collect".equals(collectType) && !"reserve".equals(collectType)) {
- collectType = "collect";
- }
+ logger.info("[浜戠褰曞儚] 娣诲姞鏀惰棌锛宎pp={}锛宻tream={},mediaServerId={},startTime={},endTime={},callId={},recordId={}",
+ app, stream, mediaServerId, startTime, endTime, callId, recordId);
if (recordId != null) {
- cloudRecordService.changeCollectById(recordId, collectType, true);
+ return cloudRecordService.changeCollectById(recordId, true);
}else {
- cloudRecordService.changeCollect(collectType, true, app, stream, mediaServerId, startTime, endTime, callId, collectType);
+ return cloudRecordService.changeCollect(true, app, stream, mediaServerId, startTime, endTime, callId);
}
}
@@ -218,27 +220,32 @@
@Parameter(name = "startTime", description = "閴存潈ID", required = false)
@Parameter(name = "endTime", description = "閴存潈ID", required = false)
@Parameter(name = "callId", description = "閴存潈ID", required = false)
- @Parameter(name = "collectType", description = "鏀惰棌绫诲瀷, collect/reserve", required = false)
- public void deleteCollect(
+ @Parameter(name = "recordId", description = "褰曞儚璁板綍鐨処D锛岀敤浜庣簿鍑嗙簿鍑嗙Щ闄や竴涓棰戞枃浠剁殑鏀惰棌", required = false)
+ public int deleteCollect(
@RequestParam(required = false) String app,
@RequestParam(required = false) String stream,
@RequestParam(required = false) String mediaServerId,
@RequestParam(required = false) String startTime,
@RequestParam(required = false) String endTime,
@RequestParam(required = false) String callId,
- @RequestParam(required = false) String collectType,
@RequestParam(required = false) Integer recordId
){
- if (!"collect".equals(collectType) && !"reserve".equals(collectType)) {
- collectType = "collect";
- }
+ logger.info("[浜戠褰曞儚] 绉婚櫎鏀惰棌锛宎pp={}锛宻tream={},mediaServerId={},startTime={},endTime={},callId={},recordId={}",
+ app, stream, mediaServerId, startTime, endTime, callId, recordId);
if (recordId != null) {
- cloudRecordService.changeCollectById(recordId, collectType, false);
+ return cloudRecordService.changeCollectById(recordId, false);
}else {
- cloudRecordService.changeCollect(collectType, false, app, stream, mediaServerId, startTime, endTime, callId, collectType);
+ return cloudRecordService.changeCollect(false, app, stream, mediaServerId, startTime, endTime, callId);
}
}
-
-
+ @ResponseBody
+ @GetMapping("/play/path")
+ @Operation(summary = "鑾峰彇鎾斁鍦板潃")
+ @Parameter(name = "recordId", description = "褰曞儚璁板綍鐨処D", required = true)
+ public DownloadFileInfo getPlayUrlPath(
+ @RequestParam(required = true) Integer recordId
+ ){
+ return cloudRecordService.getPlayUrlPath(recordId);
+ }
}
--
Gitblit v1.8.0