From acd767b47a4f78e905a3cbe89a4c82ffe88d73d9 Mon Sep 17 00:00:00 2001
From: hotcoffie <35990065+hotcoffie@users.noreply.github.com>
Date: 星期四, 21 四月 2022 10:04:50 +0800
Subject: [PATCH] Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/gb28181/bean/RecordItem.java | 52 +++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 43 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/RecordItem.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/RecordItem.java
index fbcbf96..ca7fd54 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/RecordItem.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/RecordItem.java
@@ -1,18 +1,27 @@
package com.genersoft.iot.vmp.gb28181.bean;
-/**
- * @Description:璁惧褰曞儚bean
+
+import org.jetbrains.annotations.NotNull;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+/**
+ * @description:璁惧褰曞儚bean
* @author: swwheihei
* @date: 2020骞�5鏈�8鏃� 涓嬪崍2:06:54
*/
-public class RecordItem {
+public class RecordItem implements Comparable<RecordItem>{
private String deviceId;
private String name;
private String filePath;
-
+
+ private String fileSize;
+
private String address;
private String startTime;
@@ -65,6 +74,14 @@
this.startTime = startTime;
}
+ public String getEndTime() {
+ return endTime;
+ }
+
+ public void setEndTime(String endTime) {
+ this.endTime = endTime;
+ }
+
public int getSecrecy() {
return secrecy;
}
@@ -85,15 +102,32 @@
return recorderId;
}
- public void setRecordId(String recorderId) {
+ public void setRecorderId(String recorderId) {
this.recorderId = recorderId;
}
- public String getEndTime() {
- return endTime;
+ public String getFileSize() {
+ return fileSize;
}
- public void setEndTime(String endTime) {
- this.endTime = endTime;
+ public void setFileSize(String fileSize) {
+ this.fileSize = fileSize;
+ }
+
+ @Override
+ public int compareTo(@NotNull RecordItem recordItem) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ try {
+ Date startTime_now = sdf.parse(startTime);
+ Date startTime_param = sdf.parse(recordItem.getStartTime());
+ if (startTime_param.compareTo(startTime_now) > 0) {
+ return -1;
+ }else {
+ return 1;
+ }
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ return 0;
}
}
--
Gitblit v1.8.0