From b397edee2be2dfcc3f28eeac50298b4de26b1afa Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 13 十二月 2024 16:53:45 +0800
Subject: [PATCH] 取水口日取水量表中，出现一些大数，明显不正确，发析系统日志，发现一些阀控器会上报一些累计流量为0的数据，且无规律，推测是其不能从水表读取到累计流量时会上报0值。如果间歇上报0值，间歇上报一些非0值，非0值减去0值，就会出现大数，一天中出现几次那么会大数进行累加，数值将更大。为此变更算法，规避这种情况，但也会丢失一些流量值。
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayMapper.xml | 22 ++++++++++------------
1 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayMapper.xml
index a57afa2..10f472c 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayMapper.xml
@@ -275,10 +275,10 @@
from rm_loss_day
<where>
<if test="startDt != null ">
- AND dt <![CDATA[>=]]> #{startDt, jdbcType=DATE, jdbcType=DATE}
+ AND dt <![CDATA[>=]]> #{startDt, javaType=DATE, jdbcType=DATE}
</if>
<if test="endDt != null ">
- AND dt <![CDATA[<]]> #{endDt, jdbcType=DATE, jdbcType=DATE}
+ AND dt <![CDATA[<]]> #{endDt, javaType=DATE, jdbcType=DATE}
</if>
</where>
order by intake_id DESC, id ASC
@@ -287,7 +287,6 @@
<sql id="selectLossAmountOfDay_with">
- WITH intakeLossAmountDay AS (
SELECT intaId.intakeId AS intakeId,
rld.dt AS dt,
rld.loss_amount AS lossAmount
@@ -300,18 +299,17 @@
INNER JOIN rm_loss_day rld ON rld.intake_id = intaId.intakeId
<where>
<if test="startDt != null ">
- AND rld.dt <![CDATA[>=]]> #{startDt, jdbcType=DATE, jdbcType=DATE}
+ AND rld.dt <![CDATA[>=]]> #{startDt, javaType=DATE, jdbcType=DATE}
</if>
<if test="endDt != null ">
- AND rld.dt <![CDATA[<=]]> #{endDt, jdbcType=DATE, jdbcType=DATE}
+ AND rld.dt <![CDATA[<=]]> #{endDt, javaType=DATE, jdbcType=DATE}
</if>
</where>
- )
</sql>
<!--缁熻鎸囧畾鏈堜唤鍚勫ぉ婕忔崯閲�(1鍙峰埌5鍙�)-->
<select id="selectLossAmountOfDay01_05" resultType="com.dy.pipIrrGlobal.voSt.VoDayLoss">
- <include refid="selectLossAmountOfDay_with" />
+ WITH intakeLossAmountDay AS (<include refid="selectLossAmountOfDay_with"/>)
SELECT inta.intakeId AS intakeId,
inta.intakeNum AS intakeNum,
inta.intakeLng AS intakeLng,
@@ -375,7 +373,7 @@
<!--缁熻鎸囧畾鏈堜唤鍚勫ぉ婕忔崯閲�(6鍙峰埌10鍙�)-->
<select id="selectLossAmountOfDay06_10" resultType="com.dy.pipIrrGlobal.voSt.VoDayLoss">
- <include refid="selectLossAmountOfDay_with" />
+ WITH intakeLossAmountDay AS (<include refid="selectLossAmountOfDay_with"/>)
SELECT inta.intakeId AS intakeId,
inta.intakeNum AS intakeNum,
inta.intakeLng AS intakeLng,
@@ -438,7 +436,7 @@
<!--缁熻鎸囧畾鏈堜唤鍚勫ぉ婕忔崯閲�(11鍙峰埌15鍙�)-->
<select id="selectLossAmountOfDay11_15" resultType="com.dy.pipIrrGlobal.voSt.VoDayLoss">
- <include refid="selectLossAmountOfDay_with" />
+ WITH intakeLossAmountDay AS (<include refid="selectLossAmountOfDay_with"/>)
SELECT inta.intakeId AS intakeId,
inta.intakeNum AS intakeNum,
inta.intakeLng AS intakeLng,
@@ -501,7 +499,7 @@
<!--缁熻鎸囧畾鏈堜唤鍚勫ぉ婕忔崯閲�(20鍙峰埌16鍙�)-->
<select id="selectLossAmountOfDay16_20" resultType="com.dy.pipIrrGlobal.voSt.VoDayLoss">
- <include refid="selectLossAmountOfDay_with" />
+ WITH intakeLossAmountDay AS (<include refid="selectLossAmountOfDay_with"/>)
SELECT inta.intakeId AS intakeId,
inta.intakeNum AS intakeNum,
inta.intakeLng AS intakeLng,
@@ -564,7 +562,7 @@
<!--缁熻鎸囧畾鏈堜唤鍚勫ぉ婕忔崯閲�(21鍙峰埌25鍙�)-->
<select id="selectLossAmountOfDay21_25" resultType="com.dy.pipIrrGlobal.voSt.VoDayLoss">
- <include refid="selectLossAmountOfDay_with" />
+ WITH intakeLossAmountDay AS (<include refid="selectLossAmountOfDay_with"/>)
SELECT inta.intakeId AS intakeId,
inta.intakeNum AS intakeNum,
inta.intakeLng AS intakeLng,
@@ -627,7 +625,7 @@
<!--缁熻鎸囧畾鏈堜唤鍚勫ぉ婕忔崯閲�(26鍙峰埌31鍙�)-->
<select id="selectLossAmountOfDay26_31" resultType="com.dy.pipIrrGlobal.voSt.VoDayLoss">
- <include refid="selectLossAmountOfDay_with" />
+ WITH intakeLossAmountDay AS (<include refid="selectLossAmountOfDay_with"/>)
SELECT inta.intakeId AS intakeId,
inta.intakeNum AS intakeNum,
inta.intakeLng AS intakeLng,
--
Gitblit v1.8.0