单体电池-增加簇号

ems-system/src/main/java/com/xzzn/ems/domain/EmsDevicesSetting.java

@@ -11,7 +11,7 @@ import com.xzzn.common.annotation.Excel;
  * Modbus设备配置对象 ems_devices_setting
  *
  * @author xzzn
- * @date 2025-06-29
+ * @date 2025-07-01
  */
 public class EmsDevicesSetting extends BaseEntity
 {
@@ -86,14 +86,18 @@ public class EmsDevicesSetting extends BaseEntity
     @Excel(name = "站点id")
     private String siteId;
 
-    /** 通信状态 */
-    @Excel(name = "通信状态")
+    /** 通信状态:0-正常 1-通信中断 2-异常 */
+    @Excel(name = "通信状态:0-正常 1-通信中断 2-异常")
     private String communicationStatus;
 
     /** 设备唯一标识符 */
     @Excel(name = "设备唯一标识符")
     private String deviceId;
 
+    /** 上级设备id */
+    @Excel(name = "上级设备id")
+    private String parentId;
+
     public void setId(Long id)
     {
         this.id = id;
@@ -284,6 +288,16 @@ public class EmsDevicesSetting extends BaseEntity
         return deviceId;
     }
 
+    public void setParentId(String parentId)
+    {
+        this.parentId = parentId;
+    }
+
+    public String getParentId()
+    {
+        return parentId;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -306,6 +320,7 @@ public class EmsDevicesSetting extends BaseEntity
                 .append("siteId", getSiteId())
                 .append("communicationStatus", getCommunicationStatus())
                 .append("deviceId", getDeviceId())
+                .append("parentId", getParentId())
                 .toString();
     }
 }

ems-system/src/main/java/com/xzzn/ems/domain/vo/BatteryDataStatsListVo.java

@@ -26,6 +26,9 @@ public class BatteryDataStatsListVo {
 
     private Date updateTime;
 
+    /** 簇号 */
+    private String clusterDeviceId;
+
     public String getDeviceId() {
         return deviceId;
     }
@@ -73,4 +76,12 @@ public class BatteryDataStatsListVo {
     public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
+
+    public String getClusterDeviceId() {
+        return clusterDeviceId;
+    }
+
+    public void setClusterDeviceId(String clusterDeviceId) {
+        this.clusterDeviceId = clusterDeviceId;
+    }
 }