From c8b0e66e0eedaaa368bac3a49bcf1d34fb5e7393 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 27 二月 2024 10:25:42 +0800
Subject: [PATCH] 合并主线
---
src/main/java/com/genersoft/iot/vmp/service/bean/CloudRecordItem.java | 31 ++++++++++++++++++++++---------
1 files changed, 22 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 364ec29..771e4c8 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
@@ -57,9 +57,14 @@
private String folder;
/**
- * 鏀惰棌绫诲瀷锛屾敹钘忕殑鏂囦欢涓嶇Щ闄�
+ * 鏀惰棌锛屾敹钘忕殑鏂囦欢涓嶇Щ闄�
*/
- private String collectType;
+ private Boolean collect;
+
+ /**
+ * 淇濈暀锛屾敹钘忕殑鏂囦欢涓嶇Щ闄�
+ */
+ private Boolean reserve;
/**
* 鏂囦欢澶у皬
@@ -75,14 +80,14 @@
CloudRecordItem cloudRecordItem = new CloudRecordItem();
cloudRecordItem.setApp(param.getApp());
cloudRecordItem.setStream(param.getStream());
- cloudRecordItem.setStartTime(param.getStart_time());
+ 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(param.getTime_len());
- cloudRecordItem.setEndTime(param.getStart_time() + param.getTime_len());
+ cloudRecordItem.setTimeLen((long) param.getTime_len() * 1000);
+ cloudRecordItem.setEndTime((param.getStart_time() + (long)param.getTime_len()) * 1000);
return cloudRecordItem;
}
@@ -182,11 +187,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