From 3b47201d878ba8ff973b84baf15942475688e964 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期五, 15 十二月 2023 16:04:28 +0800
Subject: [PATCH] 合并第一个版本
---
HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/bean/gateway/GatewayBean.java | 151 ++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 140 insertions(+), 11 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..a16c7fd 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;
/**
* 缃戝叧鍨嬪彿
*/
@@ -83,13 +82,45 @@
private String sid;
+
+ private String spk = "energy.hdl_inverter";
+
+
+ private String systemStatusDesc;//浜戠-鐘舵��
+
+
+ private String hwVersion;//浜戠-杞欢鐗堟湰鍙�
+ private String categorySecondName;//浜戠-璁惧绫诲瀷(浜у搧浜岀骇鍒嗙被鍚嶇О)
+
/**
* 璁惧鏉ユ簮(鑷畾涔�:0=琛ㄧず缃戝叧;1=琛ㄧず骞冲彴)
*/
private String src;
+ //瀛愮綉鍙�/璁惧鍙�
+ private String addresses;
+
+ //缃戝叧鐘舵��:1:寰呮満,2:杩炴帴涓�,3:鏁呴殰,4:杩愯,5:绂荤嚎
+ private int deviceStatus;
+
+ private String powerPvNow;//鍙戠數鍔熺巼
+ private String totalElectricityPvToday;//浠婃棩鍙戠數閲�
+
+ /**
+ * 鎴块棿褰掑睘
+ */
+ private List<String> uids = new ArrayList<>();
+
+ public List<String> getUids() {
+ return uids;
+ }
+
+ public void setUids(List<String> uids) {
+ this.uids = uids;
+ }
+
public String getSrc() {
- return src==null?"":this.src;
+ return src == null ? "" : this.src;
}
public void setSrc(String src) {
@@ -119,25 +150,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 +189,8 @@
public void setTemplateSettingFlag(boolean templateSettingFlag) {
this.templateSettingFlag = templateSettingFlag;
}
- private String templateAddr ;
+
+ private String templateAddr;
public String getTemplateAddr() {
return templateAddr == null ? "" : templateAddr;
@@ -164,7 +199,6 @@
public void setTemplateAddr(String templateAddr) {
this.templateAddr = templateAddr;
}
-
/**
@@ -176,6 +210,7 @@
/**
* 缃戝叧Mac
+ *
* @return
*/
@NonNull
@@ -189,6 +224,7 @@
public void setDevice_mac(String device_mac) {
this.device_mac = device_mac;
}
+
/**
* 缃戝叧Id
*/
@@ -203,12 +239,13 @@
public void setGatewayId(String gatewayId) {
this.gatewayId = gatewayId;
}
+
/**
* 缃戝叧绫诲瀷
*/
@NonNull
public String getGatewayType() {
- return gatewayType == null ? "" : gatewayType;
+ return gatewayType == null ? gateway_type == null ? "" : gateway_type : gatewayType;
}
/**
@@ -226,6 +263,7 @@
public void setGateway_type(String gateway_type) {
this.gateway_type = gateway_type;
}
+
/**
* 缃戝叧Oid
*/
@@ -240,6 +278,7 @@
public void setOid(String oid) {
this.oid = oid;
}
+
/**
* IP鍦板潃
*/
@@ -254,6 +293,7 @@
public void setIp_address(String ip_address) {
this.ip_address = ip_address;
}
+
/**
* 杩炴帴鐨勭綉鍏崇被鍨� LAN WIFI
*/
@@ -268,6 +308,7 @@
public void setAccess_mode(String access_mode) {
this.access_mode = access_mode;
}
+
/**
* 鏄惁涓荤綉鍏� true false
*/
@@ -281,18 +322,21 @@
public void setMaster(String master) {
this.master = master;
}
+
/**
* 鏄惁鍔犲瘑
*/
public boolean getIsLocalEncrypt() {
return isLocalEncrypt;
}
+
/**
* 鏄惁鍔犲瘑
*/
public void setIsLocalEncrypt(boolean localEncrypt) {
isLocalEncrypt = localEncrypt;
}
+
/**
* 鑾峰彇浣忓畢Id
*/
@@ -310,23 +354,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 +384,10 @@
/*
- * 妯℃澘鏍囪 wxr
- * */
+ * 妯℃澘鏍囪 wxr
+ * */
private boolean templateFlag = false;
+
public boolean isLocalEncrypt() {
return isLocalEncrypt;
}
@@ -346,4 +395,84 @@
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;
+ }
+
+
+ public String getAddresses() {
+ return addresses == null ? "" : addresses;
+ }
+
+
+ public void setAddresses(String addresses) {
+ this.addresses = addresses;
+ }
+
+
+ public int getDeviceStatus() {
+ return deviceStatus;
+ }
+
+
+ public void setDeviceStatus(int deviceStatus) {
+ this.deviceStatus = deviceStatus;
+ }
+
+
+ public String getPowerPvNow() {
+ return powerPvNow == null ? "" : powerPvNow;
+ }
+
+
+ public void setPowerPvNow(String powerPvNow) {
+ this.powerPvNow = powerPvNow;
+ }
+
+
+ public String getTotalElectricityPvToday() {
+ return totalElectricityPvToday == null ? "" : totalElectricityPvToday;
+ }
+
+
+ public void setTotalElectricityPvToday(String totalElectricityPvToday) {
+ this.totalElectricityPvToday = totalElectricityPvToday;
+ }
+
+
+ public String getSpk() {
+ return spk == null ? "" : spk;
+ }
+
+
+ public void setSpk(String spk) {
+ this.spk = spk;
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0