From 1fcdf5a8f369e020e78d524db2fe3cc7ffc86293 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 08 三月 2024 09:30:48 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' into main-dev
---
src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java | 48 ++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 44 insertions(+), 4 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 1287bc3..b3d1990 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
@@ -4,16 +4,19 @@
import com.genersoft.iot.vmp.conf.DynamicTask;
import com.genersoft.iot.vmp.conf.UserSetting;
import com.genersoft.iot.vmp.conf.exception.ControllerException;
+import com.genersoft.iot.vmp.conf.security.JwtUtils;
import com.genersoft.iot.vmp.media.zlm.SendRtpPortManager;
import com.genersoft.iot.vmp.media.zlm.ZLMServerFactory;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
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;
import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.apache.commons.lang3.ObjectUtils;
import org.slf4j.Logger;
@@ -22,6 +25,7 @@
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
@@ -45,7 +49,7 @@
@ResponseBody
@GetMapping("/date/list")
- @Operation(summary = "鏌ヨ瀛樺湪浜戠褰曞儚鐨勬棩鏈�")
+ @Operation(summary = "鏌ヨ瀛樺湪浜戠褰曞儚鐨勬棩鏈�", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "app", description = "搴旂敤鍚�", required = true)
@Parameter(name = "stream", description = "娴両D", required = true)
@Parameter(name = "year", description = "骞达紝缃┖鍒欐煡璇㈠綋骞�", required = false)
@@ -88,7 +92,7 @@
@ResponseBody
@GetMapping("/list")
- @Operation(summary = "鍒嗛〉鏌ヨ浜戠褰曞儚")
+ @Operation(summary = "鍒嗛〉鏌ヨ浜戠褰曞儚", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "query", description = "妫�绱㈠唴瀹�", required = false)
@Parameter(name = "app", description = "搴旂敤鍚�", required = false)
@Parameter(name = "stream", description = "娴両D", required = false)
@@ -154,6 +158,7 @@
@Parameter(name = "callId", description = "閴存潈ID", required = false)
@Parameter(name = "remoteHost", description = "杩斿洖鍦板潃鏃剁殑杩滅▼鍦板潃", required = false)
public String addTask(
+ HttpServletRequest request,
@RequestParam(required = false) String app,
@RequestParam(required = false) String stream,
@RequestParam(required = false) String mediaServerId,
@@ -162,7 +167,20 @@
@RequestParam(required = false) String callId,
@RequestParam(required = false) String remoteHost
){
- return cloudRecordService.addTask(app, stream, mediaServerId, startTime, endTime, callId, remoteHost);
+ MediaServerItem mediaServerItem;
+ if (mediaServerId == null) {
+ mediaServerItem = mediaServerService.getDefaultMediaServer();
+ }else {
+ mediaServerItem = mediaServerService.getOne(mediaServerId);
+ }
+ if (mediaServerItem == null) {
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "鏈壘鍒板彲鐢ㄧ殑娴佸獟浣�");
+ }else {
+ if (remoteHost == null) {
+ remoteHost = request.getScheme() + "://" + mediaServerItem.getIp() + ":" + mediaServerItem.getRecordAssistPort();
+ }
+ }
+ return cloudRecordService.addTask(app, stream, mediaServerItem, startTime, endTime, callId, remoteHost, mediaServerId != null);
}
@ResponseBody
@@ -172,11 +190,19 @@
@Parameter(name = "mediaServerId", description = "娴佸獟浣揑D", required = false)
@Parameter(name = "isEnd", description = "鏄惁缁撴潫", required = false)
public JSONArray queryTaskList(
+ HttpServletRequest request,
+ @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);
+ if (ObjectUtils.isEmpty(mediaServerId)) {
+ mediaServerId = null;
+ }
+
+ return cloudRecordService.queryTask(app, stream, callId, taskId, mediaServerId, isEnd, request.getScheme());
}
@ResponseBody
@@ -198,6 +224,8 @@
@RequestParam(required = false) String callId,
@RequestParam(required = false) Integer recordId
){
+ logger.info("[浜戠褰曞儚] 娣诲姞鏀惰棌锛宎pp={}锛宻tream={},mediaServerId={},startTime={},endTime={},callId={},recordId={}",
+ app, stream, mediaServerId, startTime, endTime, callId, recordId);
if (recordId != null) {
return cloudRecordService.changeCollectById(recordId, true);
}else {
@@ -224,10 +252,22 @@
@RequestParam(required = false) String callId,
@RequestParam(required = false) Integer recordId
){
+ logger.info("[浜戠褰曞儚] 绉婚櫎鏀惰棌锛宎pp={}锛宻tream={},mediaServerId={},startTime={},endTime={},callId={},recordId={}",
+ app, stream, mediaServerId, startTime, endTime, callId, recordId);
if (recordId != null) {
return cloudRecordService.changeCollectById(recordId, false);
}else {
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