From 8814f3f0828e6ac652a29cc9de9f971fd55bca5b Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 07 五月 2025 14:54:42 +0800
Subject: [PATCH] 2025年05月07日14:54:39

---
 app/src/main/java/com/hdl/photovoltaic/ui/bean/MessageBean.java |  175 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 158 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/bean/MessageBean.java b/app/src/main/java/com/hdl/photovoltaic/ui/bean/MessageBean.java
index 64acebf..d21c488 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/bean/MessageBean.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/bean/MessageBean.java
@@ -2,21 +2,150 @@
 
 import java.io.Serializable;
 
+/**
+ * 璀﹀憡娑堟伅瀹炰綋
+ */
 public class MessageBean implements Serializable {
 
+    private Long msgId;//娑堟伅id
+    private String type;//FAULT:鏁呴殰,WARN:鍛婅,EVENT:浜嬩欢
+    private String title;//鏍囬
+    private String homeId;//鐢电珯id
+    private String homeName;//鐢电珯鍚嶇О
+    private String status;//UNTREATED:鏈鐞嗭紝PROCESSED:宸插鐞�
+    private Long createTime;//娑堟伅鏃堕棿(鎶ヨ鏃堕棿)
 
-    private String content;//鍐呭
-    private String homeName;//浣忓畢鍚嶇О
-    private String time;//鏃堕棿
-    private int grade;//绛夌骇
-    private boolean isRead;//鏄惁宸茬粡璇诲彇
+    private String deviceOidId;//璁惧oid id
+    private String deviceOid;//璁惧oid
+    private String deviceDesc;//璁惧澶囨敞
 
-    public String getContent() {
-        return content == null ? "" : content;
+
+    private String deviceType;//璁惧绫诲瀷(INV 锛� 閫嗗彉鍣�, BMS 锛� BMS鎺у埗鐩�, BATTERY 锛� 鐢垫睜鍗曞厓)
+    private String deviceTypeDesc;//璁惧绫诲瀷鎻忚堪
+
+
+    private String typeDesc;//绫诲瀷鎻忚堪
+    private String effectScope;//褰卞搷鑼冨洿 NO_EFFECT : 鏃犲奖鍝嶈寖鍥存姤璀�
+    private String effectScopeDesc;//褰卞搷鑼冨洿鎻忚堪
+
+    private String address;//璇︾粏鍦板潃
+
+
+    private boolean isRead;//鏄惁宸茬粡璇诲彇(true=璇诲彇)
+
+    private HouseInfoBean.Location location = new HouseInfoBean.Location();//鐢电珯鍦板潃
+
+    public String getDeviceType() {
+        return deviceType == null ? "" : deviceType;
     }
 
-    public void setContent(String content) {
-        this.content = content;
+    public void setDeviceType(String deviceType) {
+        this.deviceType = deviceType;
+    }
+
+    public String getDeviceTypeDesc() {
+        return deviceTypeDesc == null ? "" : deviceTypeDesc;
+    }
+
+    public void setDeviceTypeDesc(String deviceTypeDesc) {
+        this.deviceTypeDesc = deviceTypeDesc;
+    }
+
+    public String getDeviceOidId() {
+        return deviceOidId == null ? "" : deviceOidId;
+    }
+
+    public void setDeviceOidId(String deviceOidId) {
+        this.deviceOidId = deviceOidId;
+    }
+
+    public String getDeviceOid() {
+        return deviceOid == null ? "" : deviceOid;
+    }
+
+    public void setDeviceOid(String deviceOid) {
+        this.deviceOid = deviceOid;
+    }
+
+    public String getDeviceDesc() {
+        return deviceDesc == null ? "" : deviceDesc;
+    }
+
+    public void setDeviceDesc(String deviceDesc) {
+        this.deviceDesc = deviceDesc;
+    }
+
+    public String getTypeDesc() {
+        return typeDesc == null ? "" : typeDesc;
+    }
+
+    public void setTypeDesc(String typeDesc) {
+        this.typeDesc = typeDesc;
+    }
+
+    public String getEffectScope() {
+        return effectScope == null ? "" : effectScope;
+    }
+
+    public void setEffectScope(String effectScope) {
+        this.effectScope = effectScope;
+    }
+
+    public String getEffectScopeDesc() {
+        return effectScopeDesc == null ? "" : effectScopeDesc;
+    }
+
+    public void setEffectScopeDesc(String effectScopeDesc) {
+        this.effectScopeDesc = effectScopeDesc;
+    }
+
+    public String getAddress() {
+        return address == null ? "" : address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public HouseInfoBean.Location getLocation() {
+        return location;
+    }
+
+    public void setLocation(HouseInfoBean.Location location) {
+        this.location = location;
+    }
+
+
+    public Long getMsgId() {
+        return msgId;
+    }
+
+    public void setMsgId(Long msgId) {
+        this.msgId = msgId;
+    }
+
+    public String getType() {
+        return type == null ? "" : type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getTitle() {
+        return title == null ? "" : title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getHomeId() {
+        return homeId == null ? "" : homeId;
+    }
+
+    public void setHomeId(String homeId) {
+        this.homeId = homeId;
     }
 
     public String getHomeName() {
@@ -27,20 +156,20 @@
         this.homeName = homeName;
     }
 
-    public String getTime() {
-        return time == null ? "" : time;
+    public String getStatus() {
+        return status == null ? "" : status;
     }
 
-    public void setTime(String time) {
-        this.time = time;
+    public void setStatus(String status) {
+        this.status = status;
     }
 
-    public int getGrade() {
-        return grade;
+    public Long getCreateTime() {
+        return createTime;
     }
 
-    public void setGrade(int grade) {
-        this.grade = grade;
+    public void setCreateTime(Long createTime) {
+        this.createTime = createTime;
     }
 
 
@@ -53,4 +182,16 @@
     }
 
 
+    /**
+     * 鐢电珯瀹屾暣鐨勫湴鍧�
+     *
+     * @return -
+     */
+    public String getLocationAddress() {
+
+        return location.getNationName() + ">" + location.getProvinceName() + ">" + location.getCityName() + ">" + address;
+
+    }
+
+
 }

--
Gitblit v1.8.0