From 40a806329ce08d5f50795cf965ef773aa48fdd3e Mon Sep 17 00:00:00 2001
From: 648540858 <456panlinlin>
Date: 星期五, 15 四月 2022 09:37:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into map
---
src/main/java/com/genersoft/iot/vmp/gb28181/bean/CatalogData.java | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 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 c74fb87..40f676e 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
@@ -8,6 +8,12 @@
private List<DeviceChannel> channelList;
private Date lastTime;
private Device device;
+ private String errorMsg;
+
+ public enum CatalogDataStatus{
+ ready, runIng, end
+ }
+ private CatalogDataStatus status;
public int getTotal() {
return total;
@@ -40,4 +46,20 @@
public void setDevice(Device device) {
this.device = device;
}
+
+ public String getErrorMsg() {
+ return errorMsg;
+ }
+
+ public void setErrorMsg(String errorMsg) {
+ this.errorMsg = errorMsg;
+ }
+
+ public CatalogDataStatus getStatus() {
+ return status;
+ }
+
+ public void setStatus(CatalogDataStatus status) {
+ this.status = status;
+ }
}
--
Gitblit v1.8.0