From 5bac3017277a90d56ba3e653f380d74025bb7a31 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 24 三月 2026 16:04:11 +0800
Subject: [PATCH] 2026年03月24日16:04:09

---
 app/src/main/java/com/hdl/photovoltaic/ui/bean/CloudInverterDeviceBean.java |   73 +++++++++++++++++++++++++++++++++++-
 1 files changed, 71 insertions(+), 2 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 4e5ee13..63c0775 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
@@ -2,6 +2,8 @@
 
 import android.text.TextUtils;
 
+import com.hdl.sdk.link.core.bean.gateway.FwVersionBean;
+
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -25,7 +27,12 @@
     private String sid;
     private String oid;
     private String omodel;//璁惧鍨嬪彿
+    private String deviceModel;//璁惧鍨嬪彿锛坆ms璁惧锛�
+    private String deviceOidId;//璁惧浜戠涓妎id锛坆ms璁惧锛�
+
     private String osn;//璁惧sn(mac)
+
+    private String mac;//锛坆ms璁惧mac锛�,鍚庨潰缁熶竴鏀规垚mac
     private String powerPvNow;//鍙戠數鍔熺巼
     private String totalElectricityPvToday;//浠婃棩鍙戠數閲�
     private String systemStatusDesc;//鐘舵��
@@ -48,6 +55,49 @@
     private String localSecret;//鎵�灞炵數绔欑殑鏈湴瀵嗛挜
 
     private List<FwVersionBean> fwVersion = new ArrayList<>();//BMS璁惧鎵嶆湁鐨勫浐浠剁増鏈�
+    private String chargeToday;//浠婃棩鍏呯數閲忥紝BMS璁惧鎵嶆湁鐨�
+    private String dischargeToday;//浠婃棩鏀剧數閲忥紝BMS璁惧鎵嶆湁鐨�
+
+    /**
+     * 浠婃棩鍏呯數閲忥紝BMS璁惧鎵嶆湁鐨�
+     * @return
+     */
+    public String getChargeToday() {
+        return chargeToday==null ? "" : chargeToday;
+    }
+
+
+    public void setChargeToday(String chargeToday) {
+        this.chargeToday = chargeToday;
+    }
+    /**
+     * 浠婃棩鏀剧數閲忥紝BMS璁惧鎵嶆湁鐨�
+     * @param
+     */
+    public String getDischargeToday() {
+        return dischargeToday==null ? "" : dischargeToday;
+    }
+
+    public void setDischargeToday(String dischargeToday) {
+        this.dischargeToday = dischargeToday;
+    }
+
+    public String getDeviceModel() {
+        return deviceModel == null ? "" : deviceModel;
+    }
+
+    public void setDeviceModel(String deviceModel) {
+        this.deviceModel = deviceModel;
+    }
+
+    public String getDeviceOidId() {
+        return deviceOidId == null ? "" : deviceOidId;
+    }
+
+    public void setDeviceOidId(String deviceOidId) {
+        this.deviceOidId = deviceOidId;
+    }
+
     public List<FwVersionBean> getFwVersion() {
         return fwVersion;
     }
@@ -190,20 +240,38 @@
         this.oid = oid;
     }
 
+    /**
+     * 鑾峰彇璁惧鍨嬪彿宸插吋鐢˙MS璁惧鎯呭喌(bms璁惧浣跨敤鏄疍eviceModel瀛楁锛屽叾瀹冭澶嘜model瀛楁) 骞冲彴璇村悗闈細缁熶竴瀛楁
+     *
+     * @return 璁惧鍨嬪彿
+     */
     public String getOmodel() {
-        return omodel == null ? "" : omodel;
+        return TextUtils.isEmpty(omodel) ? getDeviceModel() : omodel;
     }
 
     public void setOmodel(String omodel) {
         this.omodel = omodel;
     }
 
+    /**
+     * 鑾峰彇璁惧sn(mac)宸插吋鐢˙MS璁惧鎯呭喌(bms璁惧浣跨敤鏄痬ac瀛楁锛屽叾瀹冭澶噊sn瀛楁) 骞冲彴璇村悗闈細缁熶竴瀛楁
+     *
+     * @return 璁惧mac
+     */
     public String getOsn() {
-        return osn == null ? "" : osn;
+        return TextUtils.isEmpty(osn) ? getMac() : osn;
     }
 
     public void setOsn(String osn) {
         this.osn = osn;
+    }
+
+    public String getMac() {
+        return mac == null ? "" : mac;
+    }
+
+    public void setMac(String mac) {
+        this.mac = mac;
     }
 
     public String getPowerPvNow() {
@@ -318,6 +386,7 @@
         this.localSecret = localSecret;
     }
 
+
     /**
      * 鎷间綇瀹呭湴鍧�
      *

--
Gitblit v1.8.0