From 3c2c295ec48587fe9d9f656e0baa74c71a3884f7 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期日, 27 十月 2024 16:46:45 +0800 Subject: [PATCH] 1、苏有勋把开关阀报(功能码83)报中的控制器时钟去除掉了,通信中间件解决这个报文时,把开阀报中的开阀时间当作控制器时钟,把关阀报中的关阀时间作为控制器时钟; 2、优化代码。 --- pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeWalletMapper.xml | 36 ++++++++++++++++++++++++++++++++++++ 1 files changed, 36 insertions(+), 0 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeWalletMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeWalletMapper.xml index aa60383..59a7dcd 100644 --- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeWalletMapper.xml +++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeWalletMapper.xml @@ -121,4 +121,40 @@ WHERE client_id = ${clientId} LIMIT 0,1 </select> + + <!--鏍规嵁鍐滄埛濮撳悕鑾峰彇鐢靛瓙閽卞寘璐︽埛璁板綍鏁�--> + <select id="getRecordCount" parameterType="java.util.Map" resultType="java.lang.Long"> + SELECT + COUNT(*) AS recordCount + FROM se_wallet wal + INNER JOIN se_client cli ON wal.client_id = cli.id + <where> + <if test = "clientName != null and clientName !=''"> + AND cli.name like CONCAT('%',#{clientName},'%') + </if> + </where> + </select> + + <!--鏍规嵁鍐滄埛濮撳悕鑾峰彇鐢靛瓙閽卞寘璐︽埛璁板綍--> + <select id="getWallets" resultType="com.dy.pipIrrGlobal.voSe.VoWallet"> + SELECT + CAST(cli.id AS char) AS clientId, + cli.`name`, + cli.clientNum, + cli.phone, + wal.money + FROM se_wallet wal + INNER JOIN se_client cli ON wal.client_id = cli.id + <where> + <if test = "clientName != null and clientName !=''"> + AND cli.name like CONCAT('%',#{clientName},'%') + </if> + </where> + ORDER BY wal.last_operate_time 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