From 5e43612bb0afc1202fe802d4307b02cdfc05756f Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期六, 07 十月 2023 17:32:42 +0800
Subject: [PATCH] 2023年10月07日17:32:35

---
 HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/bean/gateway/GatewayBean.java |   68 +++++++++++++++++++++++++++++-----
 1 files changed, 58 insertions(+), 10 deletions(-)

diff --git a/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/bean/gateway/GatewayBean.java b/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/bean/gateway/GatewayBean.java
index df81b6b..9bb9383 100644
--- a/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/bean/gateway/GatewayBean.java
+++ b/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/bean/gateway/GatewayBean.java
@@ -15,12 +15,11 @@
 public class GatewayBean implements Serializable {
 
 
-
     /**
      * true-鍦ㄧ嚎
      * false-绂荤嚎
      */
-    private boolean online=true;
+    private boolean online = true;
     /**
      * 缃戝叧鍨嬪彿
      */
@@ -88,8 +87,14 @@
      */
     private String src;
 
+    private String systemStatusDesc;//浜戠-鐘舵��
+
+    private String hwVersion;//浜戠-杞欢鐗堟湰鍙�
+    private String categorySecondName;//浜戠-璁惧绫诲瀷(浜у搧浜岀骇鍒嗙被鍚嶇О)
+
+
     public String getSrc() {
-        return src==null?"":this.src;
+        return src == null ? "" : this.src;
     }
 
     public void setSrc(String src) {
@@ -119,25 +124,28 @@
     public void setOnline(boolean online) {
         this.online = online;
     }
+
     /**
      * 缃戝叧鍨嬪彿
      */
     public String getDevice_model() {
         return device_model == null ? "" : device_model;
     }
+
     /**
      * 缃戝叧鍨嬪彿
      */
     public void setDevice_model(String device_model) {
         this.device_model = device_model;
     }
+
     /**
      * 缃戝叧澶囨敞
      */
     public String getDevice_name() {
-        if(TextUtils.isEmpty(device_name)){
+        if (TextUtils.isEmpty(device_name)) {
             return getDevice_model();
-        }else {
+        } else {
 
         }
         return device_name;
@@ -155,7 +163,8 @@
     public void setTemplateSettingFlag(boolean templateSettingFlag) {
         this.templateSettingFlag = templateSettingFlag;
     }
-    private String templateAddr ;
+
+    private String templateAddr;
 
     public String getTemplateAddr() {
         return templateAddr == null ? "" : templateAddr;
@@ -164,7 +173,6 @@
     public void setTemplateAddr(String templateAddr) {
         this.templateAddr = templateAddr;
     }
-
 
 
     /**
@@ -176,6 +184,7 @@
 
     /**
      * 缃戝叧Mac
+     *
      * @return
      */
     @NonNull
@@ -189,6 +198,7 @@
     public void setDevice_mac(String device_mac) {
         this.device_mac = device_mac;
     }
+
     /**
      * 缃戝叧Id
      */
@@ -203,6 +213,7 @@
     public void setGatewayId(String gatewayId) {
         this.gatewayId = gatewayId;
     }
+
     /**
      * 缃戝叧绫诲瀷
      */
@@ -226,6 +237,7 @@
     public void setGateway_type(String gateway_type) {
         this.gateway_type = gateway_type;
     }
+
     /**
      * 缃戝叧Oid
      */
@@ -240,6 +252,7 @@
     public void setOid(String oid) {
         this.oid = oid;
     }
+
     /**
      * IP鍦板潃
      */
@@ -254,6 +267,7 @@
     public void setIp_address(String ip_address) {
         this.ip_address = ip_address;
     }
+
     /**
      * 杩炴帴鐨勭綉鍏崇被鍨� LAN WIFI
      */
@@ -268,6 +282,7 @@
     public void setAccess_mode(String access_mode) {
         this.access_mode = access_mode;
     }
+
     /**
      * 鏄惁涓荤綉鍏� true false
      */
@@ -281,18 +296,21 @@
     public void setMaster(String master) {
         this.master = master;
     }
+
     /**
      * 鏄惁鍔犲瘑
      */
     public boolean getIsLocalEncrypt() {
         return isLocalEncrypt;
     }
+
     /**
      * 鏄惁鍔犲瘑
      */
     public void setIsLocalEncrypt(boolean localEncrypt) {
         isLocalEncrypt = localEncrypt;
     }
+
     /**
      * 鑾峰彇浣忓畢Id
      */
@@ -310,23 +328,27 @@
 
     /**
      * 鑾峰彇姣背娉id
+     *
      * @return sid
      */
     public String getSid() {
-        return sid==null?"":this.sid;
+        return sid == null ? "" : this.sid;
     }
+
     /**
      * 璁剧疆姣背娉id
      */
     public void setSid(String sid) {
         this.sid = sid;
     }
+
     /**
      * 鏄惁鏈湴缃戝叧 true false
      */
     public void setIsLocalGateWay(boolean isLocalGateWay) {
         this.isLocalGateWay = isLocalGateWay;
     }
+
     /**
      * 鑾峰彇缃戝叧鏄惁鏈湴缃戝叧
      */
@@ -336,9 +358,10 @@
 
 
     /*
-    * 妯℃澘鏍囪 wxr
-    * */
+     * 妯℃澘鏍囪 wxr
+     * */
     private boolean templateFlag = false;
+
     public boolean isLocalEncrypt() {
         return isLocalEncrypt;
     }
@@ -346,4 +369,29 @@
     public void setLocalEncrypt(boolean localEncrypt) {
         isLocalEncrypt = localEncrypt;
     }
+
+
+    public String getSystemStatusDesc() {
+        return systemStatusDesc == null ? "" : systemStatusDesc;
+    }
+
+    public void setSystemStatusDesc(String systemStatusDesc) {
+        this.systemStatusDesc = systemStatusDesc;
+    }
+
+    public String getHwVersion() {
+        return hwVersion == null ? "" : hwVersion;
+    }
+
+    public void setHwVersion(String hwVersion) {
+        this.hwVersion = hwVersion;
+    }
+
+    public String getCategorySecondName() {
+        return categorySecondName == null ? "" : categorySecondName;
+    }
+
+    public void setCategorySecondName(String categorySecondName) {
+        this.categorySecondName = categorySecondName;
+    }
 }
\ No newline at end of file

--
Gitblit v1.8.0