From 16b7e4a7ef473a6af29ec78aeb2f471fa398efdd Mon Sep 17 00:00:00 2001
From: leesam <leesam@leesam.cn>
Date: 星期三, 10 四月 2024 20:49:44 +0800
Subject: [PATCH] Merge branch 'refs/heads/master' into develop-add-api-key
---
src/main/java/com/genersoft/iot/vmp/service/bean/CloudRecordItem.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 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 771e4c8..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;
/**
@@ -76,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()*1000);
- 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((long) param.getTime_len() * 1000);
- cloudRecordItem.setEndTime((param.getStart_time() + (long)param.getTime_len()) * 1000);
+ 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;
}
--
Gitblit v1.8.0