From a5ed284658d70875e74c4c8ca2924de933e7d9af Mon Sep 17 00:00:00 2001
From: xiaoQQya <xiaoQQya@126.com>
Date: 星期六, 04 二月 2023 18:13:47 +0800
Subject: [PATCH] fix(JsonUtil): 修复 Redis 中 Object 序列化与反序列化不一致导致报错的问题
---
src/main/java/com/genersoft/iot/vmp/gb28181/bean/RecordItem.java | 62 ++++++++++++++++++++++++-------
1 files changed, 48 insertions(+), 14 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 b0e713b..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,18 +1,28 @@
package com.genersoft.iot.vmp.gb28181.bean;
-/**
- * @Description:璁惧褰曞儚bean
- * @author: songww
+
+import com.genersoft.iot.vmp.utils.DateUtil;
+import org.jetbrains.annotations.NotNull;
+
+import java.text.ParseException;
+import java.time.Instant;
+import java.time.temporal.TemporalAccessor;
+
+/**
+ * @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;
@@ -23,7 +33,7 @@
private String type;
- private String recordId;
+ private String recorderId;
public String getDeviceId() {
return deviceId;
@@ -65,6 +75,14 @@
this.startTime = startTime;
}
+ public String getEndTime() {
+ return endTime;
+ }
+
+ public void setEndTime(String endTime) {
+ this.endTime = endTime;
+ }
+
public int getSecrecy() {
return secrecy;
}
@@ -81,19 +99,35 @@
this.type = type;
}
- public String getRecordId() {
- return recordId;
+ public String getRecorderId() {
+ return recorderId;
}
- public void setRecordId(String recordId) {
- this.recordId = recordId;
+ 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) {
+ 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;
+ }
+
}
}
--
Gitblit v1.8.0