From ef19b4f85ff6442fbf87ae5c447575b0852fe463 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 26 十月 2020 09:52:23 +0800
Subject: [PATCH] Merge pull request #2 from lawrencehj/master
---
src/main/java/com/genersoft/iot/vmp/vmanager/device/entity/Device.java | 74 ++++++++++++++++++------------------
1 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/device/entity/Device.java b/src/main/java/com/genersoft/iot/vmp/vmanager/device/entity/Device.java
index 50682f9..e47f796 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/device/entity/Device.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/device/entity/Device.java
@@ -222,6 +222,7 @@
@Transient
private List<DeviceChannel> channelList;
+
public String getDeviceId() {
return deviceId;
}
@@ -236,30 +237,6 @@
public void setDeviceName(String deviceName) {
this.deviceName = deviceName;
- }
-
- public String getTransport() {
- return transport;
- }
-
- public void setTransport(String transport) {
- this.transport = transport;
- }
-
- public String getIp() {
- return ip;
- }
-
- public void setIp(String ip) {
- this.ip = ip;
- }
-
- public Integer getPort() {
- return port;
- }
-
- public void setPort(Integer port) {
- this.port = port;
}
public String getManufacturer() {
@@ -286,12 +263,20 @@
this.firmware = firmware;
}
- public String getOnline() {
- return online;
+ public String getProtocol() {
+ return protocol;
}
- public void setOnline(String online) {
- this.online = online;
+ public void setProtocol(String protocol) {
+ this.protocol = protocol;
+ }
+
+ public String getTransport() {
+ return transport;
+ }
+
+ public void setTransport(String transport) {
+ this.transport = transport;
}
public String getStreamMode() {
@@ -302,12 +287,28 @@
this.streamMode = streamMode;
}
- public List<DeviceChannel> getChannelList() {
- return channelList;
+ public String getIp() {
+ return ip;
}
- public void setChannelList(List<DeviceChannel> channelList) {
- this.channelList = channelList;
+ public void setIp(String ip) {
+ this.ip = ip;
+ }
+
+ public Integer getPort() {
+ return port;
+ }
+
+ public void setPort(Integer port) {
+ this.port = port;
+ }
+
+ public String getOnline() {
+ return online;
+ }
+
+ public void setOnline(String online) {
+ this.online = online;
}
public Integer getChannelSum() {
@@ -390,12 +391,11 @@
this.password = password;
}
- public String getProtocol() {
- return protocol;
+ public List<DeviceChannel> getChannelList() {
+ return channelList;
}
- public void setProtocol(String protocol) {
- this.protocol = protocol;
+ public void setChannelList(List<DeviceChannel> channelList) {
+ this.channelList = channelList;
}
-
}
--
Gitblit v1.8.0