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/SeUnlockMapper.xml |   55 +++++++++++++++++++++++--------------------------------
 1 files changed, 23 insertions(+), 32 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeUnlockMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeUnlockMapper.xml
index 0642219..c892fa1 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeUnlockMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeUnlockMapper.xml
@@ -29,27 +29,16 @@
     where id = #{id,jdbcType=BIGINT}
   </delete>
 
-  <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoSe.SeUnlock">
+  <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pipIrrGlobal.pojoSe.SeUnlock">
     <!--@mbg.generated-->
-    insert into se_unlock (id, cardId, clientId, money, remarks, `operator`, operateDt)
-    values (#{id,jdbcType=BIGINT},
-            #{cardid,jdbcType=BIGINT},
-            #{clientid,jdbcType=BIGINT},
-            #{money,jdbcType=FLOAT},
-            #{remarks,jdbcType=VARCHAR},
-            #{operator,jdbcType=BIGINT},
-            #{operatedt,jdbcType=TIMESTAMP})
+    insert into se_unlock (id, cardId, clientId, money,
+      remarks, `operator`, operateDt
+      )
+    values (#{id,jdbcType=BIGINT}, #{cardid,jdbcType=BIGINT}, #{clientid,jdbcType=BIGINT}, #{money,jdbcType=FLOAT},
+      #{remarks,jdbcType=VARCHAR}, #{operator,jdbcType=BIGINT}, #{operatedt,jdbcType=TIMESTAMP}
+      )
   </insert>
 
-<!--  <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pipIrrGlobal.pojoSe.SeUnlock" useGeneratedKeys="true">-->
-<!--    &lt;!&ndash;@mbg.generated&ndash;&gt;-->
-<!--    insert into se_unlock (cardId, clientId, money, -->
-<!--      remarks, `operator`, operateDt-->
-<!--      )-->
-<!--    values (#{cardid,jdbcType=BIGINT}, #{clientid,jdbcType=BIGINT}, #{money,jdbcType=FLOAT}, -->
-<!--      #{remarks,jdbcType=VARCHAR}, #{operator,jdbcType=BIGINT}, #{operatedt,jdbcType=TIMESTAMP}-->
-<!--      )-->
-<!--  </insert>-->
   <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pipIrrGlobal.pojoSe.SeUnlock" useGeneratedKeys="true">
     <!--@mbg.generated-->
     insert into se_unlock
@@ -137,15 +126,15 @@
         COUNT(*) AS recordCount
     FROM se_unlock unl
     INNER JOIN se_client_card card ON unl.cardId = card.id
-    INNER JOIN ba_client cli ON unl.clientId = cli.id
+    INNER JOIN se_client cli ON unl.clientId = cli.id
     , (SELECT @i:=0) AS itable
     <where>
       <if test = "clientName != null and clientName !=''">
         AND cli.name like CONCAT('%',#{clientName},'%')
       </if>
 
-      <if test = "cardAddr != null and cardAddr !=''">
-        AND card.cardAddr like CONCAT('%',#{cardAddr},'%')
+      <if test = "cardNum != null and cardNum !=''">
+        AND card.cardNum like CONCAT('%',#{cardNum},'%')
       </if>
 
       <if test = "unlocklTimeStart != null and unlockTimeStop != null">
@@ -159,31 +148,33 @@
     SELECT
         (@i:=@i+1) AS id,
         cli.`name` AS clientName,
-        cli.id AS clientId,
-        card.cardAddr,
+        cli.clientNum,
+        card.cardNum,
         unl.money,
         (SELECT `name` FROM ba_user WHERE id =  unl.operator) AS operator,
         unl.operateDt
     FROM se_unlock unl
-      INNER JOIN se_client_card card ON unl.cardId = card.id
-      INNER JOIN ba_client cli ON unl.clientId = cli.id
-      , (SELECT @i:=0) AS itable
+    INNER JOIN se_client_card card ON unl.cardId = card.id
+    INNER JOIN se_client cli ON unl.clientId = cli.id
+    , (SELECT @i:=0) AS itable
     <where>
       <if test = "clientName != null and clientName !=''">
         AND cli.name like CONCAT('%',#{clientName},'%')
       </if>
 
-      <if test = "cardAddr != null and cardAddr !=''">
-        AND card.cardAddr like CONCAT('%',#{cardAddr},'%')
+      <if test = "cardNum != null and cardNum !=''">
+        AND card.cardNum like CONCAT('%',#{cardNum},'%')
       </if>
 
       <if test = "unlocklTimeStart != null and unlockTimeStop != null">
         AND unl.operateDt BETWEEN #{unlocklTimeStart} AND #{unlockTimeStop}
       </if>
     </where>
-
-    <if test="pageCurr != null and pageSize != null">
-      LIMIT ${pageCurr}, ${pageSize}
-    </if>
+    ORDER BY unl.operateDt DESC
+    <trim prefix="limit " >
+      <if test="start != null and count != null">
+        #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
+      </if>
+    </trim>
   </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0