From b9cc7390e8e8ce64c41c26fb369c98ce669d660c Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 07 五月 2025 15:02:30 +0800
Subject: [PATCH] Merge branch '1.2.0'
---
sdk/src/main/java/com/hdl/sdk/link/core/bean/gateway/GatewayBean.java | 32 +++++++++++++++++++++++++++-----
1 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/sdk/src/main/java/com/hdl/sdk/link/core/bean/gateway/GatewayBean.java b/sdk/src/main/java/com/hdl/sdk/link/core/bean/gateway/GatewayBean.java
index b5fdba5..665ba99 100644
--- a/sdk/src/main/java/com/hdl/sdk/link/core/bean/gateway/GatewayBean.java
+++ b/sdk/src/main/java/com/hdl/sdk/link/core/bean/gateway/GatewayBean.java
@@ -54,9 +54,15 @@
*/
private String access_mode;
/**
- * 鏄惁涓荤綉鍏� true false
+ * 鏄惁涓荤綉鍏� true false,鐢ㄤ簬link缃戦┍鍔�
*/
private String master;
+
+
+ /**
+ * 鏄惁涓荤綉鍏� true false 鐢ㄤ簬鍏変紡椹卞姩
+ */
+ private boolean ogMaster;//绂荤綉閫嗗彉鍣ㄦ墠杩斿洖
/**
* 鏄惁鍔犲瘑
*/
@@ -82,8 +88,7 @@
private String sid;
-
- private String spk = "energy.hdl_inverter";
+ private String spk = "";
private String systemStatusDesc;//浜戠-鐘舵��
@@ -108,14 +113,32 @@
private String deviceType;
private String outputActivePower;//閫嗗彉鍣ㄨ緭鍑烘湁鍔熷姛鐜�
+ public String getWorkStatusDesc() {
+ return workStatusDesc==null?"":this.workStatusDesc;
+ }
+
+ public void setWorkStatusDesc(String workStatusDesc) {
+ this.workStatusDesc = workStatusDesc;
+ }
+
+ private String workStatusDesc;//宸ヤ綔鐘舵�侊紙璐熻浇涓績璁惧锛�
+
/**
* 鎴块棿褰掑睘
*/
private List<String> uids = new ArrayList<>();
+ public boolean isOgMaster() {
+ return ogMaster;
+ }
+
+ public void setOgMaster(boolean ogMaster) {
+ this.ogMaster = ogMaster;
+ }
public List<String> getUids() {
return uids;
}
+
public void setUids(List<String> uids) {
this.uids = uids;
@@ -399,7 +422,6 @@
}
-
public String getSystemStatusDesc() {
return systemStatusDesc == null ? "" : systemStatusDesc;
}
@@ -479,7 +501,7 @@
}
public String getDeviceType() {
- return deviceType==null?"":deviceType;
+ return deviceType == null ? "" : deviceType;
}
public void setDeviceType(String deviceType) {
--
Gitblit v1.8.0