From f8dc8d154f691aa8a22cb43704b498504fdd0978 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=92=BE=E9=85=92?= <dqwzam0@163.com>
Date: Thu, 2 Jan 2025 10:49:12 +0800
Subject: [PATCH] =?UTF-8?q?=E7=81=8C=E6=BA=89=E6=8E=A7=E5=88=B6=E5=99=A8?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=8E=86=E5=8F=B2=E6=95=B0=E6=8D=AE=E8=A1=A8?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/NgWaterPumpUsageRecords.java       | 32 ++++++++++++++++++
 .../NgWaterPumpUsageRecordsMapper.xml         | 33 +++++++++++++++++--
 2 files changed, 63 insertions(+), 2 deletions(-)

diff --git a/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/domain/NgWaterPumpUsageRecords.java b/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/domain/NgWaterPumpUsageRecords.java
index ea762d3..42b2406 100644
--- a/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/domain/NgWaterPumpUsageRecords.java
+++ b/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/domain/NgWaterPumpUsageRecords.java
@@ -47,4 +47,36 @@ private static final long serialVersionUID = 1L;
             @ApiModelProperty("报文内容")
     private String messageContent;
 
+    /** 瞬时流量 */
+    @Excel(name = "瞬时流量")
+    @ApiModelProperty("瞬时流量")
+    private String insFlow;
+
+    /** 累计流量 */
+    @Excel(name = "累计流量")
+    @ApiModelProperty("累计流量")
+    private String sumFlow;
+
+    /** 实时时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "实时时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty("实时时间")
+    private Date realTime;
+
+    /** 保存时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "保存时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty("保存时间")
+    private Date saveTime;
+
+    /** 累计用电量 */
+    @Excel(name = "累计用电量")
+    @ApiModelProperty("累计用电量")
+    private String sumEle;
+
+    /** 瞬时功率 */
+    @Excel(name = "瞬时功率")
+    @ApiModelProperty("瞬时功率")
+    private String insPower;
+
 }
diff --git a/fastbee-service/fastbee-rechargecard-service/src/main/resources/mapper/rechargecard/NgWaterPumpUsageRecordsMapper.xml b/fastbee-service/fastbee-rechargecard-service/src/main/resources/mapper/rechargecard/NgWaterPumpUsageRecordsMapper.xml
index b02857d..5d7aa26 100644
--- a/fastbee-service/fastbee-rechargecard-service/src/main/resources/mapper/rechargecard/NgWaterPumpUsageRecordsMapper.xml
+++ b/fastbee-service/fastbee-rechargecard-service/src/main/resources/mapper/rechargecard/NgWaterPumpUsageRecordsMapper.xml
@@ -10,10 +10,16 @@
         <result property="pumpStopTime"    column="pump_stop_time"    />
         <result property="deviceNumber"    column="device_number"    />
         <result property="messageContent"    column="message_content"    />
+        <result property="insFlow"    column="ins_flow"    />
+        <result property="sumFlow"    column="sum_flow"    />
+        <result property="realTime"    column="real_time"    />
+        <result property="saveTime"    column="save_time"    />
+        <result property="sumEle"    column="sum_ele"    />
+        <result property="insPower"    column="ins_power"    />
     </resultMap>
 
     <sql id="selectNgWaterPumpUsageRecordsVo">
-        select id, pump_start_time, pump_stop_time, device_number, message_content from ng_water_pump_usage_records
+        select id, pump_start_time, pump_stop_time, device_number, message_content, ins_flow, sum_flow, real_time, save_time, sum_ele, ins_power from ng_water_pump_usage_records
     </sql>
 
     <select id="selectNgWaterPumpUsageRecordsList" parameterType="NgWaterPumpUsageRecords" resultMap="NgWaterPumpUsageRecordsResult">
@@ -23,8 +29,13 @@
             <if test="pumpStopTime != null "> and pump_stop_time = #{pumpStopTime}</if>
             <if test="deviceNumber != null  and deviceNumber != ''"> and device_number = #{deviceNumber}</if>
             <if test="messageContent != null  and messageContent != ''"> and message_content = #{messageContent}</if>
+            <if test="insFlow != null  and insFlow != ''"> and ins_flow = #{insFlow}</if>
+            <if test="sumFlow != null  and sumFlow != ''"> and sum_flow = #{sumFlow}</if>
+            <if test="realTime != null "> and real_time = #{realTime}</if>
+            <if test="saveTime != null "> and save_time = #{saveTime}</if>
+            <if test="sumEle != null  and sumEle != ''"> and sum_ele = #{sumEle}</if>
+            <if test="insPower != null  and insPower != ''"> and ins_power = #{insPower}</if>
         </where>
-        order by pump_start_time desc
     </select>
 
     <select id="selectNgWaterPumpUsageRecordsById" parameterType="Long" resultMap="NgWaterPumpUsageRecordsResult">
@@ -39,12 +50,24 @@
             <if test="pumpStopTime != null">pump_stop_time,</if>
             <if test="deviceNumber != null and deviceNumber != ''">device_number,</if>
             <if test="messageContent != null">message_content,</if>
+            <if test="insFlow != null">ins_flow,</if>
+            <if test="sumFlow != null">sum_flow,</if>
+            <if test="realTime != null">real_time,</if>
+            <if test="saveTime != null">save_time,</if>
+            <if test="sumEle != null">sum_ele,</if>
+            <if test="insPower != null">ins_power,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="pumpStartTime != null">#{pumpStartTime},</if>
             <if test="pumpStopTime != null">#{pumpStopTime},</if>
             <if test="deviceNumber != null and deviceNumber != ''">#{deviceNumber},</if>
             <if test="messageContent != null">#{messageContent},</if>
+            <if test="insFlow != null">#{insFlow},</if>
+            <if test="sumFlow != null">#{sumFlow},</if>
+            <if test="realTime != null">#{realTime},</if>
+            <if test="saveTime != null">#{saveTime},</if>
+            <if test="sumEle != null">#{sumEle},</if>
+            <if test="insPower != null">#{insPower},</if>
         </trim>
     </insert>
 
@@ -55,6 +78,12 @@
             <if test="pumpStopTime != null">pump_stop_time = #{pumpStopTime},</if>
             <if test="deviceNumber != null and deviceNumber != ''">device_number = #{deviceNumber},</if>
             <if test="messageContent != null">message_content = #{messageContent},</if>
+            <if test="insFlow != null">ins_flow = #{insFlow},</if>
+            <if test="sumFlow != null">sum_flow = #{sumFlow},</if>
+            <if test="realTime != null">real_time = #{realTime},</if>
+            <if test="saveTime != null">save_time = #{saveTime},</if>
+            <if test="sumEle != null">sum_ele = #{sumEle},</if>
+            <if test="insPower != null">ins_power = #{insPower},</if>
         </trim>
         where id = #{id}
     </update>