diff --git a/ems-system/src/main/java/com/xzzn/ems/domain/EmsBatteryDataDay.java b/ems-system/src/main/java/com/xzzn/ems/domain/EmsBatteryDataDay.java index 6db06fd..4e6b1c3 100644 --- a/ems-system/src/main/java/com/xzzn/ems/domain/EmsBatteryDataDay.java +++ b/ems-system/src/main/java/com/xzzn/ems/domain/EmsBatteryDataDay.java @@ -1,12 +1,14 @@ package com.xzzn.ems.domain; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.xzzn.common.annotation.Excel; +import com.xzzn.common.core.domain.BaseEntity; + import java.math.BigDecimal; import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.xzzn.common.core.domain.BaseEntity; + import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.xzzn.common.annotation.Excel; /** * 单体电池天级数据对象 ems_battery_data_day @@ -75,6 +77,10 @@ public class EmsBatteryDataDay extends BaseEntity @Excel(name = "天级时间维度", width = 30, dateFormat = "yyyy-MM-dd") private Date dayTime; + /** 单体电池电流 */ + @Excel(name = "单体电池电流") + private BigDecimal current; + public void setId(Long id) { this.id = id; @@ -215,6 +221,14 @@ public class EmsBatteryDataDay extends BaseEntity return dayTime; } + public BigDecimal getCurrent() { + return current; + } + + public void setCurrent(BigDecimal current) { + this.current = current; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) @@ -237,6 +251,7 @@ public class EmsBatteryDataDay extends BaseEntity .append("clusterDeviceId", getClusterDeviceId()) .append("interResistance", getInterResistance()) .append("dayTime", getDayTime()) + .append("current", getCurrent()) .toString(); } } diff --git a/ems-system/src/main/resources/mapper/ems/EmsBatteryDataDayMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsBatteryDataDayMapper.xml index 6dd7135..a54c203 100644 --- a/ems-system/src/main/resources/mapper/ems/EmsBatteryDataDayMapper.xml +++ b/ems-system/src/main/resources/mapper/ems/EmsBatteryDataDayMapper.xml @@ -97,6 +97,7 @@ #{deviceId}, #{clusterDeviceId}, #{interResistance}, + #{current}, #{dayTime}, diff --git a/ems-system/src/main/resources/mapper/ems/EmsBatteryDataMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsBatteryDataMapper.xml index 5776165..5776967 100644 --- a/ems-system/src/main/resources/mapper/ems/EmsBatteryDataMapper.xml +++ b/ems-system/src/main/resources/mapper/ems/EmsBatteryDataMapper.xml @@ -23,10 +23,11 @@ + - select id, battery_pack, battery_cluster, battery_cell_id, voltage, temperature, soc, soh, data_timestamp, create_by, create_time, update_by, update_time, remark, site_id, device_id, cluster_device_id, inter_resistance from ems_battery_data + select id, battery_pack, battery_cluster, battery_cell_id, voltage, temperature, soc, soh, data_timestamp, create_by, create_time, update_by, update_time, remark, site_id, device_id, cluster_device_id, inter_resistance, current from ems_battery_data @@ -72,6 +74,7 @@ device_id, cluster_device_id, inter_resistance, + current, #{batteryPack}, @@ -91,6 +94,7 @@ #{deviceId}, #{clusterDeviceId}, #{interResistance}, + #{current}, @@ -114,6 +118,7 @@ device_id = #{deviceId}, cluster_device_id = #{clusterDeviceId}, inter_resistance = #{interResistance}, + current = #{current}, where id = #{id} @@ -214,7 +219,7 @@ #{item.batteryPack}, #{item.batteryCluster}, #{item.batteryCellId}, #{item.voltage}, #{item.temperature}, #{item.soc}, #{item.soh}, #{item.dataTimestamp}, #{item.createBy}, #{item.createTime}, #{item.updateBy}, #{item.updateTime}, - #{item.remark}, #{item.siteId}, #{item.deviceId}, #{item.clusterDeviceId},#{item.interResistance} + #{item.remark}, #{item.siteId}, #{item.deviceId}, #{item.clusterDeviceId},#{item.interResistance},#{item.current} )