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 | 89 ++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 85 insertions(+), 4 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 9bb9383..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 @@ -82,16 +82,42 @@ 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 systemStatusDesc;//浜戠-鐘舵�� + //瀛愮綉鍙�/璁惧鍙� + private String addresses; - private String hwVersion;//浜戠-杞欢鐗堟湰鍙� - private String categorySecondName;//浜戠-璁惧绫诲瀷(浜у搧浜岀骇鍒嗙被鍚嶇О) + //缃戝叧鐘舵��: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; @@ -219,7 +245,7 @@ */ @NonNull public String getGatewayType() { - return gatewayType == null ? "" : gatewayType; + return gatewayType == null ? gateway_type == null ? "" : gateway_type : gatewayType; } /** @@ -371,21 +397,26 @@ } + 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; @@ -394,4 +425,54 @@ 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