From 7d885c1d4c86f40927af50e6e7bfa13aac0c2180 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 21 十二月 2023 21:47:15 +0800
Subject: [PATCH] 1、common模块优化代码，Command命令中增加RTU命令结果返回webRul; 2、通信中间件增加了接收http下发RTU命令和内部命令的Controler； 3、RTU模拟器和控制器增加了上报完数据是否关闭TCP连接的控制。
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeRechargeMapper.xml | 18 +++---------------
1 files changed, 3 insertions(+), 15 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeRechargeMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeRechargeMapper.xml
index 00fe845..74c067d 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeRechargeMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeRechargeMapper.xml
@@ -190,24 +190,18 @@
select
COUNT(*) AS recordCount
FROM se_recharge_history rec
- INNER JOIN se_client_card card ON rec.cardNum = card.cardNum
- INNER JOIN ba_client cli ON rec.clientNum = cli.num
- , (SELECT @i:=0) AS itable
+ INNER JOIN se_client_card card ON rec.cardNum = card.cardNum
+ INNER JOIN ba_client cli ON rec.clientNum = cli.num
+ , (SELECT @i:=0) AS itable
<where>
<if test = "clientName != null and clientName !=''">
AND cli.name like CONCAT('%',#{clientName},'%')
</if>
- <!-- <if test = "clientId != null and clientId > 0">-->
- <!-- AND rec.clientId like CONCAT('%',#{clientId},'%')-->
- <!-- </if>-->
<if test = "clientNum != null and clientNum > 0">
AND rec.clientNum like CONCAT('%',#{clientNum},'%')
</if>
- <!-- <if test = "cardAddr != null and cardAddr !=''">-->
- <!-- AND card.cardAddr like CONCAT('%',#{cardAddr},'%')-->
- <!-- </if>-->
<if test = "cardNum != null and cardNum !=''">
AND card.cardNum like CONCAT('%',#{cardNum},'%')
</if>
@@ -244,16 +238,10 @@
AND cli.name like CONCAT('%',#{clientName},'%')
</if>
-<!-- <if test = "clientId != null and clientId > 0">-->
-<!-- AND rec.clientId like CONCAT('%',#{clientId},'%')-->
-<!-- </if>-->
<if test = "clientNum != null and clientNum > 0">
AND rec.clientNum like CONCAT('%',#{clientNum},'%')
</if>
-<!-- <if test = "cardAddr != null and cardAddr !=''">-->
-<!-- AND card.cardAddr like CONCAT('%',#{cardAddr},'%')-->
-<!-- </if>-->
<if test = "cardNum != null and cardNum !=''">
AND card.cardNum like CONCAT('%',#{cardNum},'%')
</if>
--
Gitblit v1.8.0