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/BaClientMapper.xml | 42 +++++++++++++++++++++++++++++-------------
1 files changed, 29 insertions(+), 13 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientMapper.xml
index c5a0f21..9d205f6 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientMapper.xml
@@ -66,14 +66,14 @@
<if test="blockId != null">
bc.blockId = #{blockId,jdbcType=BIGINT} and
</if>
- <if test="name != null">
- bc.name like concat('%', #{name}, '%') and
+ <if test="name != null and name != ''">
+ bc.`name` like concat('%', #{name}, '%') and
</if>
- <if test="num != null">
- bc.num = '#{num,jdbcType=VARCHAR}' and
+ <if test="num != null and num != ''">
+ bc.num = #{num,jdbcType=VARCHAR} and
</if>
- <if test="phone != null">
- bc.phone = '#{phone,jdbcType=VARCHAR}' and
+ <if test="phone != null and phone != ''">
+ bc.phone = #{phone,jdbcType=VARCHAR} and
</if>
</trim>
</select>
@@ -83,8 +83,8 @@
<include refid="part_Column_List" >
<property name="alias" value="bc"/>
</include>,
- bbk.name blockName,
- bct.name typeName
+ bbk.`name` blockName,
+ bct.`name` typeName
from ba_client bc
left join ba_block bbk on bc.blockId = bbk.id
left join ba_client_type bct on bc.typeId = bct.id
@@ -103,23 +103,23 @@
blockId = #{blockId,jdbcType=BIGINT} and
</if>
<if test="name != null">
- bc.name like concat('%', #{name}, '%') and
+ bc.`name` like concat('%', #{name}, '%') and
</if>
<if test="num != null">
- bc.num = '#{num,jdbcType=VARCHAR}' and
+ bc.num = #{num,jdbcType=VARCHAR} and
</if>
<if test="phone != null">
- bc.phone = '#{phone,jdbcType=VARCHAR}' and
+ bc.phone = #{phone,jdbcType=VARCHAR} and
</if>
</trim>
order by bc.id DESC
<trim prefix="limit " >
<if test="start != null and count != null">
- #{start}, #{count}
+ #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
</if>
</trim>
</select>
- <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoBa.BaClient">
+ <insert id="putin" parameterType="com.dy.pipIrrGlobal.pojoBa.BaClient">
<!--@mbg.generated-->
insert into ba_client (id, countyId, townId, villageId, blockId, divideId,
typeId, `name`, num, phone,
@@ -336,4 +336,20 @@
where id = #{id,jdbcType=BIGINT}
</delete>
+ <!--鏍规嵁鍐滄埛缂栧彿鑾峰彇5绾ц鏀垮尯鍒掍唬鐮�-->
+ <select id="getAreaCodeByNum" resultType="com.dy.pipIrrGlobal.voBa.VoAreaCode">
+ SELECT
+ pro.num AS provinceId,
+ cit.num AS cityId,
+ con.num AS countryId,
+ tow.num AS townId,
+ vil.num AS villageId
+ FROM ba_client cli
+ INNER JOIN ba_district con ON cli.countyId = con.id
+ INNER JOIN ba_district tow ON cli.townId = tow.id
+ INNER JOIN ba_district vil ON cli.villageId = vil.id
+ INNER JOIN ba_district cit ON cit.id = con.supperId
+ INNER JOIN ba_district pro ON pro.id = cit.supperId
+ WHERE cli.num = #{clientNum}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0