From b37a5b33330eb53b3a80adf5b1949313139a0619 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 22 七月 2024 16:26:44 +0800
Subject: [PATCH] 实现月统计Listener

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml |   35 ++++++++++++++++++++++++++++++-----
 1 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml
index 226ff6b..b098b54 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml
@@ -6,6 +6,8 @@
     <!--@Table rm_open_close_valve_last-->
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="last_history_id" jdbcType="BIGINT" property="lastHistoryId" />
+    <result column="client_id" jdbcType="BIGINT" property="clientId" />
+    <result column="client_name" jdbcType="VARCHAR" property="clientName" />
     <result column="controller_id" jdbcType="BIGINT" property="controllerId" />
     <result column="intake_id" jdbcType="BIGINT" property="intakeId" />
     <result column="rtu_addr" jdbcType="VARCHAR" property="rtuAddr" />
@@ -37,7 +39,8 @@
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    id, last_history_id, controller_id, intake_id, rtu_addr, op_dt, op_type, op_total_amount, 
+    id, last_history_id, client_id, client_name,
+    controller_id, intake_id, rtu_addr, op_dt, op_type, op_total_amount,
     op_ic_card_no, op_ic_card_addr, op_remain_money, open_dt, op_order_no, op_ele_total_amount, 
     op_water_remain_user, cl_dt, cl_type, cl_total_amount, cl_ic_card_no, cl_ic_card_addr, 
     cl_remain_money, cl_this_amount, cl_this_money, cl_this_time, cl_open_dt, close_dt, 
@@ -50,12 +53,12 @@
     from rm_open_close_valve_last
     where id = #{id,jdbcType=BIGINT}
   </select>
-  <select id="selectByRtuAddr" parameterType="java.lang.String" resultMap="BaseResultMap">
+  <select id="selectByIntakeId" parameterType="java.lang.Long" resultMap="BaseResultMap">
     <!--@mbg.generated-->
     select
     <include refid="Base_Column_List" />
     from rm_open_close_valve_last
-    where rtu_addr = #{rtuAddr,jdbcType=VARCHAR}
+    where intake_id = #{intakeId,jdbcType=BIGINT}
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
     <!--@mbg.generated-->
@@ -64,7 +67,8 @@
   </delete>
   <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoRm.RmOpenCloseValveLast">
     <!--@mbg.generated-->
-    insert into rm_open_close_valve_last (id, last_history_id, controller_id, 
+    insert into rm_open_close_valve_last (id, last_history_id,
+      client_id, client_name, controller_id,
       intake_id, rtu_addr, op_dt, 
       op_type, op_total_amount, op_ic_card_no, 
       op_ic_card_addr, op_remain_money, open_dt, 
@@ -75,7 +79,8 @@
       cl_open_dt, close_dt, cl_order_no, 
       cl_ele_total_amount, cl_water_remain_user, cl_this_ele
       )
-    values (#{id,jdbcType=BIGINT}, #{lastHistoryId,jdbcType=BIGINT}, #{controllerId,jdbcType=BIGINT}, 
+    values (#{id,jdbcType=BIGINT}, #{lastHistoryId,jdbcType=BIGINT},
+      #{clientId,jdbcType=BIGINT}, #{clientName,jdbcType=VARCHAR}, #{controllerId,jdbcType=BIGINT},
       #{intakeId,jdbcType=BIGINT}, #{rtuAddr,jdbcType=VARCHAR}, #{opDt,jdbcType=TIMESTAMP}, 
       #{opType,jdbcType=TINYINT}, #{opTotalAmount,jdbcType=DOUBLE}, #{opIcCardNo,jdbcType=VARCHAR}, 
       #{opIcCardAddr,jdbcType=VARCHAR}, #{opRemainMoney,jdbcType=DOUBLE}, #{openDt,jdbcType=TIMESTAMP}, 
@@ -96,6 +101,12 @@
       </if>
       <if test="lastHistoryId != null">
         last_history_id,
+      </if>
+      <if test="clientId != null">
+        client_id,
+      </if>
+     <if test="clientName != null">
+        client_name,
       </if>
       <if test="controllerId != null">
         controller_id,
@@ -188,6 +199,12 @@
       </if>
       <if test="lastHistoryId != null">
         #{lastHistoryId,jdbcType=BIGINT},
+      </if>
+      <if test="clientId != null">
+        #{clientId,jdbcType=BIGINT},
+      </if>
+      <if test="clientName != null">
+        #{clientName,jdbcType=VARCHAR},
       </if>
       <if test="controllerId != null">
         #{controllerId,jdbcType=BIGINT},
@@ -282,6 +299,12 @@
       <if test="lastHistoryId != null">
         last_history_id = #{lastHistoryId,jdbcType=BIGINT},
       </if>
+      <if test="clientId != null">
+        client_id = #{clientId,jdbcType=BIGINT},
+      </if>
+      <if test="clientName != null">
+        client_name = #{clientName,jdbcType=VARCHAR},
+      </if>
       <if test="controllerId != null">
         controller_id = #{controllerId,jdbcType=BIGINT},
       </if>
@@ -373,6 +396,8 @@
     <!--@mbg.generated-->
     update rm_open_close_valve_last
     set last_history_id = #{lastHistoryId,jdbcType=BIGINT},
+      client_id = #{clientId,jdbcType=BIGINT},
+      client_name = #{clientName,jdbcType=VARCHAR},
       controller_id = #{controllerId,jdbcType=BIGINT},
       intake_id = #{intakeId,jdbcType=BIGINT},
       rtu_addr = #{rtuAddr,jdbcType=VARCHAR},

--
Gitblit v1.8.0