From 3eb60f615d621a3acb72a17f14e011b0d1ef749e Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 21 五月 2024 20:33:25 +0800
Subject: [PATCH] 2024年05月21日20:33:18
---
app/src/main/java/com/hdl/photovoltaic/ui/bean/CloudInverterDeviceBean.java | 41 ++++++++++++++++++++++++-----------------
1 files changed, 24 insertions(+), 17 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/bean/CloudInverterDeviceBean.java b/app/src/main/java/com/hdl/photovoltaic/ui/bean/CloudInverterDeviceBean.java
index b86b787..d12f38d 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/bean/CloudInverterDeviceBean.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/bean/CloudInverterDeviceBean.java
@@ -1,9 +1,14 @@
package com.hdl.photovoltaic.ui.bean;
import java.io.Serializable;
+import java.util.ArrayList;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
+/**
+ * 浜戠閫嗗彉鍣ㄥ疄浣撶被
+ */
public class CloudInverterDeviceBean implements Serializable {
@@ -13,7 +18,6 @@
*/
private boolean online;
private String gatewayId;//缃戝叧Id
- private String gatewayName;//缃戝叧鍚嶇О
private String deviceId;//璁惧id
private String name;//璁惧鍚嶇О
private String spk;
@@ -28,14 +32,16 @@
private String inv;//inv鐘舵��
private int deviceStatus;//1:寰呮満,2:杩炴帴涓�,3:鏁呴殰,4:杩愯,5:绂荤嚎
- private String addresses;
- private Map<String, String> status;
+ private String addresses;//瀛愮綉鍙�/璁惧鍙�
+ private List<DeviceAttributeBean> status;
private String hwVersion;//杞欢鐗堟湰鍙�
private String categorySecondName;//璁惧绫诲瀷(浜у搧浜岀骇鍒嗙被鍚嶇О)
+ private String deviceType;//(璁惧绫诲瀷INV 锛� 閫嗗彉鍣�,BMS 锛� BMS鎺у埗鐩�,BATTERY 锛� 鐢垫睜鍗曞厓)
+
public String getSystemStatusDesc() {
- return systemStatusDesc== null ? "" :systemStatusDesc;
+ return systemStatusDesc == null ? "" : systemStatusDesc;
}
public void setSystemStatusDesc(String systemStatusDesc) {
@@ -43,7 +49,7 @@
}
public String getHwVersion() {
- return hwVersion== null ? "" :hwVersion;
+ return hwVersion == null ? "" : hwVersion;
}
public void setHwVersion(String hwVersion) {
@@ -51,7 +57,7 @@
}
public String getCategorySecondName() {
- return categorySecondName== null ? "" :categorySecondName;
+ return categorySecondName == null ? "" : categorySecondName;
}
public void setCategorySecondName(String categorySecondName) {
@@ -67,13 +73,6 @@
this.gatewayId = gatewayId;
}
- public String getGatewayName() {
- return gatewayName == null ? "" : gatewayName;
- }
-
- public void setGatewayName(String gatewayName) {
- this.gatewayName = gatewayName;
- }
public String getDeviceId() {
return deviceId == null ? "" : deviceId;
@@ -132,7 +131,7 @@
}
public String getOsn() {
- return osn == null ? "" : osn;
+ return osn == null ? "" : "SN:" + osn;
}
public void setOsn(String osn) {
@@ -179,11 +178,11 @@
this.addresses = addresses;
}
- public Map<String, String> getStatus() {
- return status == null ? new HashMap<>() : status;
+ public List<DeviceAttributeBean> getStatus() {
+ return status == null ? new ArrayList<>() : status;
}
- public void setStatus(Map<String, String> status) {
+ public void setStatus(List<DeviceAttributeBean> status) {
this.status = status;
}
@@ -194,4 +193,12 @@
public void setOnline(boolean online) {
this.online = online;
}
+
+ public String getDeviceType() {
+ return deviceType == null ? "" : deviceType;
+ }
+
+ public void setDeviceType(String deviceType) {
+ this.deviceType = deviceType;
+ }
}
--
Gitblit v1.8.0