diff --git a/ems-system/src/main/java/com/xzzn/ems/domain/EmsBatteryStack.java b/ems-system/src/main/java/com/xzzn/ems/domain/EmsBatteryStack.java
index 82409b9..989c612 100644
--- a/ems-system/src/main/java/com/xzzn/ems/domain/EmsBatteryStack.java
+++ b/ems-system/src/main/java/com/xzzn/ems/domain/EmsBatteryStack.java
@@ -11,7 +11,7 @@ import com.xzzn.common.annotation.Excel;
  * 电池堆数据对象 ems_battery_stack
  *
  * @author xzzn
- * @date 2025-06-29
+ * @date 2025-07-02
  */
 public class EmsBatteryStack extends BaseEntity
 {
@@ -20,193 +20,173 @@ public class EmsBatteryStack extends BaseEntity
     /**  */
     private Long id;
 
-    /** 工作状态 */
-    @Excel(name = "工作状态")
+    /** 工作状态：0-正常 1-异常 2-停止 */
+    @Excel(name = "工作状态：0-正常 1-异常 2-停止")
     private String workStatus;
 
-    /** 与PCS通信状态 */
-    @Excel(name = "与PCS通信状态")
+    /** 与PCS通信状态：0-正常 1-通信中断 2-异常 */
+    @Excel(name = "与PCS通信状态：0-正常 1-通信中断 2-异常")
     private String pcsCommunicationStatus;
 
-    /** 与EMS通信状态 */
-    @Excel(name = "与EMS通信状态")
+    /** 与EMS通信状态：0-正常 1-通信中断 2-异常 */
+    @Excel(name = "与EMS通信状态：0-正常 1-通信中断 2-异常")
     private String emsCommunicationStatus;
 
-    /** 电池堆总电压 (V) */
-    @Excel(name = "电池堆总电压 (V)")
-    private BigDecimal totalVoltage;
+    /** 电操状态 */
+    @Excel(name = "电操状态")
+    private String operationStatus;
 
-    /** 可充电量 (kWh) */
-    @Excel(name = "可充电量 (kWh)")
-    private BigDecimal chargeableCapacity;
+    /** 电池堆电压/V */
+    @Excel(name = "电池堆电压/V")
+    private BigDecimal stackVoltage;
 
-    /** 累计充电量 (kWh) */
-    @Excel(name = "累计充电量 (kWh)")
-    private BigDecimal totalChargedCapacity;
+    /** 电池堆电流/A */
+    @Excel(name = "电池堆电流/A")
+    private BigDecimal stackCurrent;
 
-    /** 电池堆总电流 (A) */
-    @Excel(name = "电池堆总电流 (A)")
-    private BigDecimal totalCurrent;
+    /** 电池堆SOC/% */
+    @Excel(name = "电池堆SOC/%")
+    private BigDecimal stackSoc;
 
-    /** 可放电量 (kWh) */
-    @Excel(name = "可放电量 (kWh)")
-    private BigDecimal dischargeableCapacity;
+    /** 电池堆SOH/% */
+    @Excel(name = "电池堆SOH/%")
+    private BigDecimal stackSoh;
 
-    /** 累计放电量 (kWh) */
-    @Excel(name = "累计放电量 (kWh)")
-    private BigDecimal totalDischargedCapacity;
-
-    /** SOH (%) */
-    @Excel(name = "SOH (%)")
-    private BigDecimal soh;
-
-    /** 平均温度 (℃) */
-    @Excel(name = "平均温度 (℃)")
-    private BigDecimal averageTemperature;
-
-    /** 绝缘电阻 (Ω) */
-    @Excel(name = "绝缘电阻 (Ω)")
-    private BigDecimal insulationResistance;
-
-    /** 当前SOC (%) */
-    @Excel(name = "当前SOC (%)")
-    private BigDecimal currentSoc;
-
-    /** 站点id */
-    @Excel(name = "站点id")
-    private String siteId;
-
-    /** 设备唯一标识符 */
-    @Excel(name = "设备唯一标识符")
-    private String deviceId;
-
-    /** 允许充电最大功率 */
-    @Excel(name = "允许充电最大功率")
-    private BigDecimal maxAllowedChargePower;
-
-    /** 允许放电最大功率 */
-    @Excel(name = "允许放电最大功率")
-    private BigDecimal maxAllowedDischargePower;
-
-    /** 允许充电最大电压 */
-    @Excel(name = "允许充电最大电压")
-    private BigDecimal maxAllowedChargeVoltage;
-
-    /** 允许放电最大电压 */
-    @Excel(name = "允许放电最大电压")
-    private BigDecimal maxAllowedDischargeVoltage;
-
-    /** 允许充电最大电流 */
-    @Excel(name = "允许充电最大电流")
-    private BigDecimal maxAllowedChargeCurrent;
-
-    /** 允许放电最大电流 */
-    @Excel(name = "允许放电最大电流")
-    private BigDecimal maxAllowedDischargeCurrent;
-
-    /** 组电压 */
-    @Excel(name = "组电压")
-    private BigDecimal batteryPackVoltage;
-
-    /** 组电流 */
-    @Excel(name = "组电流")
-    private BigDecimal batteryPackCurrent;
-
-    /** 模块温度 */
-    @Excel(name = "模块温度")
-    private BigDecimal batteryPackTemp;
-
-    /** 组SOC */
-    @Excel(name = "组SOC")
-    private BigDecimal batteryPackSoc;
-
-    /** 组SOH */
-    @Excel(name = "组SOH")
-    private BigDecimal batteryPackSoh;
-
-    /** 组绝缘电阻 */
-    @Excel(name = "组绝缘电阻")
-    private BigDecimal batteryPackInsulationResistance;
-
-    /** 平均单体电压 */
-    @Excel(name = "平均单体电压")
-    private BigDecimal avgCellVoltage;
-
-    /** 平均单体温度 */
-    @Excel(name = "平均单体温度")
-    private BigDecimal avgCellTemp;
-
-    /** 最高单体电压 */
-    @Excel(name = "最高单体电压")
+    /** 最高电池电压/V */
+    @Excel(name = "最高电池电压/V")
     private BigDecimal maxCellVoltage;
 
-    /** 最高单体电压对应点号 */
-    @Excel(name = "最高单体电压对应点号")
-    private Long maxCellVoltageId;
+    /** 最高电池电压组号 */
+    @Excel(name = "最高电池电压组号")
+    private Long maxVoltageGroupId;
 
-    /** 最低单体电压 */
-    @Excel(name = "最低单体电压")
+    /** 高电压电池所在组中的点号 */
+    @Excel(name = "高电压电池所在组中的点号")
+    private Long maxVoltageCellId;
+
+    /** 最低电池电压/V */
+    @Excel(name = "最低电池电压/V")
     private BigDecimal minCellVoltage;
 
-    /** 最低单体电压对应点号 */
-    @Excel(name = "最低单体电压对应点号")
-    private Long minCellVoltageId;
+    /** 最低电池电压组号 */
+    @Excel(name = "最低电池电压组号")
+    private Long minVoltageGroupId;
 
-    /** 最高单体温度 */
-    @Excel(name = "最高单体温度")
+    /** 最低电压电池所在组中的点号 */
+    @Excel(name = "最低电压电池所在组中的点号")
+    private Long minVoltageCellId;
+
+    /** 最高电池温度/℃ */
+    @Excel(name = "最高电池温度/℃")
     private BigDecimal maxCellTemp;
 
-    /** 最高单体温度对应点号 */
-    @Excel(name = "最高单体温度对应点号")
-    private Long maxCellTempId;
+    /** 最高温度电池组号 */
+    @Excel(name = "最高温度电池组号")
+    private Long maxTempGroupId;
 
-    /** 最低单体温度 */
-    @Excel(name = "最低单体温度")
+    /** 最高温度电池所在组中的点号 */
+    @Excel(name = "最高温度电池所在组中的点号")
+    private Long maxTempCellId;
+
+    /** 最低电池温度/℃ */
+    @Excel(name = "最低电池温度/℃")
     private BigDecimal minCellTemp;
 
-    /** 最低单体温度对应点号 */
-    @Excel(name = "最低单体温度对应点号")
-    private Long minCellTempId;
+    /** 最低电池温度组号 */
+    @Excel(name = "最低电池温度组号")
+    private Long minTempGroupId;
 
-    /** 最高单体SOC */
-    @Excel(name = "最高单体SOC")
-    private BigDecimal maxCellSoc;
+    /** 最低温度电池所在组中的点号 */
+    @Excel(name = "最低温度电池所在组中的点号")
+    private Long minTempCellId;
 
-    /** 最高单体SOC对应点号 */
-    @Excel(name = "最高单体SOC对应点号")
-    private Long maxCellSocId;
+    /** 堆累计充电电量/kWh */
+    @Excel(name = "堆累计充电电量/kWh")
+    private BigDecimal totalChargeCapacity;
 
-    /** 最低单体SOC */
-    @Excel(name = "最低单体SOC")
-    private BigDecimal minCellSoc;
+    /** 堆累计放电电量/kWh */
+    @Excel(name = "堆累计放电电量/kWh")
+    private BigDecimal totalDischargeCapacity;
 
-    /** 最低单体SOC对应点号 */
-    @Excel(name = "最低单体SOC对应点号")
-    private Long minCellSocId;
+    /** 堆单次累计充电电量/kWh */
+    @Excel(name = "堆单次累计充电电量/kWh")
+    private BigDecimal sessionChargeCapacity;
 
-    /** 最高单体SOH */
-    @Excel(name = "最高单体SOH")
-    private BigDecimal maxCellSoh;
+    /** 堆单次累计放电电量/kWh */
+    @Excel(name = "堆单次累计放电电量/kWh")
+    private BigDecimal sessionDischargeCapacity;
 
-    /** 最高单体SOH对应点号 */
-    @Excel(name = "最高单体SOH对应点号")
-    private Long maxCellSohId;
+    /** 堆可充电量/kWh */
+    @Excel(name = "堆可充电量/kWh")
+    private BigDecimal availableChargeCapacity;
 
-    /** 最低单体SOH */
-    @Excel(name = "最低单体SOH")
-    private BigDecimal minCellSoh;
+    /** 堆可放电量/kWh */
+    @Excel(name = "堆可放电量/kWh")
+    private BigDecimal availableDischargeCapacity;
 
-    /** 最低单体SOH对应点号 */
-    @Excel(name = "最低单体SOH对应点号")
-    private Long minCellSohId;
+    /** 可用放电时间/min */
+    @Excel(name = "可用放电时间/min")
+    private Long remainingDischargeTime;
 
-    /** 单次累计充电电量 */
-    @Excel(name = "单次累计充电电量")
-    private BigDecimal totalChargeEnergy;
+    /** 可用充电时间/min */
+    @Excel(name = "可用充电时间/min")
+    private Long remainingChargeTime;
 
-    /** 单次累计放电电量 */
-    @Excel(name = "单次累计放电电量")
-    private BigDecimal totalDischargeEnergy;
+    /** 允许最大放电功率/kW */
+    @Excel(name = "允许最大放电功率/kW")
+    private BigDecimal maxDischargePower;
+
+    /** 允许最大充电功率/kW */
+    @Excel(name = "允许最大充电功率/kW")
+    private BigDecimal maxChargePower;
+
+    /** 允许最大放电电流/A */
+    @Excel(name = "允许最大放电电流/A")
+    private BigDecimal maxDischargeCurrent;
+
+    /** 允许最大充电电流/A */
+    @Excel(name = "允许最大充电电流/A")
+    private BigDecimal maxChargeCurrent;
+
+    /** 当天放电次数 */
+    @Excel(name = "当天放电次数")
+    private Long dailyDischargeCycles;
+
+    /** 当天充电次数 */
+    @Excel(name = "当天充电次数")
+    private Long dailyChargeCycles;
+
+    /** 当天放电电量/kWh */
+    @Excel(name = "当天放电电量/kWh")
+    private BigDecimal dailyDischargeCapacity;
+
+    /** 当天充电电量/kWh */
+    @Excel(name = "当天充电电量/kWh")
+    private BigDecimal dailyChargeCapacity;
+
+    /** 运行温度/℃ */
+    @Excel(name = "运行温度/℃")
+    private BigDecimal operatingTemp;
+
+    /** BMS堆当前状态 */
+    @Excel(name = "BMS堆当前状态")
+    private String bmsStatus;
+
+    /** BMS充放电状态 */
+    @Excel(name = "BMS充放电状态")
+    private String bmsChargeStatus;
+
+    /** 电池堆绝缘电阻/kΩ */
+    @Excel(name = "电池堆绝缘电阻/kΩ")
+    private BigDecimal stackInsulationResistance;
+
+    /** 站点 id */
+    @Excel(name = "站点 id")
+    private String siteId;
+
+    /** 设备id */
+    @Excel(name = "设备id")
+    private String deviceId;
 
     public void setId(Long id)
     {
@@ -248,104 +228,374 @@ public class EmsBatteryStack extends BaseEntity
         return emsCommunicationStatus;
     }
 
-    public void setTotalVoltage(BigDecimal totalVoltage)
+    public void setOperationStatus(String operationStatus)
     {
-        this.totalVoltage = totalVoltage;
+        this.operationStatus = operationStatus;
     }
 
-    public BigDecimal getTotalVoltage()
+    public String getOperationStatus()
     {
-        return totalVoltage;
+        return operationStatus;
     }
 
-    public void setChargeableCapacity(BigDecimal chargeableCapacity)
+    public void setStackVoltage(BigDecimal stackVoltage)
     {
-        this.chargeableCapacity = chargeableCapacity;
+        this.stackVoltage = stackVoltage;
     }
 
-    public BigDecimal getChargeableCapacity()
+    public BigDecimal getStackVoltage()
     {
-        return chargeableCapacity;
+        return stackVoltage;
     }
 
-    public void setTotalChargedCapacity(BigDecimal totalChargedCapacity)
+    public void setStackCurrent(BigDecimal stackCurrent)
     {
-        this.totalChargedCapacity = totalChargedCapacity;
+        this.stackCurrent = stackCurrent;
     }
 
-    public BigDecimal getTotalChargedCapacity()
+    public BigDecimal getStackCurrent()
     {
-        return totalChargedCapacity;
+        return stackCurrent;
     }
 
-    public void setTotalCurrent(BigDecimal totalCurrent)
+    public void setStackSoc(BigDecimal stackSoc)
     {
-        this.totalCurrent = totalCurrent;
+        this.stackSoc = stackSoc;
     }
 
-    public BigDecimal getTotalCurrent()
+    public BigDecimal getStackSoc()
     {
-        return totalCurrent;
+        return stackSoc;
     }
 
-    public void setDischargeableCapacity(BigDecimal dischargeableCapacity)
+    public void setStackSoh(BigDecimal stackSoh)
     {
-        this.dischargeableCapacity = dischargeableCapacity;
+        this.stackSoh = stackSoh;
     }
 
-    public BigDecimal getDischargeableCapacity()
+    public BigDecimal getStackSoh()
     {
-        return dischargeableCapacity;
+        return stackSoh;
     }
 
-    public void setTotalDischargedCapacity(BigDecimal totalDischargedCapacity)
+    public void setMaxCellVoltage(BigDecimal maxCellVoltage)
     {
-        this.totalDischargedCapacity = totalDischargedCapacity;
+        this.maxCellVoltage = maxCellVoltage;
     }
 
-    public BigDecimal getTotalDischargedCapacity()
+    public BigDecimal getMaxCellVoltage()
     {
-        return totalDischargedCapacity;
+        return maxCellVoltage;
     }
 
-    public void setSoh(BigDecimal soh)
+    public void setMaxVoltageGroupId(Long maxVoltageGroupId)
     {
-        this.soh = soh;
+        this.maxVoltageGroupId = maxVoltageGroupId;
     }
 
-    public BigDecimal getSoh()
+    public Long getMaxVoltageGroupId()
     {
-        return soh;
+        return maxVoltageGroupId;
     }
 
-    public void setAverageTemperature(BigDecimal averageTemperature)
+    public void setMaxVoltageCellId(Long maxVoltageCellId)
     {
-        this.averageTemperature = averageTemperature;
+        this.maxVoltageCellId = maxVoltageCellId;
     }
 
-    public BigDecimal getAverageTemperature()
+    public Long getMaxVoltageCellId()
     {
-        return averageTemperature;
+        return maxVoltageCellId;
     }
 
-    public void setInsulationResistance(BigDecimal insulationResistance)
+    public void setMinCellVoltage(BigDecimal minCellVoltage)
     {
-        this.insulationResistance = insulationResistance;
+        this.minCellVoltage = minCellVoltage;
     }
 
-    public BigDecimal getInsulationResistance()
+    public BigDecimal getMinCellVoltage()
     {
-        return insulationResistance;
+        return minCellVoltage;
     }
 
-    public void setCurrentSoc(BigDecimal currentSoc)
+    public void setMinVoltageGroupId(Long minVoltageGroupId)
     {
-        this.currentSoc = currentSoc;
+        this.minVoltageGroupId = minVoltageGroupId;
     }
 
-    public BigDecimal getCurrentSoc()
+    public Long getMinVoltageGroupId()
     {
-        return currentSoc;
+        return minVoltageGroupId;
+    }
+
+    public void setMinVoltageCellId(Long minVoltageCellId)
+    {
+        this.minVoltageCellId = minVoltageCellId;
+    }
+
+    public Long getMinVoltageCellId()
+    {
+        return minVoltageCellId;
+    }
+
+    public void setMaxCellTemp(BigDecimal maxCellTemp)
+    {
+        this.maxCellTemp = maxCellTemp;
+    }
+
+    public BigDecimal getMaxCellTemp()
+    {
+        return maxCellTemp;
+    }
+
+    public void setMaxTempGroupId(Long maxTempGroupId)
+    {
+        this.maxTempGroupId = maxTempGroupId;
+    }
+
+    public Long getMaxTempGroupId()
+    {
+        return maxTempGroupId;
+    }
+
+    public void setMaxTempCellId(Long maxTempCellId)
+    {
+        this.maxTempCellId = maxTempCellId;
+    }
+
+    public Long getMaxTempCellId()
+    {
+        return maxTempCellId;
+    }
+
+    public void setMinCellTemp(BigDecimal minCellTemp)
+    {
+        this.minCellTemp = minCellTemp;
+    }
+
+    public BigDecimal getMinCellTemp()
+    {
+        return minCellTemp;
+    }
+
+    public void setMinTempGroupId(Long minTempGroupId)
+    {
+        this.minTempGroupId = minTempGroupId;
+    }
+
+    public Long getMinTempGroupId()
+    {
+        return minTempGroupId;
+    }
+
+    public void setMinTempCellId(Long minTempCellId)
+    {
+        this.minTempCellId = minTempCellId;
+    }
+
+    public Long getMinTempCellId()
+    {
+        return minTempCellId;
+    }
+
+    public void setTotalChargeCapacity(BigDecimal totalChargeCapacity)
+    {
+        this.totalChargeCapacity = totalChargeCapacity;
+    }
+
+    public BigDecimal getTotalChargeCapacity()
+    {
+        return totalChargeCapacity;
+    }
+
+    public void setTotalDischargeCapacity(BigDecimal totalDischargeCapacity)
+    {
+        this.totalDischargeCapacity = totalDischargeCapacity;
+    }
+
+    public BigDecimal getTotalDischargeCapacity()
+    {
+        return totalDischargeCapacity;
+    }
+
+    public void setSessionChargeCapacity(BigDecimal sessionChargeCapacity)
+    {
+        this.sessionChargeCapacity = sessionChargeCapacity;
+    }
+
+    public BigDecimal getSessionChargeCapacity()
+    {
+        return sessionChargeCapacity;
+    }
+
+    public void setSessionDischargeCapacity(BigDecimal sessionDischargeCapacity)
+    {
+        this.sessionDischargeCapacity = sessionDischargeCapacity;
+    }
+
+    public BigDecimal getSessionDischargeCapacity()
+    {
+        return sessionDischargeCapacity;
+    }
+
+    public void setAvailableChargeCapacity(BigDecimal availableChargeCapacity)
+    {
+        this.availableChargeCapacity = availableChargeCapacity;
+    }
+
+    public BigDecimal getAvailableChargeCapacity()
+    {
+        return availableChargeCapacity;
+    }
+
+    public void setAvailableDischargeCapacity(BigDecimal availableDischargeCapacity)
+    {
+        this.availableDischargeCapacity = availableDischargeCapacity;
+    }
+
+    public BigDecimal getAvailableDischargeCapacity()
+    {
+        return availableDischargeCapacity;
+    }
+
+    public void setRemainingDischargeTime(Long remainingDischargeTime)
+    {
+        this.remainingDischargeTime = remainingDischargeTime;
+    }
+
+    public Long getRemainingDischargeTime()
+    {
+        return remainingDischargeTime;
+    }
+
+    public void setRemainingChargeTime(Long remainingChargeTime)
+    {
+        this.remainingChargeTime = remainingChargeTime;
+    }
+
+    public Long getRemainingChargeTime()
+    {
+        return remainingChargeTime;
+    }
+
+    public void setMaxDischargePower(BigDecimal maxDischargePower)
+    {
+        this.maxDischargePower = maxDischargePower;
+    }
+
+    public BigDecimal getMaxDischargePower()
+    {
+        return maxDischargePower;
+    }
+
+    public void setMaxChargePower(BigDecimal maxChargePower)
+    {
+        this.maxChargePower = maxChargePower;
+    }
+
+    public BigDecimal getMaxChargePower()
+    {
+        return maxChargePower;
+    }
+
+    public void setMaxDischargeCurrent(BigDecimal maxDischargeCurrent)
+    {
+        this.maxDischargeCurrent = maxDischargeCurrent;
+    }
+
+    public BigDecimal getMaxDischargeCurrent()
+    {
+        return maxDischargeCurrent;
+    }
+
+    public void setMaxChargeCurrent(BigDecimal maxChargeCurrent)
+    {
+        this.maxChargeCurrent = maxChargeCurrent;
+    }
+
+    public BigDecimal getMaxChargeCurrent()
+    {
+        return maxChargeCurrent;
+    }
+
+    public void setDailyDischargeCycles(Long dailyDischargeCycles)
+    {
+        this.dailyDischargeCycles = dailyDischargeCycles;
+    }
+
+    public Long getDailyDischargeCycles()
+    {
+        return dailyDischargeCycles;
+    }
+
+    public void setDailyChargeCycles(Long dailyChargeCycles)
+    {
+        this.dailyChargeCycles = dailyChargeCycles;
+    }
+
+    public Long getDailyChargeCycles()
+    {
+        return dailyChargeCycles;
+    }
+
+    public void setDailyDischargeCapacity(BigDecimal dailyDischargeCapacity)
+    {
+        this.dailyDischargeCapacity = dailyDischargeCapacity;
+    }
+
+    public BigDecimal getDailyDischargeCapacity()
+    {
+        return dailyDischargeCapacity;
+    }
+
+    public void setDailyChargeCapacity(BigDecimal dailyChargeCapacity)
+    {
+        this.dailyChargeCapacity = dailyChargeCapacity;
+    }
+
+    public BigDecimal getDailyChargeCapacity()
+    {
+        return dailyChargeCapacity;
+    }
+
+    public void setOperatingTemp(BigDecimal operatingTemp)
+    {
+        this.operatingTemp = operatingTemp;
+    }
+
+    public BigDecimal getOperatingTemp()
+    {
+        return operatingTemp;
+    }
+
+    public void setBmsStatus(String bmsStatus)
+    {
+        this.bmsStatus = bmsStatus;
+    }
+
+    public String getBmsStatus()
+    {
+        return bmsStatus;
+    }
+
+    public void setBmsChargeStatus(String bmsChargeStatus)
+    {
+        this.bmsChargeStatus = bmsChargeStatus;
+    }
+
+    public String getBmsChargeStatus()
+    {
+        return bmsChargeStatus;
+    }
+
+    public void setStackInsulationResistance(BigDecimal stackInsulationResistance)
+    {
+        this.stackInsulationResistance = stackInsulationResistance;
+    }
+
+    public BigDecimal getStackInsulationResistance()
+    {
+        return stackInsulationResistance;
     }
 
     public void setSiteId(String siteId)
@@ -368,326 +618,6 @@ public class EmsBatteryStack extends BaseEntity
         return deviceId;
     }
 
-    public void setMaxAllowedChargePower(BigDecimal maxAllowedChargePower)
-    {
-        this.maxAllowedChargePower = maxAllowedChargePower;
-    }
-
-    public BigDecimal getMaxAllowedChargePower()
-    {
-        return maxAllowedChargePower;
-    }
-
-    public void setMaxAllowedDischargePower(BigDecimal maxAllowedDischargePower)
-    {
-        this.maxAllowedDischargePower = maxAllowedDischargePower;
-    }
-
-    public BigDecimal getMaxAllowedDischargePower()
-    {
-        return maxAllowedDischargePower;
-    }
-
-    public void setMaxAllowedChargeVoltage(BigDecimal maxAllowedChargeVoltage)
-    {
-        this.maxAllowedChargeVoltage = maxAllowedChargeVoltage;
-    }
-
-    public BigDecimal getMaxAllowedChargeVoltage()
-    {
-        return maxAllowedChargeVoltage;
-    }
-
-    public void setMaxAllowedDischargeVoltage(BigDecimal maxAllowedDischargeVoltage)
-    {
-        this.maxAllowedDischargeVoltage = maxAllowedDischargeVoltage;
-    }
-
-    public BigDecimal getMaxAllowedDischargeVoltage()
-    {
-        return maxAllowedDischargeVoltage;
-    }
-
-    public void setMaxAllowedChargeCurrent(BigDecimal maxAllowedChargeCurrent)
-    {
-        this.maxAllowedChargeCurrent = maxAllowedChargeCurrent;
-    }
-
-    public BigDecimal getMaxAllowedChargeCurrent()
-    {
-        return maxAllowedChargeCurrent;
-    }
-
-    public void setMaxAllowedDischargeCurrent(BigDecimal maxAllowedDischargeCurrent)
-    {
-        this.maxAllowedDischargeCurrent = maxAllowedDischargeCurrent;
-    }
-
-    public BigDecimal getMaxAllowedDischargeCurrent()
-    {
-        return maxAllowedDischargeCurrent;
-    }
-
-    public void setBatteryPackVoltage(BigDecimal batteryPackVoltage)
-    {
-        this.batteryPackVoltage = batteryPackVoltage;
-    }
-
-    public BigDecimal getBatteryPackVoltage()
-    {
-        return batteryPackVoltage;
-    }
-
-    public void setBatteryPackCurrent(BigDecimal batteryPackCurrent)
-    {
-        this.batteryPackCurrent = batteryPackCurrent;
-    }
-
-    public BigDecimal getBatteryPackCurrent()
-    {
-        return batteryPackCurrent;
-    }
-
-    public void setBatteryPackTemp(BigDecimal batteryPackTemp)
-    {
-        this.batteryPackTemp = batteryPackTemp;
-    }
-
-    public BigDecimal getBatteryPackTemp()
-    {
-        return batteryPackTemp;
-    }
-
-    public void setBatteryPackSoc(BigDecimal batteryPackSoc)
-    {
-        this.batteryPackSoc = batteryPackSoc;
-    }
-
-    public BigDecimal getBatteryPackSoc()
-    {
-        return batteryPackSoc;
-    }
-
-    public void setBatteryPackSoh(BigDecimal batteryPackSoh)
-    {
-        this.batteryPackSoh = batteryPackSoh;
-    }
-
-    public BigDecimal getBatteryPackSoh()
-    {
-        return batteryPackSoh;
-    }
-
-    public void setBatteryPackInsulationResistance(BigDecimal batteryPackInsulationResistance)
-    {
-        this.batteryPackInsulationResistance = batteryPackInsulationResistance;
-    }
-
-    public BigDecimal getBatteryPackInsulationResistance()
-    {
-        return batteryPackInsulationResistance;
-    }
-
-    public void setAvgCellVoltage(BigDecimal avgCellVoltage)
-    {
-        this.avgCellVoltage = avgCellVoltage;
-    }
-
-    public BigDecimal getAvgCellVoltage()
-    {
-        return avgCellVoltage;
-    }
-
-    public void setAvgCellTemp(BigDecimal avgCellTemp)
-    {
-        this.avgCellTemp = avgCellTemp;
-    }
-
-    public BigDecimal getAvgCellTemp()
-    {
-        return avgCellTemp;
-    }
-
-    public void setMaxCellVoltage(BigDecimal maxCellVoltage)
-    {
-        this.maxCellVoltage = maxCellVoltage;
-    }
-
-    public BigDecimal getMaxCellVoltage()
-    {
-        return maxCellVoltage;
-    }
-
-    public void setMaxCellVoltageId(Long maxCellVoltageId)
-    {
-        this.maxCellVoltageId = maxCellVoltageId;
-    }
-
-    public Long getMaxCellVoltageId()
-    {
-        return maxCellVoltageId;
-    }
-
-    public void setMinCellVoltage(BigDecimal minCellVoltage)
-    {
-        this.minCellVoltage = minCellVoltage;
-    }
-
-    public BigDecimal getMinCellVoltage()
-    {
-        return minCellVoltage;
-    }
-
-    public void setMinCellVoltageId(Long minCellVoltageId)
-    {
-        this.minCellVoltageId = minCellVoltageId;
-    }
-
-    public Long getMinCellVoltageId()
-    {
-        return minCellVoltageId;
-    }
-
-    public void setMaxCellTemp(BigDecimal maxCellTemp)
-    {
-        this.maxCellTemp = maxCellTemp;
-    }
-
-    public BigDecimal getMaxCellTemp()
-    {
-        return maxCellTemp;
-    }
-
-    public void setMaxCellTempId(Long maxCellTempId)
-    {
-        this.maxCellTempId = maxCellTempId;
-    }
-
-    public Long getMaxCellTempId()
-    {
-        return maxCellTempId;
-    }
-
-    public void setMinCellTemp(BigDecimal minCellTemp)
-    {
-        this.minCellTemp = minCellTemp;
-    }
-
-    public BigDecimal getMinCellTemp()
-    {
-        return minCellTemp;
-    }
-
-    public void setMinCellTempId(Long minCellTempId)
-    {
-        this.minCellTempId = minCellTempId;
-    }
-
-    public Long getMinCellTempId()
-    {
-        return minCellTempId;
-    }
-
-    public void setMaxCellSoc(BigDecimal maxCellSoc)
-    {
-        this.maxCellSoc = maxCellSoc;
-    }
-
-    public BigDecimal getMaxCellSoc()
-    {
-        return maxCellSoc;
-    }
-
-    public void setMaxCellSocId(Long maxCellSocId)
-    {
-        this.maxCellSocId = maxCellSocId;
-    }
-
-    public Long getMaxCellSocId()
-    {
-        return maxCellSocId;
-    }
-
-    public void setMinCellSoc(BigDecimal minCellSoc)
-    {
-        this.minCellSoc = minCellSoc;
-    }
-
-    public BigDecimal getMinCellSoc()
-    {
-        return minCellSoc;
-    }
-
-    public void setMinCellSocId(Long minCellSocId)
-    {
-        this.minCellSocId = minCellSocId;
-    }
-
-    public Long getMinCellSocId()
-    {
-        return minCellSocId;
-    }
-
-    public void setMaxCellSoh(BigDecimal maxCellSoh)
-    {
-        this.maxCellSoh = maxCellSoh;
-    }
-
-    public BigDecimal getMaxCellSoh()
-    {
-        return maxCellSoh;
-    }
-
-    public void setMaxCellSohId(Long maxCellSohId)
-    {
-        this.maxCellSohId = maxCellSohId;
-    }
-
-    public Long getMaxCellSohId()
-    {
-        return maxCellSohId;
-    }
-
-    public void setMinCellSoh(BigDecimal minCellSoh)
-    {
-        this.minCellSoh = minCellSoh;
-    }
-
-    public BigDecimal getMinCellSoh()
-    {
-        return minCellSoh;
-    }
-
-    public void setMinCellSohId(Long minCellSohId)
-    {
-        this.minCellSohId = minCellSohId;
-    }
-
-    public Long getMinCellSohId()
-    {
-        return minCellSohId;
-    }
-
-    public void setTotalChargeEnergy(BigDecimal totalChargeEnergy)
-    {
-        this.totalChargeEnergy = totalChargeEnergy;
-    }
-
-    public BigDecimal getTotalChargeEnergy()
-    {
-        return totalChargeEnergy;
-    }
-
-    public void setTotalDischargeEnergy(BigDecimal totalDischargeEnergy)
-    {
-        this.totalDischargeEnergy = totalDischargeEnergy;
-    }
-
-    public BigDecimal getTotalDischargeEnergy()
-    {
-        return totalDischargeEnergy;
-    }
-
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -695,55 +625,49 @@ public class EmsBatteryStack extends BaseEntity
                 .append("workStatus", getWorkStatus())
                 .append("pcsCommunicationStatus", getPcsCommunicationStatus())
                 .append("emsCommunicationStatus", getEmsCommunicationStatus())
-                .append("totalVoltage", getTotalVoltage())
-                .append("chargeableCapacity", getChargeableCapacity())
-                .append("totalChargedCapacity", getTotalChargedCapacity())
-                .append("totalCurrent", getTotalCurrent())
-                .append("dischargeableCapacity", getDischargeableCapacity())
-                .append("totalDischargedCapacity", getTotalDischargedCapacity())
-                .append("soh", getSoh())
-                .append("averageTemperature", getAverageTemperature())
-                .append("insulationResistance", getInsulationResistance())
-                .append("currentSoc", getCurrentSoc())
-                .append("createBy", getCreateBy())
-                .append("createTime", getCreateTime())
-                .append("updateBy", getUpdateBy())
-                .append("updateTime", getUpdateTime())
-                .append("remark", getRemark())
+                .append("operationStatus", getOperationStatus())
+                .append("stackVoltage", getStackVoltage())
+                .append("stackCurrent", getStackCurrent())
+                .append("stackSoc", getStackSoc())
+                .append("stackSoh", getStackSoh())
+                .append("maxCellVoltage", getMaxCellVoltage())
+                .append("maxVoltageGroupId", getMaxVoltageGroupId())
+                .append("maxVoltageCellId", getMaxVoltageCellId())
+                .append("minCellVoltage", getMinCellVoltage())
+                .append("minVoltageGroupId", getMinVoltageGroupId())
+                .append("minVoltageCellId", getMinVoltageCellId())
+                .append("maxCellTemp", getMaxCellTemp())
+                .append("maxTempGroupId", getMaxTempGroupId())
+                .append("maxTempCellId", getMaxTempCellId())
+                .append("minCellTemp", getMinCellTemp())
+                .append("minTempGroupId", getMinTempGroupId())
+                .append("minTempCellId", getMinTempCellId())
+                .append("totalChargeCapacity", getTotalChargeCapacity())
+                .append("totalDischargeCapacity", getTotalDischargeCapacity())
+                .append("sessionChargeCapacity", getSessionChargeCapacity())
+                .append("sessionDischargeCapacity", getSessionDischargeCapacity())
+                .append("availableChargeCapacity", getAvailableChargeCapacity())
+                .append("availableDischargeCapacity", getAvailableDischargeCapacity())
+                .append("remainingDischargeTime", getRemainingDischargeTime())
+                .append("remainingChargeTime", getRemainingChargeTime())
+                .append("maxDischargePower", getMaxDischargePower())
+                .append("maxChargePower", getMaxChargePower())
+                .append("maxDischargeCurrent", getMaxDischargeCurrent())
+                .append("maxChargeCurrent", getMaxChargeCurrent())
+                .append("dailyDischargeCycles", getDailyDischargeCycles())
+                .append("dailyChargeCycles", getDailyChargeCycles())
+                .append("dailyDischargeCapacity", getDailyDischargeCapacity())
+                .append("dailyChargeCapacity", getDailyChargeCapacity())
+                .append("operatingTemp", getOperatingTemp())
+                .append("bmsStatus", getBmsStatus())
+                .append("bmsChargeStatus", getBmsChargeStatus())
+                .append("stackInsulationResistance", getStackInsulationResistance())
                 .append("siteId", getSiteId())
                 .append("deviceId", getDeviceId())
-                .append("maxAllowedChargePower", getMaxAllowedChargePower())
-                .append("maxAllowedDischargePower", getMaxAllowedDischargePower())
-                .append("maxAllowedChargeVoltage", getMaxAllowedChargeVoltage())
-                .append("maxAllowedDischargeVoltage", getMaxAllowedDischargeVoltage())
-                .append("maxAllowedChargeCurrent", getMaxAllowedChargeCurrent())
-                .append("maxAllowedDischargeCurrent", getMaxAllowedDischargeCurrent())
-                .append("batteryPackVoltage", getBatteryPackVoltage())
-                .append("batteryPackCurrent", getBatteryPackCurrent())
-                .append("batteryPackTemp", getBatteryPackTemp())
-                .append("batteryPackSoc", getBatteryPackSoc())
-                .append("batteryPackSoh", getBatteryPackSoh())
-                .append("batteryPackInsulationResistance", getBatteryPackInsulationResistance())
-                .append("avgCellVoltage", getAvgCellVoltage())
-                .append("avgCellTemp", getAvgCellTemp())
-                .append("maxCellVoltage", getMaxCellVoltage())
-                .append("maxCellVoltageId", getMaxCellVoltageId())
-                .append("minCellVoltage", getMinCellVoltage())
-                .append("minCellVoltageId", getMinCellVoltageId())
-                .append("maxCellTemp", getMaxCellTemp())
-                .append("maxCellTempId", getMaxCellTempId())
-                .append("minCellTemp", getMinCellTemp())
-                .append("minCellTempId", getMinCellTempId())
-                .append("maxCellSoc", getMaxCellSoc())
-                .append("maxCellSocId", getMaxCellSocId())
-                .append("minCellSoc", getMinCellSoc())
-                .append("minCellSocId", getMinCellSocId())
-                .append("maxCellSoh", getMaxCellSoh())
-                .append("maxCellSohId", getMaxCellSohId())
-                .append("minCellSoh", getMinCellSoh())
-                .append("minCellSohId", getMinCellSohId())
-                .append("totalChargeEnergy", getTotalChargeEnergy())
-                .append("totalDischargeEnergy", getTotalDischargeEnergy())
+                .append("createTime", getCreateTime())
+                .append("createBy", getCreateBy())
+                .append("updateTime", getUpdateTime())
+                .append("updateBy", getUpdateBy())
                 .toString();
     }
 }
diff --git a/ems-system/src/main/java/com/xzzn/ems/service/impl/FXXDataProcessServiceImpl.java b/ems-system/src/main/java/com/xzzn/ems/service/impl/FXXDataProcessServiceImpl.java
index 32fef12..d6f91f5 100644
--- a/ems-system/src/main/java/com/xzzn/ems/service/impl/FXXDataProcessServiceImpl.java
+++ b/ems-system/src/main/java/com/xzzn/ems/service/impl/FXXDataProcessServiceImpl.java
@@ -77,58 +77,72 @@ public class FXXDataProcessServiceImpl implements IFXXDataProcessService {
 
         //BMS 电池簇
         EmsBatteryStack dataStack = new EmsBatteryStack();
-        // 设置所有 BigDecimal 类型字段为 ZERO
-        dataStack.setChargeableCapacity(StringUtils.getBigDecimal(obj.get("KCDL")));
-        dataStack.setTotalChargedCapacity(StringUtils.getBigDecimal(obj.get("LJCDDL")));
-        dataStack.setDischargeableCapacity(StringUtils.getBigDecimal(obj.get("KFDL")));
-        dataStack.setTotalDischargedCapacity(StringUtils.getBigDecimal(obj.get("LJFDDL")));
-        dataStack.setSoh(StringUtils.getBigDecimal(obj.get("ZSOH")));
-        dataStack.setAverageTemperature(StringUtils.getBigDecimal(obj.get("MKWD")));
-        dataStack.setInsulationResistance(StringUtils.getBigDecimal(obj.get("ZJYDZ")));
-        dataStack.setCurrentSoc(StringUtils.getBigDecimal(obj.get("ZSOC")));
-        dataStack.setMaxAllowedChargePower(StringUtils.getBigDecimal(obj.get("YXCDZDGL")));
-        dataStack.setMaxAllowedDischargePower(StringUtils.getBigDecimal(obj.get("YXFDZDGL")));
-        dataStack.setMaxAllowedChargeVoltage(StringUtils.getBigDecimal(obj.get("YXCDZDDY")));
-        dataStack.setMaxAllowedDischargeVoltage(StringUtils.getBigDecimal(obj.get("YXFDZDDY")));
-        dataStack.setMaxAllowedChargeCurrent(StringUtils.getBigDecimal(obj.get("YXCDZDDL")));
-        dataStack.setMaxAllowedDischargeCurrent(StringUtils.getBigDecimal(obj.get("YXFDZDDL")));
-        dataStack.setBatteryPackVoltage(StringUtils.getBigDecimal(obj.get("ZDY")));
-        dataStack.setBatteryPackCurrent(StringUtils.getBigDecimal(obj.get("ZDL")));
-        dataStack.setBatteryPackTemp(StringUtils.getBigDecimal(obj.get("MKWD")));
-        dataStack.setBatteryPackSoc(StringUtils.getBigDecimal(obj.get("ZSOC")));
-        dataStack.setBatteryPackSoh(StringUtils.getBigDecimal(obj.get("ZSOH")));
-        dataStack.setBatteryPackInsulationResistance(StringUtils.getBigDecimal(obj.get("ZJYDZ")));
-        dataStack.setAvgCellVoltage(StringUtils.getBigDecimal(obj.get("PJDTDY")));
-        dataStack.setAvgCellTemp(StringUtils.getBigDecimal(obj.get("PJDTWD")));
-        dataStack.setMaxCellVoltage(StringUtils.getBigDecimal(obj.get("ZGDTDY")));
-        dataStack.setMinCellVoltage(StringUtils.getBigDecimal(obj.get("ZDDTDY")));
-        dataStack.setMaxCellTemp(StringUtils.getBigDecimal(obj.get("ZGDTWD")));
-        dataStack.setMinCellTemp(StringUtils.getBigDecimal(obj.get("ZDDTWD")));
-        dataStack.setMaxCellSoc(StringUtils.getBigDecimal(obj.get("ZGDTSOC")));
-        dataStack.setMinCellSoc(StringUtils.getBigDecimal(obj.get("ZDDTSOC")));
-        dataStack.setMaxCellSoh(StringUtils.getBigDecimal(obj.get("ZGDTSOH")));
-        dataStack.setMinCellSoh(StringUtils.getBigDecimal(obj.get("ZDDTSOH")));
-        dataStack.setTotalChargeEnergy(StringUtils.getBigDecimal(obj.get("DCLJCDDL")));
-        dataStack.setTotalDischargeEnergy(StringUtils.getBigDecimal(obj.get("DCLJFDDL")));
 
         // 其他非 BigDecimal 字段
         dataStack.setWorkStatus(WorkStatus.NORMAL.getCode()); // 或其他默认值
         dataStack.setPcsCommunicationStatus(CommunicationStatus.OK.getCode());
         dataStack.setEmsCommunicationStatus(CommunicationStatus.OK.getCode());
+
+        // 电池堆状态数据设置
+        dataStack.setOperationStatus(StringUtils.getString(obj.get("DCZT")));
+        dataStack.setStackVoltage(StringUtils.getBigDecimal(obj.get("DCDDY")));
+        dataStack.setStackCurrent(StringUtils.getBigDecimal(obj.get("DCDDL")));
+        dataStack.setStackSoc(StringUtils.getBigDecimal(obj.get("DCDSOC")));
+        dataStack.setStackSoh(StringUtils.getBigDecimal(obj.get("DCDSOH")));
+
+        // 电压极值信息
+        dataStack.setMaxCellVoltage(StringUtils.getBigDecimal(obj.get("ZGDCDY")));
+        dataStack.setMaxVoltageGroupId(StringUtils.getLong(obj.get("ZGDCDYZH")));
+        dataStack.setMaxVoltageCellId(StringUtils.getLong(obj.get("ZGDCDYZHDH")));
+        dataStack.setMinCellVoltage(StringUtils.getBigDecimal(obj.get("ZDDCDY")));
+        dataStack.setMinVoltageGroupId(StringUtils.getLong(obj.get("ZDDCDYZH")));
+        dataStack.setMinVoltageCellId(StringUtils.getLong(obj.get("ZDDCDYZHDH")));
+
+        // 温度极值信息
+        dataStack.setMaxCellTemp(StringUtils.getBigDecimal(obj.get("ZGDCWD")));
+        dataStack.setMaxTempGroupId(StringUtils.getLong(obj.get("ZGDCWDZH")));
+        dataStack.setMaxTempCellId(StringUtils.getLong(obj.get("ZGDCWDZHDH")));
+        dataStack.setMinCellTemp(StringUtils.getBigDecimal(obj.get("ZDDCWD")));
+        dataStack.setMinTempGroupId(StringUtils.getLong(obj.get("ZDDCWDZH")));
+        dataStack.setMinTempCellId(StringUtils.getLong(obj.get("ZDDCWDZHDH")));
+
+        // 电量统计信息
+        dataStack.setTotalChargeCapacity(StringUtils.getBigDecimal(obj.get("DLJCDDL")));
+        dataStack.setTotalDischargeCapacity(StringUtils.getBigDecimal(obj.get("DLCFDDL")));
+        dataStack.setSessionChargeCapacity(StringUtils.getBigDecimal(obj.get("DDCLJCDDL")));
+        dataStack.setSessionDischargeCapacity(StringUtils.getBigDecimal(obj.get("DDCLJFDDL")));
+        dataStack.setAvailableChargeCapacity(StringUtils.getBigDecimal(obj.get("DKCDL")));
+        dataStack.setAvailableDischargeCapacity(StringUtils.getBigDecimal(obj.get("DKFDL")));
+
+// 时间信息
+        dataStack.setRemainingDischargeTime(StringUtils.getLong(obj.get("KYFDSJ")));
+        dataStack.setRemainingChargeTime(StringUtils.getLong(obj.get("KYCDSJ")));
+
+// 功率/电流限制
+        dataStack.setMaxDischargePower(StringUtils.getBigDecimal(obj.get("YXZDFDGL")));
+        dataStack.setMaxChargePower(StringUtils.getBigDecimal(obj.get("YXZDCDGL")));
+        dataStack.setMaxDischargeCurrent(StringUtils.getBigDecimal(obj.get("YXZDFDDL")));
+        dataStack.setMaxChargeCurrent(StringUtils.getBigDecimal(obj.get("YXZDCDDL")));
+
+        // 当日统计
+        dataStack.setDailyDischargeCycles(StringUtils.getLong(obj.get("DTFDCS")));
+        dataStack.setDailyChargeCycles(StringUtils.getLong(obj.get("DTCDCS")));
+        dataStack.setDailyDischargeCapacity(StringUtils.getBigDecimal(obj.get("DTFDDL")));
+        dataStack.setDailyChargeCapacity(StringUtils.getBigDecimal(obj.get("DTCDDL")));
+
+        // 系统状态
+        dataStack.setOperatingTemp(StringUtils.getBigDecimal(obj.get("YXWD")));
+        dataStack.setBmsStatus(StringUtils.getString(obj.get("BMSDDQZT")));
+        dataStack.setBmsChargeStatus(StringUtils.getString(obj.get("BMSCFDZT")));
+        dataStack.setStackInsulationResistance(StringUtils.getBigDecimal(obj.get("DCDJYDZ")));
+
+
         dataStack.setCreateBy("system");
         dataStack.setCreateTime(DateUtils.getNowDate());
         dataStack.setUpdateBy("system");
         dataStack.setUpdateTime(DateUtils.getNowDate());
         dataStack.setSiteId("021_FXX_01");
         dataStack.setDeviceId(deviceId);
-        dataStack.setMaxCellVoltageId(StringUtils.getLong(obj.get("ZGDTDYDYD")));
-        dataStack.setMinCellVoltageId(StringUtils.getLong(obj.get("ZDDTDYDYD")));
-        dataStack.setMaxCellTempId(StringUtils.getLong(obj.get("ZGDTWDDYD")));
-        dataStack.setMinCellTempId(StringUtils.getLong(obj.get("ZDDTWDDYD")));
-        dataStack.setMaxCellSocId(StringUtils.getLong(obj.get("ZGDTSOCDYD")));
-        dataStack.setMinCellSocId(StringUtils.getLong(obj.get("ZDDTSOCDYD")));
-        dataStack.setMaxCellSohId(StringUtils.getLong(obj.get("ZGDTSOHDYD")));
-        dataStack.setMinCellSohId(StringUtils.getLong(obj.get("ZDDTSOHDYD")));
 
         emsBatteryStackMapper.insertEmsBatteryStack(dataStack);
 
diff --git a/ems-system/src/main/resources/mapper/ems/EmsBatteryStackMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsBatteryStackMapper.xml
index 3421457..c8f23c5 100644
--- a/ems-system/src/main/resources/mapper/ems/EmsBatteryStackMapper.xml
+++ b/ems-system/src/main/resources/mapper/ems/EmsBatteryStackMapper.xml
@@ -9,59 +9,53 @@
         <result property="workStatus"    column="work_status"    />
         <result property="pcsCommunicationStatus"    column="pcs_communication_status"    />
         <result property="emsCommunicationStatus"    column="ems_communication_status"    />
-        <result property="totalVoltage"    column="total_voltage"    />
-        <result property="chargeableCapacity"    column="chargeable_capacity"    />
-        <result property="totalChargedCapacity"    column="total_charged_capacity"    />
-        <result property="totalCurrent"    column="total_current"    />
-        <result property="dischargeableCapacity"    column="dischargeable_capacity"    />
-        <result property="totalDischargedCapacity"    column="total_discharged_capacity"    />
-        <result property="soh"    column="soh"    />
-        <result property="averageTemperature"    column="average_temperature"    />
-        <result property="insulationResistance"    column="insulation_resistance"    />
-        <result property="currentSoc"    column="current_soc"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="remark"    column="remark"    />
+        <result property="operationStatus"    column="operation_status"    />
+        <result property="stackVoltage"    column="stack_voltage"    />
+        <result property="stackCurrent"    column="stack_current"    />
+        <result property="stackSoc"    column="stack_soc"    />
+        <result property="stackSoh"    column="stack_soh"    />
+        <result property="maxCellVoltage"    column="max_cell_voltage"    />
+        <result property="maxVoltageGroupId"    column="max_voltage_group_id"    />
+        <result property="maxVoltageCellId"    column="max_voltage_cell_id"    />
+        <result property="minCellVoltage"    column="min_cell_voltage"    />
+        <result property="minVoltageGroupId"    column="min_voltage_group_id"    />
+        <result property="minVoltageCellId"    column="min_voltage_cell_id"    />
+        <result property="maxCellTemp"    column="max_cell_temp"    />
+        <result property="maxTempGroupId"    column="max_temp_group_id"    />
+        <result property="maxTempCellId"    column="max_temp_cell_id"    />
+        <result property="minCellTemp"    column="min_cell_temp"    />
+        <result property="minTempGroupId"    column="min_temp_group_id"    />
+        <result property="minTempCellId"    column="min_temp_cell_id"    />
+        <result property="totalChargeCapacity"    column="total_charge_capacity"    />
+        <result property="totalDischargeCapacity"    column="total_discharge_capacity"    />
+        <result property="sessionChargeCapacity"    column="session_charge_capacity"    />
+        <result property="sessionDischargeCapacity"    column="session_discharge_capacity"    />
+        <result property="availableChargeCapacity"    column="available_charge_capacity"    />
+        <result property="availableDischargeCapacity"    column="available_discharge_capacity"    />
+        <result property="remainingDischargeTime"    column="remaining_discharge_time"    />
+        <result property="remainingChargeTime"    column="remaining_charge_time"    />
+        <result property="maxDischargePower"    column="max_discharge_power"    />
+        <result property="maxChargePower"    column="max_charge_power"    />
+        <result property="maxDischargeCurrent"    column="max_discharge_current"    />
+        <result property="maxChargeCurrent"    column="max_charge_current"    />
+        <result property="dailyDischargeCycles"    column="daily_discharge_cycles"    />
+        <result property="dailyChargeCycles"    column="daily_charge_cycles"    />
+        <result property="dailyDischargeCapacity"    column="daily_discharge_capacity"    />
+        <result property="dailyChargeCapacity"    column="daily_charge_capacity"    />
+        <result property="operatingTemp"    column="operating_temp"    />
+        <result property="bmsStatus"    column="bms_status"    />
+        <result property="bmsChargeStatus"    column="bms_charge_status"    />
+        <result property="stackInsulationResistance"    column="stack_insulation_resistance"    />
         <result property="siteId"    column="site_id"    />
         <result property="deviceId"    column="device_id"    />
-        <result property="maxAllowedChargePower"    column="max_allowed_charge_power"    />
-        <result property="maxAllowedDischargePower"    column="max_allowed_discharge_power"    />
-        <result property="maxAllowedChargeVoltage"    column="max_allowed_charge_voltage"    />
-        <result property="maxAllowedDischargeVoltage"    column="max_allowed_discharge_voltage"    />
-        <result property="maxAllowedChargeCurrent"    column="max_allowed_charge_current"    />
-        <result property="maxAllowedDischargeCurrent"    column="max_allowed_discharge_current"    />
-        <result property="batteryPackVoltage"    column="battery_pack_voltage"    />
-        <result property="batteryPackCurrent"    column="battery_pack_current"    />
-        <result property="batteryPackTemp"    column="battery_pack_temp"    />
-        <result property="batteryPackSoc"    column="battery_pack_soc"    />
-        <result property="batteryPackSoh"    column="battery_pack_soh"    />
-        <result property="batteryPackInsulationResistance"    column="battery_pack_insulation_resistance"    />
-        <result property="avgCellVoltage"    column="avg_cell_voltage"    />
-        <result property="avgCellTemp"    column="avg_cell_temp"    />
-        <result property="maxCellVoltage"    column="max_cell_voltage"    />
-        <result property="maxCellVoltageId"    column="max_cell_voltage_id"    />
-        <result property="minCellVoltage"    column="min_cell_voltage"    />
-        <result property="minCellVoltageId"    column="min_cell_voltage_id"    />
-        <result property="maxCellTemp"    column="max_cell_temp"    />
-        <result property="maxCellTempId"    column="max_cell_temp_id"    />
-        <result property="minCellTemp"    column="min_cell_temp"    />
-        <result property="minCellTempId"    column="min_cell_temp_id"    />
-        <result property="maxCellSoc"    column="max_cell_soc"    />
-        <result property="maxCellSocId"    column="max_cell_soc_id"    />
-        <result property="minCellSoc"    column="min_cell_soc"    />
-        <result property="minCellSocId"    column="min_cell_soc_id"    />
-        <result property="maxCellSoh"    column="max_cell_soh"    />
-        <result property="maxCellSohId"    column="max_cell_soh_id"    />
-        <result property="minCellSoh"    column="min_cell_soh"    />
-        <result property="minCellSohId"    column="min_cell_soh_id"    />
-        <result property="totalChargeEnergy"    column="total_charge_energy"    />
-        <result property="totalDischargeEnergy"    column="total_discharge_energy"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="updateBy"    column="update_by"    />
     </resultMap>
 
     <sql id="selectEmsBatteryStackVo">
-        select id, work_status, pcs_communication_status, ems_communication_status, total_voltage, chargeable_capacity, total_charged_capacity, total_current, dischargeable_capacity, total_discharged_capacity, soh, average_temperature, insulation_resistance, current_soc, create_by, create_time, update_by, update_time, remark, site_id, device_id, max_allowed_charge_power, max_allowed_discharge_power, max_allowed_charge_voltage, max_allowed_discharge_voltage, max_allowed_charge_current, max_allowed_discharge_current, battery_pack_voltage, battery_pack_current, battery_pack_temp, battery_pack_soc, battery_pack_soh, battery_pack_insulation_resistance, avg_cell_voltage, avg_cell_temp, max_cell_voltage, max_cell_voltage_id, min_cell_voltage, min_cell_voltage_id, max_cell_temp, max_cell_temp_id, min_cell_temp, min_cell_temp_id, max_cell_soc, max_cell_soc_id, min_cell_soc, min_cell_soc_id, max_cell_soh, max_cell_soh_id, min_cell_soh, min_cell_soh_id, total_charge_energy, total_discharge_energy from ems_battery_stack
+        select id, work_status, pcs_communication_status, ems_communication_status, operation_status, stack_voltage, stack_current, stack_soc, stack_soh, max_cell_voltage, max_voltage_group_id, max_voltage_cell_id, min_cell_voltage, min_voltage_group_id, min_voltage_cell_id, max_cell_temp, max_temp_group_id, max_temp_cell_id, min_cell_temp, min_temp_group_id, min_temp_cell_id, total_charge_capacity, total_discharge_capacity, session_charge_capacity, session_discharge_capacity, available_charge_capacity, available_discharge_capacity, remaining_discharge_time, remaining_charge_time, max_discharge_power, max_charge_power, max_discharge_current, max_charge_current, daily_discharge_cycles, daily_charge_cycles, daily_discharge_capacity, daily_charge_capacity, operating_temp, bms_status, bms_charge_status, stack_insulation_resistance, site_id, device_id, create_time, create_by, update_time, update_by from ems_battery_stack
     </sql>
 
     <select id="selectEmsBatteryStackList" parameterType="EmsBatteryStack" resultMap="EmsBatteryStackResult">
@@ -70,50 +64,45 @@
             <if test="workStatus != null  and workStatus != ''"> and work_status = #{workStatus}</if>
             <if test="pcsCommunicationStatus != null  and pcsCommunicationStatus != ''"> and pcs_communication_status = #{pcsCommunicationStatus}</if>
             <if test="emsCommunicationStatus != null  and emsCommunicationStatus != ''"> and ems_communication_status = #{emsCommunicationStatus}</if>
-            <if test="totalVoltage != null "> and total_voltage = #{totalVoltage}</if>
-            <if test="chargeableCapacity != null "> and chargeable_capacity = #{chargeableCapacity}</if>
-            <if test="totalChargedCapacity != null "> and total_charged_capacity = #{totalChargedCapacity}</if>
-            <if test="totalCurrent != null "> and total_current = #{totalCurrent}</if>
-            <if test="dischargeableCapacity != null "> and dischargeable_capacity = #{dischargeableCapacity}</if>
-            <if test="totalDischargedCapacity != null "> and total_discharged_capacity = #{totalDischargedCapacity}</if>
-            <if test="soh != null "> and soh = #{soh}</if>
-            <if test="averageTemperature != null "> and average_temperature = #{averageTemperature}</if>
-            <if test="insulationResistance != null "> and insulation_resistance = #{insulationResistance}</if>
-            <if test="currentSoc != null "> and current_soc = #{currentSoc}</if>
+            <if test="operationStatus != null  and operationStatus != ''"> and operation_status = #{operationStatus}</if>
+            <if test="stackVoltage != null "> and stack_voltage = #{stackVoltage}</if>
+            <if test="stackCurrent != null "> and stack_current = #{stackCurrent}</if>
+            <if test="stackSoc != null "> and stack_soc = #{stackSoc}</if>
+            <if test="stackSoh != null "> and stack_soh = #{stackSoh}</if>
+            <if test="maxCellVoltage != null "> and max_cell_voltage = #{maxCellVoltage}</if>
+            <if test="maxVoltageGroupId != null "> and max_voltage_group_id = #{maxVoltageGroupId}</if>
+            <if test="maxVoltageCellId != null "> and max_voltage_cell_id = #{maxVoltageCellId}</if>
+            <if test="minCellVoltage != null "> and min_cell_voltage = #{minCellVoltage}</if>
+            <if test="minVoltageGroupId != null "> and min_voltage_group_id = #{minVoltageGroupId}</if>
+            <if test="minVoltageCellId != null "> and min_voltage_cell_id = #{minVoltageCellId}</if>
+            <if test="maxCellTemp != null "> and max_cell_temp = #{maxCellTemp}</if>
+            <if test="maxTempGroupId != null "> and max_temp_group_id = #{maxTempGroupId}</if>
+            <if test="maxTempCellId != null "> and max_temp_cell_id = #{maxTempCellId}</if>
+            <if test="minCellTemp != null "> and min_cell_temp = #{minCellTemp}</if>
+            <if test="minTempGroupId != null "> and min_temp_group_id = #{minTempGroupId}</if>
+            <if test="minTempCellId != null "> and min_temp_cell_id = #{minTempCellId}</if>
+            <if test="totalChargeCapacity != null "> and total_charge_capacity = #{totalChargeCapacity}</if>
+            <if test="totalDischargeCapacity != null "> and total_discharge_capacity = #{totalDischargeCapacity}</if>
+            <if test="sessionChargeCapacity != null "> and session_charge_capacity = #{sessionChargeCapacity}</if>
+            <if test="sessionDischargeCapacity != null "> and session_discharge_capacity = #{sessionDischargeCapacity}</if>
+            <if test="availableChargeCapacity != null "> and available_charge_capacity = #{availableChargeCapacity}</if>
+            <if test="availableDischargeCapacity != null "> and available_discharge_capacity = #{availableDischargeCapacity}</if>
+            <if test="remainingDischargeTime != null "> and remaining_discharge_time = #{remainingDischargeTime}</if>
+            <if test="remainingChargeTime != null "> and remaining_charge_time = #{remainingChargeTime}</if>
+            <if test="maxDischargePower != null "> and max_discharge_power = #{maxDischargePower}</if>
+            <if test="maxChargePower != null "> and max_charge_power = #{maxChargePower}</if>
+            <if test="maxDischargeCurrent != null "> and max_discharge_current = #{maxDischargeCurrent}</if>
+            <if test="maxChargeCurrent != null "> and max_charge_current = #{maxChargeCurrent}</if>
+            <if test="dailyDischargeCycles != null "> and daily_discharge_cycles = #{dailyDischargeCycles}</if>
+            <if test="dailyChargeCycles != null "> and daily_charge_cycles = #{dailyChargeCycles}</if>
+            <if test="dailyDischargeCapacity != null "> and daily_discharge_capacity = #{dailyDischargeCapacity}</if>
+            <if test="dailyChargeCapacity != null "> and daily_charge_capacity = #{dailyChargeCapacity}</if>
+            <if test="operatingTemp != null "> and operating_temp = #{operatingTemp}</if>
+            <if test="bmsStatus != null  and bmsStatus != ''"> and bms_status = #{bmsStatus}</if>
+            <if test="bmsChargeStatus != null  and bmsChargeStatus != ''"> and bms_charge_status = #{bmsChargeStatus}</if>
+            <if test="stackInsulationResistance != null "> and stack_insulation_resistance = #{stackInsulationResistance}</if>
             <if test="siteId != null  and siteId != ''"> and site_id = #{siteId}</if>
             <if test="deviceId != null  and deviceId != ''"> and device_id = #{deviceId}</if>
-            <if test="maxAllowedChargePower != null "> and max_allowed_charge_power = #{maxAllowedChargePower}</if>
-            <if test="maxAllowedDischargePower != null "> and max_allowed_discharge_power = #{maxAllowedDischargePower}</if>
-            <if test="maxAllowedChargeVoltage != null "> and max_allowed_charge_voltage = #{maxAllowedChargeVoltage}</if>
-            <if test="maxAllowedDischargeVoltage != null "> and max_allowed_discharge_voltage = #{maxAllowedDischargeVoltage}</if>
-            <if test="maxAllowedChargeCurrent != null "> and max_allowed_charge_current = #{maxAllowedChargeCurrent}</if>
-            <if test="maxAllowedDischargeCurrent != null "> and max_allowed_discharge_current = #{maxAllowedDischargeCurrent}</if>
-            <if test="batteryPackVoltage != null "> and battery_pack_voltage = #{batteryPackVoltage}</if>
-            <if test="batteryPackCurrent != null "> and battery_pack_current = #{batteryPackCurrent}</if>
-            <if test="batteryPackTemp != null "> and battery_pack_temp = #{batteryPackTemp}</if>
-            <if test="batteryPackSoc != null "> and battery_pack_soc = #{batteryPackSoc}</if>
-            <if test="batteryPackSoh != null "> and battery_pack_soh = #{batteryPackSoh}</if>
-            <if test="batteryPackInsulationResistance != null "> and battery_pack_insulation_resistance = #{batteryPackInsulationResistance}</if>
-            <if test="avgCellVoltage != null "> and avg_cell_voltage = #{avgCellVoltage}</if>
-            <if test="avgCellTemp != null "> and avg_cell_temp = #{avgCellTemp}</if>
-            <if test="maxCellVoltage != null "> and max_cell_voltage = #{maxCellVoltage}</if>
-            <if test="maxCellVoltageId != null "> and max_cell_voltage_id = #{maxCellVoltageId}</if>
-            <if test="minCellVoltage != null "> and min_cell_voltage = #{minCellVoltage}</if>
-            <if test="minCellVoltageId != null "> and min_cell_voltage_id = #{minCellVoltageId}</if>
-            <if test="maxCellTemp != null "> and max_cell_temp = #{maxCellTemp}</if>
-            <if test="maxCellTempId != null "> and max_cell_temp_id = #{maxCellTempId}</if>
-            <if test="minCellTemp != null "> and min_cell_temp = #{minCellTemp}</if>
-            <if test="minCellTempId != null "> and min_cell_temp_id = #{minCellTempId}</if>
-            <if test="maxCellSoc != null "> and max_cell_soc = #{maxCellSoc}</if>
-            <if test="maxCellSocId != null "> and max_cell_soc_id = #{maxCellSocId}</if>
-            <if test="minCellSoc != null "> and min_cell_soc = #{minCellSoc}</if>
-            <if test="minCellSocId != null "> and min_cell_soc_id = #{minCellSocId}</if>
-            <if test="maxCellSoh != null "> and max_cell_soh = #{maxCellSoh}</if>
-            <if test="maxCellSohId != null "> and max_cell_soh_id = #{maxCellSohId}</if>
-            <if test="minCellSoh != null "> and min_cell_soh = #{minCellSoh}</if>
-            <if test="minCellSohId != null "> and min_cell_soh_id = #{minCellSohId}</if>
-            <if test="totalChargeEnergy != null "> and total_charge_energy = #{totalChargeEnergy}</if>
-            <if test="totalDischargeEnergy != null "> and total_discharge_energy = #{totalDischargeEnergy}</if>
         </where>
     </select>
 
@@ -128,109 +117,97 @@
             <if test="workStatus != null">work_status,</if>
             <if test="pcsCommunicationStatus != null">pcs_communication_status,</if>
             <if test="emsCommunicationStatus != null">ems_communication_status,</if>
-            <if test="totalVoltage != null">total_voltage,</if>
-            <if test="chargeableCapacity != null">chargeable_capacity,</if>
-            <if test="totalChargedCapacity != null">total_charged_capacity,</if>
-            <if test="totalCurrent != null">total_current,</if>
-            <if test="dischargeableCapacity != null">dischargeable_capacity,</if>
-            <if test="totalDischargedCapacity != null">total_discharged_capacity,</if>
-            <if test="soh != null">soh,</if>
-            <if test="averageTemperature != null">average_temperature,</if>
-            <if test="insulationResistance != null">insulation_resistance,</if>
-            <if test="currentSoc != null">current_soc,</if>
-            <if test="createBy != null">create_by,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="updateBy != null">update_by,</if>
-            <if test="updateTime != null">update_time,</if>
-            <if test="remark != null">remark,</if>
-            <if test="siteId != null">site_id,</if>
-            <if test="deviceId != null and deviceId != ''">device_id,</if>
-            <if test="maxAllowedChargePower != null">max_allowed_charge_power,</if>
-            <if test="maxAllowedDischargePower != null">max_allowed_discharge_power,</if>
-            <if test="maxAllowedChargeVoltage != null">max_allowed_charge_voltage,</if>
-            <if test="maxAllowedDischargeVoltage != null">max_allowed_discharge_voltage,</if>
-            <if test="maxAllowedChargeCurrent != null">max_allowed_charge_current,</if>
-            <if test="maxAllowedDischargeCurrent != null">max_allowed_discharge_current,</if>
-            <if test="batteryPackVoltage != null">battery_pack_voltage,</if>
-            <if test="batteryPackCurrent != null">battery_pack_current,</if>
-            <if test="batteryPackTemp != null">battery_pack_temp,</if>
-            <if test="batteryPackSoc != null">battery_pack_soc,</if>
-            <if test="batteryPackSoh != null">battery_pack_soh,</if>
-            <if test="batteryPackInsulationResistance != null">battery_pack_insulation_resistance,</if>
-            <if test="avgCellVoltage != null">avg_cell_voltage,</if>
-            <if test="avgCellTemp != null">avg_cell_temp,</if>
+            <if test="operationStatus != null">operation_status,</if>
+            <if test="stackVoltage != null">stack_voltage,</if>
+            <if test="stackCurrent != null">stack_current,</if>
+            <if test="stackSoc != null">stack_soc,</if>
+            <if test="stackSoh != null">stack_soh,</if>
             <if test="maxCellVoltage != null">max_cell_voltage,</if>
-            <if test="maxCellVoltageId != null">max_cell_voltage_id,</if>
+            <if test="maxVoltageGroupId != null">max_voltage_group_id,</if>
+            <if test="maxVoltageCellId != null">max_voltage_cell_id,</if>
             <if test="minCellVoltage != null">min_cell_voltage,</if>
-            <if test="minCellVoltageId != null">min_cell_voltage_id,</if>
+            <if test="minVoltageGroupId != null">min_voltage_group_id,</if>
+            <if test="minVoltageCellId != null">min_voltage_cell_id,</if>
             <if test="maxCellTemp != null">max_cell_temp,</if>
-            <if test="maxCellTempId != null">max_cell_temp_id,</if>
+            <if test="maxTempGroupId != null">max_temp_group_id,</if>
+            <if test="maxTempCellId != null">max_temp_cell_id,</if>
             <if test="minCellTemp != null">min_cell_temp,</if>
-            <if test="minCellTempId != null">min_cell_temp_id,</if>
-            <if test="maxCellSoc != null">max_cell_soc,</if>
-            <if test="maxCellSocId != null">max_cell_soc_id,</if>
-            <if test="minCellSoc != null">min_cell_soc,</if>
-            <if test="minCellSocId != null">min_cell_soc_id,</if>
-            <if test="maxCellSoh != null">max_cell_soh,</if>
-            <if test="maxCellSohId != null">max_cell_soh_id,</if>
-            <if test="minCellSoh != null">min_cell_soh,</if>
-            <if test="minCellSohId != null">min_cell_soh_id,</if>
-            <if test="totalChargeEnergy != null">total_charge_energy,</if>
-            <if test="totalDischargeEnergy != null">total_discharge_energy,</if>
+            <if test="minTempGroupId != null">min_temp_group_id,</if>
+            <if test="minTempCellId != null">min_temp_cell_id,</if>
+            <if test="totalChargeCapacity != null">total_charge_capacity,</if>
+            <if test="totalDischargeCapacity != null">total_discharge_capacity,</if>
+            <if test="sessionChargeCapacity != null">session_charge_capacity,</if>
+            <if test="sessionDischargeCapacity != null">session_discharge_capacity,</if>
+            <if test="availableChargeCapacity != null">available_charge_capacity,</if>
+            <if test="availableDischargeCapacity != null">available_discharge_capacity,</if>
+            <if test="remainingDischargeTime != null">remaining_discharge_time,</if>
+            <if test="remainingChargeTime != null">remaining_charge_time,</if>
+            <if test="maxDischargePower != null">max_discharge_power,</if>
+            <if test="maxChargePower != null">max_charge_power,</if>
+            <if test="maxDischargeCurrent != null">max_discharge_current,</if>
+            <if test="maxChargeCurrent != null">max_charge_current,</if>
+            <if test="dailyDischargeCycles != null">daily_discharge_cycles,</if>
+            <if test="dailyChargeCycles != null">daily_charge_cycles,</if>
+            <if test="dailyDischargeCapacity != null">daily_discharge_capacity,</if>
+            <if test="dailyChargeCapacity != null">daily_charge_capacity,</if>
+            <if test="operatingTemp != null">operating_temp,</if>
+            <if test="bmsStatus != null">bms_status,</if>
+            <if test="bmsChargeStatus != null">bms_charge_status,</if>
+            <if test="stackInsulationResistance != null">stack_insulation_resistance,</if>
+            <if test="siteId != null and siteId != ''">site_id,</if>
+            <if test="deviceId != null and deviceId != ''">device_id,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="updateBy != null">update_by,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="workStatus != null">#{workStatus},</if>
             <if test="pcsCommunicationStatus != null">#{pcsCommunicationStatus},</if>
             <if test="emsCommunicationStatus != null">#{emsCommunicationStatus},</if>
-            <if test="totalVoltage != null">#{totalVoltage},</if>
-            <if test="chargeableCapacity != null">#{chargeableCapacity},</if>
-            <if test="totalChargedCapacity != null">#{totalChargedCapacity},</if>
-            <if test="totalCurrent != null">#{totalCurrent},</if>
-            <if test="dischargeableCapacity != null">#{dischargeableCapacity},</if>
-            <if test="totalDischargedCapacity != null">#{totalDischargedCapacity},</if>
-            <if test="soh != null">#{soh},</if>
-            <if test="averageTemperature != null">#{averageTemperature},</if>
-            <if test="insulationResistance != null">#{insulationResistance},</if>
-            <if test="currentSoc != null">#{currentSoc},</if>
-            <if test="createBy != null">#{createBy},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateBy != null">#{updateBy},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-            <if test="remark != null">#{remark},</if>
-            <if test="siteId != null">#{siteId},</if>
-            <if test="deviceId != null and deviceId != ''">#{deviceId},</if>
-            <if test="maxAllowedChargePower != null">#{maxAllowedChargePower},</if>
-            <if test="maxAllowedDischargePower != null">#{maxAllowedDischargePower},</if>
-            <if test="maxAllowedChargeVoltage != null">#{maxAllowedChargeVoltage},</if>
-            <if test="maxAllowedDischargeVoltage != null">#{maxAllowedDischargeVoltage},</if>
-            <if test="maxAllowedChargeCurrent != null">#{maxAllowedChargeCurrent},</if>
-            <if test="maxAllowedDischargeCurrent != null">#{maxAllowedDischargeCurrent},</if>
-            <if test="batteryPackVoltage != null">#{batteryPackVoltage},</if>
-            <if test="batteryPackCurrent != null">#{batteryPackCurrent},</if>
-            <if test="batteryPackTemp != null">#{batteryPackTemp},</if>
-            <if test="batteryPackSoc != null">#{batteryPackSoc},</if>
-            <if test="batteryPackSoh != null">#{batteryPackSoh},</if>
-            <if test="batteryPackInsulationResistance != null">#{batteryPackInsulationResistance},</if>
-            <if test="avgCellVoltage != null">#{avgCellVoltage},</if>
-            <if test="avgCellTemp != null">#{avgCellTemp},</if>
+            <if test="operationStatus != null">#{operationStatus},</if>
+            <if test="stackVoltage != null">#{stackVoltage},</if>
+            <if test="stackCurrent != null">#{stackCurrent},</if>
+            <if test="stackSoc != null">#{stackSoc},</if>
+            <if test="stackSoh != null">#{stackSoh},</if>
             <if test="maxCellVoltage != null">#{maxCellVoltage},</if>
-            <if test="maxCellVoltageId != null">#{maxCellVoltageId},</if>
+            <if test="maxVoltageGroupId != null">#{maxVoltageGroupId},</if>
+            <if test="maxVoltageCellId != null">#{maxVoltageCellId},</if>
             <if test="minCellVoltage != null">#{minCellVoltage},</if>
-            <if test="minCellVoltageId != null">#{minCellVoltageId},</if>
+            <if test="minVoltageGroupId != null">#{minVoltageGroupId},</if>
+            <if test="minVoltageCellId != null">#{minVoltageCellId},</if>
             <if test="maxCellTemp != null">#{maxCellTemp},</if>
-            <if test="maxCellTempId != null">#{maxCellTempId},</if>
+            <if test="maxTempGroupId != null">#{maxTempGroupId},</if>
+            <if test="maxTempCellId != null">#{maxTempCellId},</if>
             <if test="minCellTemp != null">#{minCellTemp},</if>
-            <if test="minCellTempId != null">#{minCellTempId},</if>
-            <if test="maxCellSoc != null">#{maxCellSoc},</if>
-            <if test="maxCellSocId != null">#{maxCellSocId},</if>
-            <if test="minCellSoc != null">#{minCellSoc},</if>
-            <if test="minCellSocId != null">#{minCellSocId},</if>
-            <if test="maxCellSoh != null">#{maxCellSoh},</if>
-            <if test="maxCellSohId != null">#{maxCellSohId},</if>
-            <if test="minCellSoh != null">#{minCellSoh},</if>
-            <if test="minCellSohId != null">#{minCellSohId},</if>
-            <if test="totalChargeEnergy != null">#{totalChargeEnergy},</if>
-            <if test="totalDischargeEnergy != null">#{totalDischargeEnergy},</if>
+            <if test="minTempGroupId != null">#{minTempGroupId},</if>
+            <if test="minTempCellId != null">#{minTempCellId},</if>
+            <if test="totalChargeCapacity != null">#{totalChargeCapacity},</if>
+            <if test="totalDischargeCapacity != null">#{totalDischargeCapacity},</if>
+            <if test="sessionChargeCapacity != null">#{sessionChargeCapacity},</if>
+            <if test="sessionDischargeCapacity != null">#{sessionDischargeCapacity},</if>
+            <if test="availableChargeCapacity != null">#{availableChargeCapacity},</if>
+            <if test="availableDischargeCapacity != null">#{availableDischargeCapacity},</if>
+            <if test="remainingDischargeTime != null">#{remainingDischargeTime},</if>
+            <if test="remainingChargeTime != null">#{remainingChargeTime},</if>
+            <if test="maxDischargePower != null">#{maxDischargePower},</if>
+            <if test="maxChargePower != null">#{maxChargePower},</if>
+            <if test="maxDischargeCurrent != null">#{maxDischargeCurrent},</if>
+            <if test="maxChargeCurrent != null">#{maxChargeCurrent},</if>
+            <if test="dailyDischargeCycles != null">#{dailyDischargeCycles},</if>
+            <if test="dailyChargeCycles != null">#{dailyChargeCycles},</if>
+            <if test="dailyDischargeCapacity != null">#{dailyDischargeCapacity},</if>
+            <if test="dailyChargeCapacity != null">#{dailyChargeCapacity},</if>
+            <if test="operatingTemp != null">#{operatingTemp},</if>
+            <if test="bmsStatus != null">#{bmsStatus},</if>
+            <if test="bmsChargeStatus != null">#{bmsChargeStatus},</if>
+            <if test="stackInsulationResistance != null">#{stackInsulationResistance},</if>
+            <if test="siteId != null and siteId != ''">#{siteId},</if>
+            <if test="deviceId != null and deviceId != ''">#{deviceId},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
         </trim>
     </insert>
 
@@ -240,55 +217,49 @@
             <if test="workStatus != null">work_status = #{workStatus},</if>
             <if test="pcsCommunicationStatus != null">pcs_communication_status = #{pcsCommunicationStatus},</if>
             <if test="emsCommunicationStatus != null">ems_communication_status = #{emsCommunicationStatus},</if>
-            <if test="totalVoltage != null">total_voltage = #{totalVoltage},</if>
-            <if test="chargeableCapacity != null">chargeable_capacity = #{chargeableCapacity},</if>
-            <if test="totalChargedCapacity != null">total_charged_capacity = #{totalChargedCapacity},</if>
-            <if test="totalCurrent != null">total_current = #{totalCurrent},</if>
-            <if test="dischargeableCapacity != null">dischargeable_capacity = #{dischargeableCapacity},</if>
-            <if test="totalDischargedCapacity != null">total_discharged_capacity = #{totalDischargedCapacity},</if>
-            <if test="soh != null">soh = #{soh},</if>
-            <if test="averageTemperature != null">average_temperature = #{averageTemperature},</if>
-            <if test="insulationResistance != null">insulation_resistance = #{insulationResistance},</if>
-            <if test="currentSoc != null">current_soc = #{currentSoc},</if>
-            <if test="createBy != null">create_by = #{createBy},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateBy != null">update_by = #{updateBy},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-            <if test="remark != null">remark = #{remark},</if>
-            <if test="siteId != null">site_id = #{siteId},</if>
-            <if test="deviceId != null and deviceId != ''">device_id = #{deviceId},</if>
-            <if test="maxAllowedChargePower != null">max_allowed_charge_power = #{maxAllowedChargePower},</if>
-            <if test="maxAllowedDischargePower != null">max_allowed_discharge_power = #{maxAllowedDischargePower},</if>
-            <if test="maxAllowedChargeVoltage != null">max_allowed_charge_voltage = #{maxAllowedChargeVoltage},</if>
-            <if test="maxAllowedDischargeVoltage != null">max_allowed_discharge_voltage = #{maxAllowedDischargeVoltage},</if>
-            <if test="maxAllowedChargeCurrent != null">max_allowed_charge_current = #{maxAllowedChargeCurrent},</if>
-            <if test="maxAllowedDischargeCurrent != null">max_allowed_discharge_current = #{maxAllowedDischargeCurrent},</if>
-            <if test="batteryPackVoltage != null">battery_pack_voltage = #{batteryPackVoltage},</if>
-            <if test="batteryPackCurrent != null">battery_pack_current = #{batteryPackCurrent},</if>
-            <if test="batteryPackTemp != null">battery_pack_temp = #{batteryPackTemp},</if>
-            <if test="batteryPackSoc != null">battery_pack_soc = #{batteryPackSoc},</if>
-            <if test="batteryPackSoh != null">battery_pack_soh = #{batteryPackSoh},</if>
-            <if test="batteryPackInsulationResistance != null">battery_pack_insulation_resistance = #{batteryPackInsulationResistance},</if>
-            <if test="avgCellVoltage != null">avg_cell_voltage = #{avgCellVoltage},</if>
-            <if test="avgCellTemp != null">avg_cell_temp = #{avgCellTemp},</if>
+            <if test="operationStatus != null">operation_status = #{operationStatus},</if>
+            <if test="stackVoltage != null">stack_voltage = #{stackVoltage},</if>
+            <if test="stackCurrent != null">stack_current = #{stackCurrent},</if>
+            <if test="stackSoc != null">stack_soc = #{stackSoc},</if>
+            <if test="stackSoh != null">stack_soh = #{stackSoh},</if>
             <if test="maxCellVoltage != null">max_cell_voltage = #{maxCellVoltage},</if>
-            <if test="maxCellVoltageId != null">max_cell_voltage_id = #{maxCellVoltageId},</if>
+            <if test="maxVoltageGroupId != null">max_voltage_group_id = #{maxVoltageGroupId},</if>
+            <if test="maxVoltageCellId != null">max_voltage_cell_id = #{maxVoltageCellId},</if>
             <if test="minCellVoltage != null">min_cell_voltage = #{minCellVoltage},</if>
-            <if test="minCellVoltageId != null">min_cell_voltage_id = #{minCellVoltageId},</if>
+            <if test="minVoltageGroupId != null">min_voltage_group_id = #{minVoltageGroupId},</if>
+            <if test="minVoltageCellId != null">min_voltage_cell_id = #{minVoltageCellId},</if>
             <if test="maxCellTemp != null">max_cell_temp = #{maxCellTemp},</if>
-            <if test="maxCellTempId != null">max_cell_temp_id = #{maxCellTempId},</if>
+            <if test="maxTempGroupId != null">max_temp_group_id = #{maxTempGroupId},</if>
+            <if test="maxTempCellId != null">max_temp_cell_id = #{maxTempCellId},</if>
             <if test="minCellTemp != null">min_cell_temp = #{minCellTemp},</if>
-            <if test="minCellTempId != null">min_cell_temp_id = #{minCellTempId},</if>
-            <if test="maxCellSoc != null">max_cell_soc = #{maxCellSoc},</if>
-            <if test="maxCellSocId != null">max_cell_soc_id = #{maxCellSocId},</if>
-            <if test="minCellSoc != null">min_cell_soc = #{minCellSoc},</if>
-            <if test="minCellSocId != null">min_cell_soc_id = #{minCellSocId},</if>
-            <if test="maxCellSoh != null">max_cell_soh = #{maxCellSoh},</if>
-            <if test="maxCellSohId != null">max_cell_soh_id = #{maxCellSohId},</if>
-            <if test="minCellSoh != null">min_cell_soh = #{minCellSoh},</if>
-            <if test="minCellSohId != null">min_cell_soh_id = #{minCellSohId},</if>
-            <if test="totalChargeEnergy != null">total_charge_energy = #{totalChargeEnergy},</if>
-            <if test="totalDischargeEnergy != null">total_discharge_energy = #{totalDischargeEnergy},</if>
+            <if test="minTempGroupId != null">min_temp_group_id = #{minTempGroupId},</if>
+            <if test="minTempCellId != null">min_temp_cell_id = #{minTempCellId},</if>
+            <if test="totalChargeCapacity != null">total_charge_capacity = #{totalChargeCapacity},</if>
+            <if test="totalDischargeCapacity != null">total_discharge_capacity = #{totalDischargeCapacity},</if>
+            <if test="sessionChargeCapacity != null">session_charge_capacity = #{sessionChargeCapacity},</if>
+            <if test="sessionDischargeCapacity != null">session_discharge_capacity = #{sessionDischargeCapacity},</if>
+            <if test="availableChargeCapacity != null">available_charge_capacity = #{availableChargeCapacity},</if>
+            <if test="availableDischargeCapacity != null">available_discharge_capacity = #{availableDischargeCapacity},</if>
+            <if test="remainingDischargeTime != null">remaining_discharge_time = #{remainingDischargeTime},</if>
+            <if test="remainingChargeTime != null">remaining_charge_time = #{remainingChargeTime},</if>
+            <if test="maxDischargePower != null">max_discharge_power = #{maxDischargePower},</if>
+            <if test="maxChargePower != null">max_charge_power = #{maxChargePower},</if>
+            <if test="maxDischargeCurrent != null">max_discharge_current = #{maxDischargeCurrent},</if>
+            <if test="maxChargeCurrent != null">max_charge_current = #{maxChargeCurrent},</if>
+            <if test="dailyDischargeCycles != null">daily_discharge_cycles = #{dailyDischargeCycles},</if>
+            <if test="dailyChargeCycles != null">daily_charge_cycles = #{dailyChargeCycles},</if>
+            <if test="dailyDischargeCapacity != null">daily_discharge_capacity = #{dailyDischargeCapacity},</if>
+            <if test="dailyChargeCapacity != null">daily_charge_capacity = #{dailyChargeCapacity},</if>
+            <if test="operatingTemp != null">operating_temp = #{operatingTemp},</if>
+            <if test="bmsStatus != null">bms_status = #{bmsStatus},</if>
+            <if test="bmsChargeStatus != null">bms_charge_status = #{bmsChargeStatus},</if>
+            <if test="stackInsulationResistance != null">stack_insulation_resistance = #{stackInsulationResistance},</if>
+            <if test="siteId != null and siteId != ''">site_id = #{siteId},</if>
+            <if test="deviceId != null and deviceId != ''">device_id = #{deviceId},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
         </trim>
         where id = #{id}
     </update>
@@ -303,25 +274,4 @@
             #{id}
         </foreach>
     </delete>
-
-    <select id="selectEmsBatteryStackBySiteId" parameterType="String" resultType="com.xzzn.ems.domain.vo.BMSOverViewVo">
-        SELECT td.device_name as deviceName,tmp.work_status as workStatus,
-               tmp.pcs_communication_status as pcsCommunicationStatus,tmp.ems_communication_status as emsCommunicationStatus,
-               tmp.total_voltage as totalVoltage,tmp.chargeable_capacity as chargeableCapacity,
-               tmp.total_charged_capacity as totalChargedCapacity,
-               tmp.total_current as totalCurrent,tmp.dischargeable_capacity as dischargeableCapacity,
-               tmp.total_discharged_capacity as totalDischargedCapacity,
-               tmp.soh as soh,tmp.average_temperature as averageTemperature,tmp.insulation_resistance as insulationResistance,
-               tmp.current_soc as currentSoc,tmp.site_id as siteId,tmp.device_id as deviceId
-        FROM ems_battery_stack tmp
-        left join ems_devices_setting td on tmp.device_id = td.device_id and tmp.site_id = td.site_id
-        INNER JOIN (
-            SELECT p.site_id,  p.device_id, MAX(p.update_time) AS max_update_time
-            FROM ems_battery_stack p
-            WHERE p.site_id = #{siteId}
-            GROUP BY p.site_id,p.device_id
-        ) latest on tmp.device_id = latest.device_id and tmp.update_time = latest.max_update_time
-        WHERE tmp.site_id = #{siteId}
-        order by tmp.device_id
-    </select>
 </mapper>
\ No newline at end of file