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();
     }
 }

ems-system/src/main/resources/mapper/ems/EmsBatteryDataDayMapper.xml

@@ -97,6 +97,7 @@
             <if test="deviceId != null">#{deviceId},</if>
             <if test="clusterDeviceId != null">#{clusterDeviceId},</if>
             <if test="interResistance != null">#{interResistance},</if>
+            <if test="current != null">#{current},</if>
             <if test="dayTime != null">#{dayTime},</if>
         </trim>
     </insert>

ems-system/src/main/resources/mapper/ems/EmsBatteryDataMapper.xml

@@ -23,10 +23,11 @@
         <result property="deviceId"    column="device_id"    />
         <result property="clusterDeviceId"    column="cluster_device_id"    />
         <result property="interResistance"    column="inter_resistance"    />
+        <result property="current"    column="current"    />
     </resultMap>
 
     <sql id="selectEmsBatteryDataVo">
-        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
     </sql>
 
     <select id="selectEmsBatteryDataList" parameterType="EmsBatteryData" resultMap="EmsBatteryDataResult">
@@ -44,6 +45,7 @@
             <if test="deviceId != null  and deviceId != ''"> and device_id = #{deviceId}</if>
             <if test="clusterDeviceId != null  and clusterDeviceId != ''"> and cluster_device_id = #{clusterDeviceId}</if>
             <if test="interResistance != null "> and inter_resistance = #{interResistance}</if>
+            <if test="current != null "> and current = #{current}</if>
         </where>
     </select>
 
@@ -72,6 +74,7 @@
             <if test="deviceId != null and deviceId != ''">device_id,</if>
             <if test="clusterDeviceId != null and clusterDeviceId != ''">cluster_device_id,</if>
             <if test="interResistance != null">inter_resistance,</if>
+            <if test="current != null">current,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="batteryPack != null">#{batteryPack},</if>
@@ -91,6 +94,7 @@
             <if test="deviceId != null and deviceId != ''">#{deviceId},</if>
             <if test="clusterDeviceId != null and clusterDeviceId != ''">#{clusterDeviceId},</if>
             <if test="interResistance != null">#{interResistance},</if>
+            <if test="current != null">#{current},</if>
         </trim>
     </insert>
 
@@ -114,6 +118,7 @@
             <if test="deviceId != null and deviceId != ''">device_id = #{deviceId},</if>
             <if test="clusterDeviceId != null and clusterDeviceId != ''">cluster_device_id = #{clusterDeviceId},</if>
             <if test="interResistance != null">inter_resistance = #{interResistance},</if>
+            <if test="current != null">current = #{current},</if>
         </trim>
         where id = #{id}
     </update>
@@ -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}
             )
         </foreach>
     </insert>