From 943f95ba8ce02f8088f2dfcfd83a60391a8a65a6 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 14 三月 2023 14:02:33 +0800
Subject: [PATCH] 增加消息通道配置，可以通道redis在wvp上下级之间发送消息
---
src/main/java/com/genersoft/iot/vmp/gb28181/bean/RecordItem.java | 77 ++++++++++++++++++++++++++++++--------
1 files changed, 61 insertions(+), 16 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 fbcbf96..07e559c 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,28 +1,49 @@
package com.genersoft.iot.vmp.gb28181.bean;
-/**
- * @Description:璁惧褰曞儚bean
+
+import com.genersoft.iot.vmp.utils.DateUtil;
+import io.swagger.v3.oas.annotations.media.Schema;
+import org.jetbrains.annotations.NotNull;
+
+import java.time.Instant;
+import java.time.temporal.TemporalAccessor;
+
+/**
+ * @description:璁惧褰曞儚bean
* @author: swwheihei
* @date: 2020骞�5鏈�8鏃� 涓嬪崍2:06:54
*/
-public class RecordItem {
+@Schema(description = "璁惧褰曞儚璇︽儏")
+public class RecordItem implements Comparable<RecordItem>{
+ @Schema(description = "璁惧缂栧彿")
private String deviceId;
-
+
+ @Schema(description = "鍚嶇О")
private String name;
-
+
+ @Schema(description = "鏂囦欢璺緞鍚� (鍙��)")
private String filePath;
-
+
+ @Schema(description = "褰曞儚鏂囦欢澶у皬,鍗曚綅:Byte(鍙��)")
+ private String fileSize;
+
+ @Schema(description = "褰曞儚鍦板潃(鍙��)")
private String address;
-
+
+ @Schema(description = "褰曞儚寮�濮嬫椂闂�(鍙��)")
private String startTime;
-
+
+ @Schema(description = "褰曞儚缁撴潫鏃堕棿(鍙��)")
private String endTime;
-
+
+ @Schema(description = "淇濆瘑灞炴��(蹇呴��)缂虹渷涓�0;0:涓嶆秹瀵�,1:娑夊瘑")
private int secrecy;
-
+
+ @Schema(description = "褰曞儚浜х敓绫诲瀷(鍙��)time鎴朼larm 鎴� manua")
private String type;
-
+
+ @Schema(description = "褰曞儚瑙﹀彂鑰匢D(鍙��)")
private String recorderId;
public String getDeviceId() {
@@ -65,6 +86,14 @@
this.startTime = startTime;
}
+ public String getEndTime() {
+ return endTime;
+ }
+
+ public void setEndTime(String endTime) {
+ this.endTime = endTime;
+ }
+
public int getSecrecy() {
return secrecy;
}
@@ -85,15 +114,31 @@
return recorderId;
}
- public void setRecordId(String recorderId) {
+ 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