From b6e604f2449bb65dfaafb0f0741ba54ff0d2f9c2 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 30 四月 2024 15:20:03 +0800
Subject: [PATCH] 修改云端录像详情页使用直接访问zlm的方式播放录像
---
src/main/java/com/genersoft/iot/vmp/service/bean/CloudRecordItem.java | 44 +++++++++++++++++++++++++++++---------------
1 files changed, 29 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/service/bean/CloudRecordItem.java b/src/main/java/com/genersoft/iot/vmp/service/bean/CloudRecordItem.java
index 364ec29..c9a54bc 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/bean/CloudRecordItem.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/bean/CloudRecordItem.java
@@ -1,5 +1,6 @@
package com.genersoft.iot.vmp.service.bean;
+import com.genersoft.iot.vmp.media.event.media.MediaRecordMp4Event;
import com.genersoft.iot.vmp.media.zlm.dto.hook.OnRecordMp4HookParam;
/**
@@ -57,9 +58,14 @@
private String folder;
/**
- * 鏀惰棌绫诲瀷锛屾敹钘忕殑鏂囦欢涓嶇Щ闄�
+ * 鏀惰棌锛屾敹钘忕殑鏂囦欢涓嶇Щ闄�
*/
- private String collectType;
+ private Boolean collect;
+
+ /**
+ * 淇濈暀锛屾敹钘忕殑鏂囦欢涓嶇Щ闄�
+ */
+ private Boolean reserve;
/**
* 鏂囦欢澶у皬
@@ -71,18 +77,18 @@
*/
private long timeLen;
- public static CloudRecordItem getInstance(OnRecordMp4HookParam param) {
+ public static CloudRecordItem getInstance(MediaRecordMp4Event param) {
CloudRecordItem cloudRecordItem = new CloudRecordItem();
cloudRecordItem.setApp(param.getApp());
cloudRecordItem.setStream(param.getStream());
- cloudRecordItem.setStartTime(param.getStart_time());
- cloudRecordItem.setFileName(param.getFile_name());
- cloudRecordItem.setFolder(param.getFolder());
- cloudRecordItem.setFileSize(param.getFile_size());
- cloudRecordItem.setFilePath(param.getFile_path());
- cloudRecordItem.setMediaServerId(param.getMediaServerId());
- cloudRecordItem.setTimeLen(param.getTime_len());
- cloudRecordItem.setEndTime(param.getStart_time() + param.getTime_len());
+ cloudRecordItem.setStartTime(param.getRecordInfo().getStartTime()*1000);
+ cloudRecordItem.setFileName(param.getRecordInfo().getFileName());
+ cloudRecordItem.setFolder(param.getRecordInfo().getFolder());
+ cloudRecordItem.setFileSize(param.getRecordInfo().getFileSize());
+ cloudRecordItem.setFilePath(param.getRecordInfo().getFilePath());
+ cloudRecordItem.setMediaServerId(param.getMediaServer().getId());
+ cloudRecordItem.setTimeLen((long) param.getRecordInfo().getTimeLen() * 1000);
+ cloudRecordItem.setEndTime((param.getRecordInfo().getStartTime() + (long)param.getRecordInfo().getTimeLen()) * 1000);
return cloudRecordItem;
}
@@ -182,11 +188,19 @@
this.timeLen = timeLen;
}
- public String getCollectType() {
- return collectType;
+ public Boolean getCollect() {
+ return collect;
}
- public void setCollectType(String collectType) {
- this.collectType = collectType;
+ public void setCollect(Boolean collect) {
+ this.collect = collect;
+ }
+
+ public Boolean getReserve() {
+ return reserve;
+ }
+
+ public void setReserve(Boolean reserve) {
+ this.reserve = reserve;
}
}
--
Gitblit v1.8.0