From d739bfa5976e36ced26f906ab16f83c20c8cb27c Mon Sep 17 00:00:00 2001
From: xiaoxie <hotcoffie@163.com>
Date: 星期一, 23 五月 2022 09:44:21 +0800
Subject: [PATCH] 处理冲突
---
src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 51 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java
index ca6ef60..95576f3 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java
@@ -3,6 +3,10 @@
public class DeviceChannel {
+ /**
+ * 鏁版嵁搴撹嚜澧濱D
+ */
+ private int id;
/**
* 閫氶亾id
@@ -118,6 +122,16 @@
* 浜戝彴绫诲瀷鎻忚堪瀛楃涓�
*/
private String PTZTypeText;
+
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ private String createTime;
+
+ /**
+ * 鏇存柊鏃堕棿
+ */
+ private String updateTime;
/**
* 鍦ㄧ嚎/绂荤嚎
@@ -154,6 +168,19 @@
* 鏄惁鍚湁闊抽
*/
private boolean hasAudio;
+
+ /**
+ * 鏍囪閫氶亾鐨勭被鍨嬶紝0->鍥芥爣閫氶亾 1->鐩存挱娴侀�氶亾 2->涓氬姟鍒嗙粍/铏氭嫙缁勭粐/琛屾斂鍖哄垝
+ */
+ private int channelType;
+
+ public int getId() {
+ return id;
+ }
+
+ public void setId(int id) {
+ this.id = id;
+ }
public String getDeviceId() {
return deviceId;
@@ -403,4 +430,28 @@
public void setStreamId(String streamId) {
this.streamId = streamId;
}
+
+ public String getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(String createTime) {
+ this.createTime = createTime;
+ }
+
+ public String getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(String updateTime) {
+ this.updateTime = updateTime;
+ }
+
+ public int getChannelType() {
+ return channelType;
+ }
+
+ public void setChannelType(int channelType) {
+ this.channelType = channelType;
+ }
}
--
Gitblit v1.8.0