From 4faf659ac4d1287d41d1a9afab3c302356100185 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 29 八月 2024 10:11:04 +0800
Subject: [PATCH] 在pipIrr-web-remote模块中实现RTU上下行数据日志下载功能RtuLogCtrl.java, 为此在pipIrr-global模块中增加了ByteArrayHttpMessageConverter.java和ByteArrayHttpMessageConverterConfig.java pipIrr-global模块的application-global.yml文件中增加了通信中间件相关URL

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientTypeMapper.xml |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientTypeMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientTypeMapper.xml
index fbc1eb5..de4c4e3 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientTypeMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientTypeMapper.xml
@@ -37,8 +37,8 @@
     count(*)
     from ba_client_type
     <trim prefix="where" suffixOverrides="and">
-      <if test="name != null">
-        name like concat('%', #{name}, '%')
+      <if test="name != null and name != ''">
+        name like concat('%', #{name}, '%') and
       </if>
     </trim>
   </select>
@@ -48,19 +48,19 @@
     <include refid="Base_Column_List" />
     from ba_client_type
     <trim prefix="where" suffixOverrides="and">
-      <if test="name != null">
+      <if test="name != null and name != ''">
         name like concat('%', #{name}, '%')
       </if>
     </trim>
     order by 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.BaClientType">
+  <insert id="putin" parameterType="com.dy.pipIrrGlobal.pojoBa.BaClientType">
     <!--@mbg.generated-->
     insert into ba_client_type (id, `name`)
     values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR})

--
Gitblit v1.8.0