From cf8a1261b5a27b0e3270da2bd57fbe936b4e809b Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 19 一月 2024 17:44:31 +0800
Subject: [PATCH] 支持合并录像使用https
---
src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 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..15fe089 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
@@ -22,6 +22,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;
@@ -154,6 +155,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 +164,24 @@
@RequestParam(required = false) String callId,
@RequestParam(required = false) String remoteHost
){
- return cloudRecordService.addTask(app, stream, mediaServerId, startTime, endTime, callId, remoteHost);
+ System.out.println(request.getScheme());
+ System.out.println(request.getLocalAddr());
+ System.out.println(request.getRemoteAddr());
+ System.out.println(request.getRequestURI());
+ 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() + "://" + request.getLocalAddr() + ":" + mediaServerItem.getRecordAssistPort();
+ }
+ }
+ return cloudRecordService.addTask(app, stream, mediaServerItem, startTime, endTime, callId, remoteHost);
}
@ResponseBody
@@ -172,11 +191,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
@@ -198,6 +220,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,6 +248,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, false);
}else {
--
Gitblit v1.8.0