From e5d5a773f76de73471b58d388f165dedc9570c4a Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 24 七月 2024 17:23:21 +0800
Subject: [PATCH] 1、以定时任务方式实现定时统计; 2、实现取水口漏损月统计、年统计; 3、实现取水口取水量月统计、年统计; 4、实现农户用水量及费用月统计、年统计。

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayMapper.xml |   36 ++++++++++++++++++++++--------------
 1 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossHistoryMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayMapper.xml
similarity index 86%
rename from pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossHistoryMapper.xml
rename to pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayMapper.xml
index 858ff67..384e86a 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossHistoryMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayMapper.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dy.pipIrrGlobal.daoRm.RmLossHistoryMapper">
-  <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoRm.RmLossHistory">
+<mapper namespace="com.dy.pipIrrGlobal.daoRm.RmLossDayMapper">
+  <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoRm.RmLossDay">
     <!--@mbg.generated-->
-    <!--@Table rm_loss_history-->
+    <!--@Table rm_loss_day-->
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="controller_id" jdbcType="BIGINT" property="controllerId" />
     <result column="intake_id" jdbcType="BIGINT" property="intakeId" />
@@ -21,33 +21,33 @@
     <!--@mbg.generated-->
     select 
     <include refid="Base_Column_List" />
-    from rm_loss_history
+    from rm_loss_day
     where id = #{id,jdbcType=BIGINT}
   </select>
   <select id="selectByDate" parameterType="java.util.Date" resultMap="BaseResultMap">
     <!--@mbg.generated-->
     select
     <include refid="Base_Column_List" />
-    from rm_loss_history
+    from rm_loss_day
     where dt = #{dt,jdbcType=DATE}
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
     <!--@mbg.generated-->
-    delete from rm_loss_history
+    delete from rm_loss_day
     where id = #{id,jdbcType=BIGINT}
   </delete>
-  <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoRm.RmLossHistory">
+  <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoRm.RmLossDay">
     <!--@mbg.generated-->
-    insert into rm_loss_history (id, controller_id, intake_id, 
+    insert into rm_loss_day (id, controller_id, intake_id,
       rtu_addr, dt, dt_last, dt_rtu, loss_amount
       )
     values (#{id,jdbcType=BIGINT}, #{controllerId,jdbcType=BIGINT}, #{intakeId,jdbcType=BIGINT}, 
       #{rtuAddr,jdbcType=VARCHAR}, #{dt,jdbcType=DATE}, #{dtLast,jdbcType=TIMESTAMP}, #{dtRtu,jdbcType=TIMESTAMP}, #{lossAmount,jdbcType=DOUBLE}
       )
   </insert>
-  <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoRm.RmLossHistory">
+  <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoRm.RmLossDay">
     <!--@mbg.generated-->
-    insert into rm_loss_history
+    insert into rm_loss_day
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="id != null">
         id,
@@ -101,9 +101,9 @@
       </if>
     </trim>
   </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="com.dy.pipIrrGlobal.pojoRm.RmLossHistory">
+  <update id="updateByPrimaryKeySelective" parameterType="com.dy.pipIrrGlobal.pojoRm.RmLossDay">
     <!--@mbg.generated-->
-    update rm_loss_history
+    update rm_loss_day
     <set>
       <if test="controllerId != null">
         controller_id = #{controllerId,jdbcType=BIGINT},
@@ -129,9 +129,9 @@
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoRm.RmLossHistory">
+  <update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoRm.RmLossDay">
     <!--@mbg.generated-->
-    update rm_loss_history
+    update rm_loss_day
     set controller_id = #{controllerId,jdbcType=BIGINT},
       intake_id = #{intakeId,jdbcType=BIGINT},
       rtu_addr = #{rtuAddr,jdbcType=VARCHAR},
@@ -141,4 +141,12 @@
       loss_amount = #{lossAmount,jdbcType=DOUBLE}
     where id = #{id,jdbcType=BIGINT}
   </update>
+
+  <select id="statisticsByIntake" resultType="com.dy.pipIrrGlobal.voSt.VoIntakeLossStatistics">
+    select intake_id, sum(loss_amount) as amount
+    from rm_loss_day
+    where id <![CDATA[>=]]> #{startId,jdbcType=BIGINT} and id <![CDATA[<]]> #{endId,jdbcType=BIGINT}
+    group by intake_id
+  </select>
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0