From e4754af417b176f5e0ab998e6594d875bc0a069c Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 06 七月 2023 15:35:59 +0800
Subject: [PATCH] 修复数据错误导致无法转成JSON返回 #919
---
src/main/java/com/genersoft/iot/vmp/gb28181/bean/CatalogData.java | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/CatalogData.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/CatalogData.java
index 40f676e..965d7f2 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/CatalogData.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/CatalogData.java
@@ -1,12 +1,19 @@
package com.genersoft.iot.vmp.gb28181.bean;
-import java.util.Date;
+import java.time.Instant;
import java.util.List;
+/**
+ * @author lin
+ */
public class CatalogData {
+ /**
+ * 鍛戒护搴忓垪鍙�
+ */
+ private int sn;
private int total;
private List<DeviceChannel> channelList;
- private Date lastTime;
+ private Instant lastTime;
private Device device;
private String errorMsg;
@@ -14,6 +21,15 @@
ready, runIng, end
}
private CatalogDataStatus status;
+
+
+ public int getSn() {
+ return sn;
+ }
+
+ public void setSn(int sn) {
+ this.sn = sn;
+ }
public int getTotal() {
return total;
@@ -31,11 +47,11 @@
this.channelList = channelList;
}
- public Date getLastTime() {
+ public Instant getLastTime() {
return lastTime;
}
- public void setLastTime(Date lastTime) {
+ public void setLastTime(Instant lastTime) {
this.lastTime = lastTime;
}
--
Gitblit v1.8.0