From 2f108a46d05e34981d52b447d73f0cfd8e8c30fd Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 17 十一月 2021 16:24:31 +0800
Subject: [PATCH] Merge pull request #232 from chenparty/wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/gb28181/bean/RecordItem.java | 46 +++++++++++++++++++++++++++++++++++-----------
1 files changed, 35 insertions(+), 11 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 484c25e..39f894c 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,11 +1,18 @@
package com.genersoft.iot.vmp.gb28181.bean;
-/**
- * @Description:璁惧褰曞儚bean
- * @author: songww
+
+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;
@@ -65,6 +72,14 @@
this.startTime = startTime;
}
+ public String getEndTime() {
+ return endTime;
+ }
+
+ public void setEndTime(String endTime) {
+ this.endTime = endTime;
+ }
+
public int getSecrecy() {
return secrecy;
}
@@ -85,15 +100,24 @@
return recorderId;
}
- public void setRecordId(String recorderId) {
+ public void setRecorderId(String recorderId) {
this.recorderId = recorderId;
}
- public String getEndTime() {
- return endTime;
- }
-
- public void setEndTime(String endTime) {
- this.endTime = endTime;
+ @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