From 11cea3249fd58d59d7c1d644b1cfff6a547921c2 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期三, 16 二月 2022 13:07:10 +0800
Subject: [PATCH] Merge branch 'dev-hxb'
---
HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/request/AuthenticateRequest.java | 230 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 227 insertions(+), 3 deletions(-)
diff --git a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/request/AuthenticateRequest.java b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/request/AuthenticateRequest.java
index 1314671..e7ba0f3 100644
--- a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/request/AuthenticateRequest.java
+++ b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/request/AuthenticateRequest.java
@@ -34,15 +34,45 @@
this.auth = auth;
}
+ /**
+ * 璁よ瘉淇℃伅
+ */
public static class AuthBean implements Serializable {
+ /**
+ * 璁惧MACKey
+ */
private String mac_key;//(mac+secret)鐨勪袱娆d5鍊�
+ /**
+ * 璁惧spk
+ */
private String spk;
+ /**
+ * 璇锋眰淇℃伅
+ */
private RequestBean request;//璁惧鐩稿叧淇℃伅
+ /**
+ * MAC key
+ * @return
+ */
public String getMACKey() { return mac_key; }
+
+ /**
+ * MACkey
+ * @param value
+ */
public void setMACKey(String value) { this.mac_key = value; }
+ /**
+ * SPK
+ * @return
+ */
public String getSpk() { return spk; }
+
+ /**
+ * SPK
+ * @param value
+ */
public void setSpk(String value) { this.spk = value; }
public RequestBean getRequest() { return request; }
@@ -51,6 +81,13 @@
public AuthBean() {
}
+
+ /**
+ * 璁よ瘉淇℃伅
+ * @param mac_key mac key
+ * @param spk 浜у搧spk
+ * @param request 璇锋眰瀵硅薄
+ */
public AuthBean(String mac_key, String spk, RequestBean request) {
this.mac_key = mac_key;
this.spk = spk;
@@ -71,16 +108,52 @@
this.firmware_version = firmware_version;
}
+ /**
+ * 璁惧MAC
+ * @return
+ */
public String getMAC() { return mac; }
+
+ /**
+ * 璁惧MAC
+ * @param value
+ */
public void setMAC(String value) { this.mac = value; }
+ /**
+ * 鍘傚
+ * @return
+ */
public String getSupplier() { return supplier; }
+
+ /**
+ * 鍘傚
+ * @param value
+ */
public void setSupplier(String value) { this.supplier = value; }
+ /**
+ * 纭欢鐗堟湰
+ * @return
+ */
public String getHardwareModel() { return hardware_model; }
+
+ /**
+ * 纭欢鐗堟湰
+ * @param value
+ */
public void setHardwareModel(String value) { this.hardware_model = value; }
+ /**
+ * 杞欢鐗堟湰
+ * @return
+ */
public String getFirmwareVersion() { return firmware_version; }
+
+ /**
+ * 杞欢鐗堟湰
+ * @param value
+ */
public void setFirmwareVersion(String value) { this.firmware_version = value; }
}
@@ -97,46 +170,197 @@
private String ip_gateway;
private String dns1 = "114.114.114.114";
private String dns2 = "8.8.8.8";
- private VersionBean[] versions;
+ private String gateway_type;
+ private String hw_version;
+ private String fw_version;
public String getOID() { return oid; }
+
+ /**
+ * 璁惧Oid
+ * @param value
+ */
public void setOID(String value) { this.oid = value; }
public String getDeviceMAC() { return device_mac; }
+
+ /**
+ * 璁惧Mac
+ * @param value
+ */
public void setDeviceMAC(String value) { this.device_mac = value; }
+ /**
+ * 璁惧鍚�
+ * @return
+ */
public String getDeviceName() { return device_name; }
+
+ /**
+ * 璁惧鍚�
+ * @param value
+ */
public void setDeviceName(String value) { this.device_name = value; }
+ /**
+ * 璁惧鍨嬪彿
+ * @return
+ */
public String getDeviceModel() { return device_model; }
+
+ /**
+ * 璁惧鍨嬪彿
+ * @param value
+ */
public void setDeviceModel(String value) { this.device_model = value; }
+ /**
+ * 杩炴帴绫诲瀷锛屾湁绾胯繕鏄棤绾�
+ * @return
+ */
public String getAccessMode() { return access_mode; }
+
+ /**
+ * 杩炴帴绫诲瀷锛屾湁绾胯繕鏄棤绾�
+ * @param value
+ */
public void setAccessMode(String value) { this.access_mode = value; }
+ /**
+ * 璁惧sid
+ * @return
+ */
public String getSid() { return sid; }
+
+ /**
+ * 璁惧sid
+ * @param value
+ */
public void setSid(String value) { this.sid = value; }
+ /**
+ * 璁惧IPMAC
+ * @return
+ */
public String getIPMAC() { return ip_mac; }
+
+ /**
+ * 璁惧IPMAC
+ * @param value
+ */
public void setIPMAC(String value) { this.ip_mac = value; }
+ /**
+ * 璁惧IP鍦板潃
+ * @return
+ */
public String getIPAddress() { return ip_address; }
+
+ /**
+ * 璁惧IP鍦板潃
+ * @param value
+ */
public void setIPAddress(String value) { this.ip_address = value; }
+ /**
+ * 瀛愮綉鎺╃爜
+ * @return
+ */
public String getNetmask() { return netmask; }
+
+ /**
+ * 瀛愮綉鎺╃爜
+ * @param value
+ */
public void setNetmask(String value) { this.netmask = value; }
+ /**
+ * 缃戝叧IP
+ * @return
+ */
public String getIPGateway() { return ip_gateway; }
+
+ /**
+ * 缃戝叧IP
+ * @param value
+ */
public void setIPGateway(String value) { this.ip_gateway = value; }
+ /**
+ * DNS1
+ * @return
+ */
public String getDns1() { return dns1; }
+
+ /**
+ * DNS1
+ * @param value
+ */
public void setDns1(String value) { this.dns1 = value; }
+ /**
+ * DNS2
+ * @return
+ */
public String getDns2() { return dns2; }
+
+ /**
+ * DNS2
+ * @param value
+ */
public void setDns2(String value) { this.dns2 = value; }
- public VersionBean[] getVersions() { return versions; }
- public void setVersions(VersionBean[] value) { this.versions = value; }
+ public VersionBean[] getVersions() {return null; }
+ public void setVersions(VersionBean[] value) { }
+
+ /**
+ * 缃戝叧绫诲瀷
+ * @return
+ */
+ public String getGateway_type() {
+ return gateway_type;
+ }
+
+ /**
+ * 缃戝叧绫诲瀷
+ * @param gateway_type
+ */
+ public void setGateway_type(String gateway_type) {
+ this.gateway_type = gateway_type;
+ }
+
+ /**
+ * 纭欢鐗堟湰
+ * @return
+ */
+ public String getHw_version() {
+ return hw_version;
+ }
+
+ /**
+ *纭欢鐗堟湰
+ * @param
+ */
+ public void setHw_version(String hw_version) {
+ this.hw_version = hw_version;
+ }
+
+
+ /**
+ * 鍥轰欢鐗堟湰
+ * @return
+ */
+ public String getFw_version() {
+ return fw_version;
+ }
+
+ /**
+ * 鍥轰欢鐗堟湰
+ * @param fw_version
+ */
+ public void setFw_version(String fw_version) {
+ this.fw_version = fw_version;
+ }
}
public static class VersionBean implements Serializable{
--
Gitblit v1.8.0