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/PrDivideMapper.xml | 35 ++++++++++++++++++++++-------------
1 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrDivideMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrDivideMapper.xml
index a33f952..1348a36 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrDivideMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrDivideMapper.xml
@@ -238,13 +238,13 @@
SELECT
COUNT(*) AS recordCount
FROM pr_divide divi
-<!-- INNER JOIN ba_block blo ON divi.blockId = blo.id-->
- INNER JOIN ba_district country ON divi.countyId = country.id
- INNER JOIN ba_district town ON divi.townId = town.id
- INNER JOIN ba_district village ON divi.villageid = village.id
+ INNER JOIN ba_block blo ON divi.blockId = blo.id
+ Left JOIN ba_district country ON divi.countyId = country.id
+ Left JOIN ba_district town ON divi.townId = town.id
+ Left JOIN ba_district village ON divi.villageid = village.id
, (SELECT @i:=0) AS itable
<where>
- AND divi. deleted = 0
+ divi. deleted = 0
<if test = "divideName != null and divideName !=''">
AND divi.name LIKE CONCAT('%',#{divideName},'%')
</if>
@@ -262,7 +262,7 @@
CAST(divi.id AS char) AS divideId,
divi.name AS divideName,
CAST(divi.blockId AS char) AS blockId,
-<!-- blo.`name` AS blockName,-->
+ blo.`name` AS blockName,
divi.header,
divi.villages,
divi.area,
@@ -274,13 +274,13 @@
CAST(divi.operator AS char) AS operator,
divi.operateDt
FROM pr_divide divi
-<!-- INNER JOIN ba_block blo ON divi.blockId = blo.id-->
- INNER JOIN ba_district country ON divi.countyId = country.id
- INNER JOIN ba_district town ON divi.townId = town.id
- INNER JOIN ba_district village ON divi.villageid = village.id
+ INNER JOIN ba_block blo ON divi.blockId = blo.id
+ Left JOIN ba_district country ON divi.countyId = country.id
+ Left JOIN ba_district town ON divi.townId = town.id
+ Left JOIN ba_district village ON divi.villageid = village.id
, (SELECT @i:=0) AS itable
<where>
- AND divi. deleted = 0
+ divi. deleted = 0
<if test = "divideName != null and divideName !=''">
AND divi.name LIKE CONCAT('%',#{divideName},'%')
</if>
@@ -302,14 +302,23 @@
update pr_divide set deleted = 1
<where>
<if test = "id != null and id > 0">
- AND id = ${id}
+ AND id = #{id}
</if>
</where>
</update>
<!--鏍规嵁鍒嗘按鎴跨紪鍙疯幏鍙栨墍灞炵墖鍖虹紪鍙�-->
<select id="getBlockIdById" resultType="java.lang.Long">
- SELECT blockId FROM pr_divide WHERE id = ${divideId}
+ SELECT blockId FROM pr_divide WHERE id = #{divideId}
+ </select>
+
+ <!--鏍规嵁鐗囧尯ID鑾峰彇鍒嗘按鎴垮垪琛�-->
+ <select id="getDividesByBlockId" resultType="com.dy.pipIrrGlobal.voPr.VoSimpleDivide">
+ SELECT
+ id As value,
+ name AS label
+ FROM pr_divide
+ WHERE deleted = 0 AND blockId = #{blockId}
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0