From 45969a00b74b5a240c0dc6e2c37f5381cd0cb65f Mon Sep 17 00:00:00 2001
From: lawrencehj <1934378145@qq.com>
Date: 星期四, 26 八月 2021 23:57:38 +0800
Subject: [PATCH] 修正设备注册认证时验证Response计算的错误
---
src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java | 206 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 195 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
index b87ffac..cf939cf 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
@@ -1,11 +1,6 @@
package com.genersoft.iot.vmp.gb28181.bean;
-import lombok.Data;
-import java.util.List;
-import java.util.Map;
-
-@Data
public class Device {
/**
@@ -40,22 +35,211 @@
private String transport;
/**
+ * 鏁版嵁娴佷紶杈撴ā寮�
+ * UDP:udp浼犺緭
+ * TCP-ACTIVE锛歵cp涓诲姩妯″紡
+ * TCP-PASSIVE锛歵cp琚姩妯″紡
+ */
+ private String streamMode;
+
+ /**
+ * wan鍦板潃_ip
+ */
+ private String ip;
+
+ /**
+ * wan鍦板潃_port
+ */
+ private int port;
+
+ /**
* wan鍦板潃
*/
- private Host host;
+ private String hostAddress;
/**
* 鍦ㄧ嚎
*/
private int online;
- /**
- * 閫氶亾鍒楄〃
- */
-// private Map<String,DeviceChannel> channelMap;
+ /**
+ * 娉ㄥ唽鏃堕棿
+ */
+ private String registerTime;
+
+
+ /**
+ * 蹇冭烦鏃堕棿
+ */
+ private String keepaliveTime;
+
+ /**
+ * 閫氶亾涓暟
+ */
private int channelCount;
- private List<String> channelList;
+ /**
+ * 娉ㄥ唽鏈夋晥鏈�
+ */
+ private int expires;
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ private String createTime;
+
+ /**
+ * 鏇存柊鏃堕棿
+ */
+ private String updateTime;
+
+ /**
+ * 璁惧浣跨敤鐨勫獟浣搃d, 榛樿涓簄ull
+ */
+ private String mediaServerId;
+
+ public String getDeviceId() {
+ return deviceId;
+ }
+
+ public void setDeviceId(String deviceId) {
+ this.deviceId = deviceId;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getManufacturer() {
+ return manufacturer;
+ }
+
+ public void setManufacturer(String manufacturer) {
+ this.manufacturer = manufacturer;
+ }
+
+ public String getModel() {
+ return model;
+ }
+
+ public void setModel(String model) {
+ this.model = model;
+ }
+
+ public String getFirmware() {
+ return firmware;
+ }
+
+ public void setFirmware(String firmware) {
+ this.firmware = firmware;
+ }
+
+ public String getTransport() {
+ return transport;
+ }
+
+ public void setTransport(String transport) {
+ this.transport = transport;
+ }
+
+ public String getStreamMode() {
+ return streamMode;
+ }
+
+ public void setStreamMode(String streamMode) {
+ this.streamMode = streamMode;
+ }
+
+ public String getIp() {
+ return ip;
+ }
+
+ public void setIp(String ip) {
+ this.ip = ip;
+ }
+
+ public int getPort() {
+ return port;
+ }
+
+ public void setPort(int port) {
+ this.port = port;
+ }
+
+ public String getHostAddress() {
+ return hostAddress;
+ }
+
+ public void setHostAddress(String hostAddress) {
+ this.hostAddress = hostAddress;
+ }
+
+ public int getOnline() {
+ return online;
+ }
+
+ public void setOnline(int online) {
+ this.online = online;
+ }
+
+ public int getChannelCount() {
+ return channelCount;
+ }
+
+ public void setChannelCount(int channelCount) {
+ this.channelCount = channelCount;
+ }
+
+ public String getRegisterTime() {
+ return registerTime;
+ }
+
+ public void setRegisterTime(String registerTime) {
+ this.registerTime = registerTime;
+ }
+
+ public String getKeepaliveTime() {
+ return keepaliveTime;
+ }
+
+ public void setKeepaliveTime(String keepaliveTime) {
+ this.keepaliveTime = keepaliveTime;
+ }
+
+ public int getExpires() {
+ return expires;
+ }
+
+ public void setExpires(int expires) {
+ this.expires = expires;
+ }
+
+ 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 String getMediaServerId() {
+ return mediaServerId;
+ }
+
+ public void setMediaServerId(String mediaServerId) {
+ this.mediaServerId = mediaServerId;
+ }
}
--
Gitblit v1.8.0