From b2fa4608a2e0abb3d744f4f91bd423380e45f9c4 Mon Sep 17 00:00:00 2001
From: Lawrence <1934378145@qq.com>
Date: 星期三, 16 十二月 2020 12:43:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'upstream/master'
---
src/main/java/com/genersoft/iot/vmp/gb28181/bean/RecordItem.java | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 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 20605b1..1533b66 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,12 +1,18 @@
package com.genersoft.iot.vmp.gb28181.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;
@@ -97,4 +103,21 @@
public void setRecorderId(String recorderId) {
this.recorderId = recorderId;
}
+
+ @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