From e4d37864d1c9fa525807ceecf131a556549672b4 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 13 十月 2023 15:26:51 +0800
Subject: [PATCH] 开始重构云端录像继续
---
src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 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..78621bf 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
@@ -7,10 +7,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 +43,7 @@
private final static Logger logger = LoggerFactory.getLogger(CloudRecordController.class);
@Autowired
- private ZlmHttpHookSubscribe hookSubscribe;
+ private ICloudRecordService cloudRecordService;
@Autowired
private IMediaServerService mediaServerService;
@@ -95,7 +97,7 @@
return new ArrayList<>();
}
- return mediaServerService.getRecordDates(app, stream, year, month, mediaServerItems);
+ return cloudRecordService.getDateList(app, stream, year, month, mediaServerItems);
}
@ResponseBody
@@ -108,7 +110,7 @@
@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 = "mediaServerId", description = "娴佸獟浣揑D锛岀疆绌哄垯鏌ヨ鍏ㄩ儴娴佸獟浣�", required = false)
- public PageInfo<RecordFile> openRtpServer(
+ public PageInfo<CloudRecordItem> openRtpServer(
@RequestParam String app,
@RequestParam String stream,
@RequestParam int page,
@@ -133,12 +135,9 @@
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;
+ return cloudRecordService.getList(page, count, app, stream, startTime, endTime, mediaServerItems);
}
--
Gitblit v1.8.0