From 44b06e1b6e2cfcaf4c637ea66a375bf6fcbcf901 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 11 七月 2022 15:26:25 +0800
Subject: [PATCH] 修复默认用户信息插入
---
src/main/java/com/genersoft/iot/vmp/gb28181/bean/RecordItem.java | 40 +++++++++++++++++++++++++---------------
1 files changed, 25 insertions(+), 15 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..a47147a 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,12 @@
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;
+import java.time.Instant;
+import java.time.temporal.TemporalAccessor;
/**
* @description:璁惧褰曞儚bean
@@ -19,7 +20,9 @@
private String name;
private String filePath;
-
+
+ private String fileSize;
+
private String address;
private String startTime;
@@ -104,20 +107,27 @@
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());
- if (startTime_param.compareTo(startTime_now) > 0) {
- return -1;
- }else {
- return 1;
- }
- } catch (ParseException e) {
- e.printStackTrace();
+ TemporalAccessor startTimeNow = DateUtil.formatter.parse(startTime);
+ TemporalAccessor startTimeParam = DateUtil.formatter.parse(recordItem.getStartTime());
+ Instant startTimeParamInstant = Instant.from(startTimeParam);
+ Instant startTimeNowInstant = Instant.from(startTimeNow);
+ if (startTimeNowInstant.equals(startTimeParamInstant)) {
+ return 0;
+ }else if (Instant.from(startTimeParam).isAfter(Instant.from(startTimeNow)) ) {
+ return -1;
+ }else {
+ return 1;
}
- return 0;
+
}
}
--
Gitblit v1.8.0