From e10685706d2bacf0da27b8393c04a1f7a4df2bad Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期一, 09 十月 2023 18:06:52 +0800
Subject: [PATCH] 2023年10月09日18:06:49
---
app/src/main/java/com/hdl/photovoltaic/ui/bean/CloudInverterDeviceBean.java | 28 +++++++++++++---------------
1 files changed, 13 insertions(+), 15 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..1203f6a 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,7 +1,9 @@
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 +15,6 @@
*/
private boolean online;
private String gatewayId;//缃戝叧Id
- private String gatewayName;//缃戝叧鍚嶇О
private String deviceId;//璁惧id
private String name;//璁惧鍚嶇О
private String spk;
@@ -29,13 +30,15 @@
private String inv;//inv鐘舵��
private int deviceStatus;//1:寰呮満,2:杩炴帴涓�,3:鏁呴殰,4:杩愯,5:绂荤嚎
private String addresses;
- private Map<String, String> status;
+ private List<DeviceAttributeBean> status;
private String hwVersion;//杞欢鐗堟湰鍙�
private String categorySecondName;//璁惧绫诲瀷(浜у搧浜岀骇鍒嗙被鍚嶇О)
+
+
public String getSystemStatusDesc() {
- return systemStatusDesc== null ? "" :systemStatusDesc;
+ return systemStatusDesc == null ? "" : systemStatusDesc;
}
public void setSystemStatusDesc(String systemStatusDesc) {
@@ -43,7 +46,7 @@
}
public String getHwVersion() {
- return hwVersion== null ? "" :hwVersion;
+ return hwVersion == null ? "" : hwVersion;
}
public void setHwVersion(String hwVersion) {
@@ -51,7 +54,7 @@
}
public String getCategorySecondName() {
- return categorySecondName== null ? "" :categorySecondName;
+ return categorySecondName == null ? "" : categorySecondName;
}
public void setCategorySecondName(String categorySecondName) {
@@ -67,13 +70,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;
@@ -179,11 +175,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 +190,6 @@
public void setOnline(boolean online) {
this.online = online;
}
+
+
}
--
Gitblit v1.8.0