From 5ebea680d776c0647f83a5e4d1038b8708b3f3e7 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 14 十二月 2023 11:23:42 +0800
Subject: [PATCH] 1、优化多数据源模块代码; 2、优化通信中间件代码; 3、通信中间件数据库插入数据测试Po、Mapper.java、Mapper.xml

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientMapper.xml |   23 +++++++++++------------
 1 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientMapper.xml
index 7af8c7e..bca158d 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientMapper.xml
@@ -12,7 +12,7 @@
     <result column="divideId" jdbcType="BIGINT" property="divideId" />
     <result column="typeId" jdbcType="BIGINT" property="typeId" />
     <result column="name" jdbcType="VARCHAR" property="name" />
-    <result column="num" jdbcType="VARCHAR" property="num" />
+    <result column="num" jdbcType="INTEGER" property="num" />
     <result column="phone" jdbcType="VARCHAR" property="phone" />
     <result column="idCard" jdbcType="VARCHAR" property="idcard" />
     <result column="area" jdbcType="FLOAT" property="area" />
@@ -29,9 +29,8 @@
   </sql>
   <sql id="part_Column_List">
     <!--@mbg.generated-->
-      ${alias}.id, ${alias}.countyId, ${alias}.townId, ${alias}.villageId, ${alias}.blockId, ${alias}.divideId, ${alias}.typeId,
-      ${alias}.`name`, ${alias}.num, ${alias}.phone, ${alias}.idCard, ${alias}.area, ${alias}.district,${alias}.address,
-      ${alias}.remark, ${alias}.disabled
+      ${alias}.id, ${alias}.countyId, ${alias}.townId, ${alias}.villageId, ${alias}.blockId, ${alias}.divideId, ${alias}.typeId, ${alias}.name, ${alias}.num, ${alias}.phone, ${alias}.idCard, ${alias}.area, ${alias}.district,${alias}.address, ${alias}.remark,
+      ${alias}.disabled
   </sql>
 
   <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
@@ -67,13 +66,13 @@
             <if test="blockId != null">
                 bc.blockId = #{blockId,jdbcType=BIGINT} and
             </if>
-            <if test="name != null">
+            <if test="name != null and name != ''">
                 bc.`name` like concat('%', #{name}, '%') and
             </if>
-            <if test="num != null">
+            <if test="num != null and num != ''">
                 bc.num = #{num,jdbcType=VARCHAR} and
             </if>
-            <if test="phone != null">
+            <if test="phone != null and phone != ''">
                 bc.phone = #{phone,jdbcType=VARCHAR} and
             </if>
         </trim>
@@ -120,7 +119,7 @@
             </if>
         </trim>
     </select>
-    <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoBa.BaClient">
+    <insert id="putin" parameterType="com.dy.pipIrrGlobal.pojoBa.BaClient">
         <!--@mbg.generated-->
         insert into ba_client (id, countyId, townId, villageId, blockId, divideId,
           typeId, `name`, num, phone,
@@ -130,7 +129,7 @@
         values (#{id,jdbcType=BIGINT}, #{countyId,jdbcType=BIGINT},
           #{townId,jdbcType=BIGINT}, #{villageId,jdbcType=BIGINT},
           #{blockId,jdbcType=BIGINT}, #{divideId,jdbcType=BIGINT}, #{typeId,jdbcType=BIGINT},
-          #{name,jdbcType=VARCHAR}, #{num,jdbcType=VARCHAR},
+          #{name,jdbcType=VARCHAR}, #{num,jdbcType=INTEGER},
           #{phone,jdbcType=VARCHAR}, #{idcard,jdbcType=VARCHAR},
           #{area,jdbcType=FLOAT}, #{district,jdbcType=VARCHAR},
           #{address,jdbcType=VARCHAR},#{remark,jdbcType=VARCHAR},
@@ -220,7 +219,7 @@
             #{name,jdbcType=VARCHAR},
           </if>
           <if test="num != null">
-            #{num,jdbcType=VARCHAR},
+            #{num,jdbcType=INTEGER},
           </if>
           <if test="phone != null">
             #{phone,jdbcType=VARCHAR},
@@ -273,7 +272,7 @@
                 'name' = #{name,jdbcType=VARCHAR},
             </if>
             <if test="num != null">
-                num = #{num,jdbcType=VARCHAR},
+                num = #{num,jdbcType=INTEGER},
             </if>
             <if test="phone != null">
                 phone = #{phone,jdbcType=VARCHAR},
@@ -313,7 +312,7 @@
             blockId = #{blockId,jdbcType=BIGINT},
             typeId = #{typeId,jdbcType=BIGINT},
             `name` = #{name,jdbcType=VARCHAR},
-            num = #{num,jdbcType=VARCHAR},
+            num = #{num,jdbcType=INTEGER},
             phone = #{phone,jdbcType=VARCHAR},
             idcard = #{idcard,jdbcType=VARCHAR},
             area = #{area,jdbcType=FLOAT},

--
Gitblit v1.8.0