From 95b1cbba657e0e871a8405dcd83fd0691587bf33 Mon Sep 17 00:00:00 2001
From: mk1990 <37614016+mk1990@users.noreply.github.com>
Date: 星期五, 13 五月 2022 10:58:33 +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 | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 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 39f894c..3349cdc 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,10 +1,10 @@
package com.genersoft.iot.vmp.gb28181.bean;
+import com.genersoft.iot.vmp.utils.DateUtil;
import org.jetbrains.annotations.NotNull;
import java.text.ParseException;
-import java.text.SimpleDateFormat;
import java.util.Date;
/**
@@ -19,7 +19,9 @@
private String name;
private String filePath;
-
+
+ private String fileSize;
+
private String address;
private String startTime;
@@ -104,12 +106,19 @@
this.recorderId = recorderId;
}
+ public String getFileSize() {
+ return fileSize;
+ }
+
+ 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());
+ Date startTime_now = DateUtil.format.parse(startTime);
+ Date startTime_param = DateUtil.format.parse(recordItem.getStartTime());
if (startTime_param.compareTo(startTime_now) > 0) {
return -1;
}else {
--
Gitblit v1.8.0