From bda423b1aae1d5322116511651ae03a54cdcd231 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 26 十一月 2024 17:25:39 +0800
Subject: [PATCH] 1、几个测试模块系统的log4j.xml配置中的编码修改； 2、RTU升级模拟器增加命令行设置服务端IP和端口功能； 3、应王江海要求，井电双控协议中也实现远程升级功能，因井电双控协议、阀控器协议不同，而双方协议中的升级子协议相同，所以通信中间件做增量开发、适应性修改，以适应这种混合协议情况，同时也提高通信中间件运行效率。
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientTypeMapper.xml | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 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 62336f1..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})
@@ -89,18 +89,18 @@
<update id="updateByPrimaryKeySelective" parameterType="com.dy.pipIrrGlobal.pojoBa.BaClientType">
- update ba_role
- <set>
+ update ba_client_type
+ <trim prefix="set " suffixOverrides=",">
<if test="name != null">
- `name` = #{name,jdbcType=VARCHAR},
+ `name` = #{name,jdbcType=VARCHAR}
</if>
- </set>
+ </trim>
where id = #{id,jdbcType=BIGINT}
</update>
<update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoBa.BaClientType">
- update ba_role
- set `name` = #{name,jdbcType=VARCHAR},
+ update ba_client_type
+ set `name` = #{name,jdbcType=VARCHAR}
where id = #{id,jdbcType=BIGINT}
</update>
--
Gitblit v1.8.0