From 92a25393f38d9877aeefca3bcc0f6574b7dff6d4 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 17 十月 2023 17:55:40 +0800
Subject: [PATCH] 基于新的云端录像实现页面功能
---
src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java | 107 +++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 90 insertions(+), 17 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 0f37a7d..cb731cd 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
@@ -1,5 +1,7 @@
package com.genersoft.iot.vmp.vmanager.cloudRecord;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
import com.genersoft.iot.vmp.conf.DynamicTask;
import com.genersoft.iot.vmp.conf.UserSetting;
import com.genersoft.iot.vmp.conf.exception.ControllerException;
@@ -7,10 +9,12 @@
import com.genersoft.iot.vmp.media.zlm.ZLMServerFactory;
import com.genersoft.iot.vmp.media.zlm.ZlmHttpHookSubscribe;
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.vmanager.bean.ErrorCode;
-import com.genersoft.iot.vmp.vmanager.bean.PageInfo;
import com.genersoft.iot.vmp.vmanager.bean.RecordFile;
+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.tags.Tag;
@@ -41,7 +45,7 @@
private final static Logger logger = LoggerFactory.getLogger(CloudRecordController.class);
@Autowired
- private ZlmHttpHookSubscribe hookSubscribe;
+ private ICloudRecordService cloudRecordService;
@Autowired
private IMediaServerService mediaServerService;
@@ -95,26 +99,28 @@
return new ArrayList<>();
}
- return mediaServerService.getRecordDates(app, stream, year, month, mediaServerItems);
+ return cloudRecordService.getDateList(app, stream, year, month, mediaServerItems);
}
@ResponseBody
@GetMapping("/list")
@Operation(summary = "鍒嗛〉鏌ヨ浜戠褰曞儚")
- @Parameter(name = "app", description = "搴旂敤鍚�", required = true)
- @Parameter(name = "stream", description = "娴両D", required = true)
+ @Parameter(name = "query", description = "妫�绱㈠唴瀹�", required = false)
+ @Parameter(name = "app", description = "搴旂敤鍚�", required = false)
+ @Parameter(name = "stream", description = "娴両D", required = false)
@Parameter(name = "page", description = "褰撳墠椤�", required = false)
@Parameter(name = "count", description = "姣忛〉鏌ヨ鏁伴噺", required = false)
- @Parameter(name = "startTime", description = "寮�濮嬫椂闂�(yyyy-MM-dd HH:mm:ss)", required = true)
- @Parameter(name = "endTime", description = "缁撴潫鏃堕棿(yyyy-MM-dd HH:mm:ss)", required = true)
+ @Parameter(name = "startTime", description = "寮�濮嬫椂闂�(yyyy-MM-dd HH:mm:ss)", required = false)
+ @Parameter(name = "endTime", description = "缁撴潫鏃堕棿(yyyy-MM-dd HH:mm:ss)", required = false)
@Parameter(name = "mediaServerId", description = "娴佸獟浣揑D锛岀疆绌哄垯鏌ヨ鍏ㄩ儴娴佸獟浣�", required = false)
- public PageInfo<RecordFile> openRtpServer(
- @RequestParam String app,
- @RequestParam String stream,
+ public PageInfo<CloudRecordItem> openRtpServer(
+ @RequestParam(required = false) String query,
+ @RequestParam(required = false) String app,
+ @RequestParam(required = false) String stream,
@RequestParam int page,
@RequestParam int count,
- @RequestParam String startTime,
- @RequestParam String endTime,
+ @RequestParam(required = false) String startTime,
+ @RequestParam(required = false) String endTime,
@RequestParam(required = false) String mediaServerId
) {
@@ -133,13 +139,80 @@
mediaServerItems = mediaServerService.getAll();
}
if (mediaServerItems.isEmpty()) {
- return new PageInfo<>();
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "褰撳墠鏃犳祦濯掍綋");
}
- List<RecordFile> records = mediaServerService.getRecords(app, stream, startTime, endTime, mediaServerItems);
- PageInfo<RecordFile> pageInfo = new PageInfo<>(records);
- pageInfo.startPage(page, count);
- return pageInfo;
+ if (query != null && ObjectUtils.isEmpty(query.trim())) {
+ query = null;
+ }
+ if (app != null && ObjectUtils.isEmpty(app.trim())) {
+ app = null;
+ }
+ if (stream != null && ObjectUtils.isEmpty(stream.trim())) {
+ stream = null;
+ }
+ if (startTime != null && ObjectUtils.isEmpty(startTime.trim())) {
+ startTime = null;
+ }
+ if (endTime != null && ObjectUtils.isEmpty(endTime.trim())) {
+ endTime = null;
+ }
+ return cloudRecordService.getList(page, count, query, app, stream, startTime, endTime, mediaServerItems);
}
+ @ResponseBody
+ @GetMapping("/task/add")
+ @Operation(summary = "娣诲姞鍚堝苟浠诲姟")
+ @Parameter(name = "app", description = "搴旂敤鍚�", required = true)
+ @Parameter(name = "stream", description = "娴両D", required = true)
+ @Parameter(name = "mediaServerId", description = "娴佸獟浣揑D", required = false)
+ @Parameter(name = "startTime", description = "閴存潈ID", required = false)
+ @Parameter(name = "endTime", description = "閴存潈ID", required = false)
+ @Parameter(name = "callId", description = "閴存潈ID", required = false)
+ @Parameter(name = "remoteHost", description = "杩斿洖鍦板潃鏃剁殑杩滅▼鍦板潃", required = false)
+ public String addTask(
+ @RequestParam(required = true) String app,
+ @RequestParam(required = true) 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 remoteHost
+ ){
+ return cloudRecordService.addTask(app, stream, mediaServerId, startTime, endTime, callId, remoteHost);
+ }
+
+ @ResponseBody
+ @GetMapping("/task/list")
+ @Operation(summary = "鏌ヨ鍚堝苟浠诲姟")
+ @Parameter(name = "taskId", description = "浠诲姟Id", required = false)
+ @Parameter(name = "mediaServerId", description = "娴佸獟浣揑D", required = false)
+ @Parameter(name = "isEnd", description = "鏄惁缁撴潫", required = false)
+ public JSONArray queryTaskList(
+ @RequestParam(required = false) String taskId,
+ @RequestParam(required = false) String mediaServerId,
+ @RequestParam(required = false) Boolean isEnd
+ ){
+ return cloudRecordService.queryTask(taskId, mediaServerId, isEnd);
+ }
+
+ @ResponseBody
+ @GetMapping("/collect/add")
+ @Operation(summary = "娣诲姞鏀惰棌")
+ @Parameter(name = "app", description = "搴旂敤鍚�", required = true)
+ @Parameter(name = "stream", description = "娴両D", required = true)
+ @Parameter(name = "mediaServerId", description = "娴佸獟浣揑D", required = false)
+ @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 = "鏀惰棌绫诲瀷", required = false)
+ public JSONArray addCollect(
+ @RequestParam(required = false) String taskId,
+ @RequestParam(required = false) String mediaServerId,
+ @RequestParam(required = false) Boolean isEnd
+ ){
+ return cloudRecordService.queryTask(taskId, mediaServerId, isEnd);
+ }
+
+
}
--
Gitblit v1.8.0