From 7d55b601b8ec846e9d48ce31de1c5c6930d6dee0 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 19 八月 2025 17:24:35 +0800
Subject: [PATCH] 1、修改等待中间件返回结果超时时间为10秒； 2、修改向水肥机下发命令相关逻辑； 3、修改水肥机回复命令结果处理逻辑； 4、去除前端webSocket关闭产生异常日志记录。
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayLastMapper.xml | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 51 insertions(+), 0 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayLastMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayLastMapper.xml
index 07fb518..927a12d 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayLastMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayLastMapper.xml
@@ -833,4 +833,55 @@
</if>
</trim>
</select>
+ <!--鏈�杩戞湭鍏呭�肩殑鍐滄埛鏁伴噺-->
+ <select id="getNotRechargeLastClientsCount" resultType="java.lang.Long">
+ SELECT COUNT(*)
+ FROM
+ ( SELECT
+ sc.id AS clientId,
+ sc.`name` AS clientName,
+ sc.clientNum AS clientNum,
+ sc.address AS address,
+ sc.phone AS phone,
+ sc.idCard AS idCard
+ FROM
+ se_client sc
+ LEFT JOIN (SELECT srh.clientId FROM `se_recharge_history` srh
+ <where>
+ srh.amount > 0 AND srh.operate_valid = 2
+ <if test="timeStart != null and timeStart != ''">
+ AND srh.operateDt > #{timeStart}
+ </if>
+ </where>
+ ) c on c.clientId = sc.id
+ WHERE c.clientId IS NULL
+ GROUP BY sc.id) d
+ </select>
+ <!--鏈�杩戞湭鍏呭�肩殑鍐滄埛-->
+ <select id="getNotRechargeLastClients" resultType="com.dy.pipIrrGlobal.voSt.VoClient">
+ SELECT
+ sc.id AS clientId,
+ sc.`name` AS clientName,
+ sc.clientNum AS clientNum,
+ sc.address AS address,
+ sc.phone AS phone,
+ sc.idCard AS idCard
+ FROM
+ se_client sc
+ LEFT JOIN (SELECT srh.clientId FROM `se_recharge_history` srh
+ <where>
+ srh.amount > 0 AND srh.operate_valid = 2
+ <if test="timeStart != null and timeStart != ''">
+ AND srh.operateDt > #{timeStart}
+ </if>
+ </where>
+ ) c on c.clientId = sc.id
+ WHERE c.clientId IS NULL
+ GROUP BY sc.id
+ <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