From 50101e1b1c152c5346a6f4e63a7c6db98809e4d9 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 22 五月 2024 15:02:42 +0800
Subject: [PATCH] 2024年05月22日15:02:36
---
app/src/main/java/com/hdl/photovoltaic/ui/bean/CloudInverterDeviceBean.java | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 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 f60369f..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
@@ -6,6 +6,9 @@
import java.util.List;
import java.util.Map;
+/**
+ * 浜戠閫嗗彉鍣ㄥ疄浣撶被
+ */
public class CloudInverterDeviceBean implements Serializable {
@@ -15,7 +18,6 @@
*/
private boolean online;
private String gatewayId;//缃戝叧Id
- private String gatewayName;//缃戝叧鍚嶇О
private String deviceId;//璁惧id
private String name;//璁惧鍚嶇О
private String spk;
@@ -30,11 +32,13 @@
private String inv;//inv鐘舵��
private int deviceStatus;//1:寰呮満,2:杩炴帴涓�,3:鏁呴殰,4:杩愯,5:绂荤嚎
- private String addresses;
+ 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;
@@ -69,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;
@@ -134,7 +131,7 @@
}
public String getOsn() {
- return osn == null ? "" : osn;
+ return osn == null ? "" : "SN:" + osn;
}
public void setOsn(String osn) {
@@ -197,5 +194,11 @@
this.online = online;
}
+ public String getDeviceType() {
+ return deviceType == null ? "" : deviceType;
+ }
+ public void setDeviceType(String deviceType) {
+ this.deviceType = deviceType;
+ }
}
--
Gitblit v1.8.0