From a42c2d24721a08b0066089ebcdf49c569676735d Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期日, 12 十一月 2023 17:29:10 +0800
Subject: [PATCH] 1、添加权限验证注解、事务注解 2、用户管理中增加功能:保存、修改、删除

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml |  192 ++++++++++++++----------------------------------
 1 files changed, 56 insertions(+), 136 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml
index dde6a32..efab302 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml
@@ -90,74 +90,26 @@
             </if>
         </trim>
     </select>
-    <!--
-    <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoBa.BaUser">
-        <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long" id="selectKey">
-            SELECT LAST_INSERT_ID()
-        </selectKey>
-        insert into  ba_user
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">
-                id,
-            </if>
-            <if test="name != null">
-                name,
-            </if>
-            <if test="phone != null">
-                phone,
-            </if>
-           <if test="password != null">
-               password,
-            </if>
-           <if test="orgTag != null">
-               orgTag,
-            </if>
-           <if test="supperAdmin != null">
-               supperAdmin,
-            </if>
-           <if test="disabled != null">
-               disabled,
-            </if>
-          <if test="deleted != null">
-              deleted,
-            </if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null">
-                #{id, jdbcType=BIGINT},
-            </if>
-            <if test="name != null">
-                #{name, jdbcType=VARCHAR},
-            </if>
-            <if test="phone != null">
-                #{phone, jdbcType=VARCHAR},
-            </if>
-           <if test="password != null">
-                #{password, jdbcType=VARCHAR},
-            </if>
-           <if test="orgTag != null">
-                #{orgTag, jdbcType=VARCHAR},
-            </if>
-           <if test="supperAdmin != null">
-                #{supperAdmin, jdbcType=SMALLINT},
-            </if>
-           <if test="disabled != null">
-                #{disabled, jdbcType=SMALLINT},
-            </if>
-           <if test="deleted != null">
-                #{deleted, jdbcType=SMALLINT},
-            </if>
-        </trim>
+    <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoBa.BaUser">
+        insert into ba_user (<include refid="Base_Column_List" />)
+        values (#{id,jdbcType=BIGINT},
+        #{name,jdbcType=VARCHAR},
+        #{phone,jdbcType=VARCHAR},
+        #{password,jdbcType=VARCHAR},
+        #{orgTag,jdbcType=VARCHAR},
+        #{supperAdmin,jdbcType=TINYINT},
+        #{disabled,jdbcType=TINYINT},
+        #{deleted,jdbcType=TINYINT}
+        )
     </insert>
-
-    <insert id="insertOnDuplicateUpdate" parameterType="com.dy.pipIrrGlobal.pojoBa.BaUser">
+    <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoBa.BaUser">
         insert into ba_user
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">
                 id,
             </if>
             <if test="name != null">
-                name,
+                `name`,
             </if>
             <if test="phone != null">
                 phone,
@@ -171,109 +123,77 @@
             <if test="supperAdmin != null">
                 supperAdmin,
             </if>
-            <if test="disabled != null">
-                disabled,
+           <if test="disabled != null">
+               disabled,
             </if>
-            <if test="deleted != null">
+           <if test="deleted != null">
                 deleted,
             </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">
-                #{id, jdbcType=BIGINT},
+                #{id,jdbcType=BIGINT},
             </if>
             <if test="name != null">
-                #{name, jdbcType=VARCHAR},
+                #{name,jdbcType=VARCHAR},
             </if>
             <if test="phone != null">
-                #{phone, jdbcType=VARCHAR},
+                #{phone,jdbcType=VARCHAR},
             </if>
             <if test="password != null">
-                #{password, jdbcType=VARCHAR},
+                #{password,jdbcType=VARCHAR},
             </if>
             <if test="orgTag != null">
-                #{orgTag, jdbcType=VARCHAR},
+                #{orgTag,jdbcType=VARCHAR},
             </if>
             <if test="supperAdmin != null">
-                #{supperAdmin, jdbcType=SMALLINT},
+                #{supperAdmin,jdbcType=TINYINT},
             </if>
             <if test="disabled != null">
-                #{disabled, jdbcType=SMALLINT},
+                #{disabled,jdbcType=TINYINT},
             </if>
             <if test="deleted != null">
-                #{deleted, jdbcType=SMALLINT},
-            </if>
-        </trim>
-        ON DUPLICATE KEY UPDATE
-        <trim suffixOverrides="," >
-            <if test="id != null" >
-                id = #{id, jdbcType=BIGINT},
+                #{deleted,jdbcType=TINYINT},
             </if>
         </trim>
     </insert>
 
-    <update id="updateSelective" parameterType="com.dy.pipIrrGlobal.pojoBa.BaUser" >
-        UPDATE ba_user
-        <set >
-            <if test="name != null" >
-                name = #{name, jdbcType=VARCHAR},
+    <update id="updateByPrimaryKeySelective" parameterType="com.dy.pipIrrGlobal.pojoBa.BaUser">
+        update ba_user
+        <set>
+            <if test="name != null">
+                `name` = #{name,jdbcType=VARCHAR},
             </if>
-            <if test="phone != null" >
-                phone = #{phone, jdbcType=VARCHAR},
+            <if test="phone != null">
+                phone = #{phone,jdbcType=VARCHAR},
             </if>
-            <if test="password != null" >
-                phone = #{password, jdbcType=VARCHAR},
+            <if test="password != null">
+                password = #{password,jdbcType=VARCHAR},
+            </if>
+            <if test="disabled != null">
+                disabled = #{disabled,jdbcType=TINYINT},
+            </if>
+            <if test="deleted != null">
+                deleted = #{deleted,jdbcType=TINYINT},
             </if>
         </set>
-        WHERE
-        <trim prefixOverrides="and | or">
-            <if test="id != null">
-                AND id = #{id,jdbcType=BIGINT}
-            </if>
-        </trim>
+        where id = #{id,jdbcType=BIGINT}
     </update>
-
-    <insert id="batchInsert" parameterType="java.util.List">
-        <selectKey resultType="java.lang.Long" keyProperty="id" order="AFTER" id="batchInsert">
-            SELECT LAST_INSERT_ID()
-        </selectKey>
-        INSERT INTO ba_user(id, name, phone, password, orgTag, supperAdmin, disabled, deleted)
-        VALUES
-        <foreach collection="list" item="it" index="index" separator=",">
-            (
-              #{it.id, jdbcType=BIGINT},
-              #{it.name, jdbcType=VARCHAR},
-              #{it.phone, jdbcType=VARCHAR},
-              #{it.password, jdbcType=VARCHAR},
-              #{it.orgTag, jdbcType=VARCHAR},
-              #{it.supperAdmin, jdbcType=SMALLINT},
-              #{it.disabled, jdbcType=SMALLINT},
-              #{it.deleted, jdbcType=SMALLINT}
-            )
-        </foreach>
-    </insert>
-
-    <update id="batchUpdate" parameterType="java.util.List">
-        <foreach collection="list" item="it"  separator=";">
-            UPDATE ba_user
-            <set >
-                <if test="it.name != null" >
-                    name = #{it.name, jdbcType=VARCHAR},
-                </if>
-                <if test="it.phone != null" >
-                    phone = #{it.phone, jdbcType=VARCHAR},
-                </if>
-                <if test="it.password != null" >
-                    phone = #{it.password, jdbcType=VARCHAR},
-                </if>
-            </set>
-            WHERE
-            <trim prefixOverrides="and | or">
-                <if test="it.id != null">
-                    AND id = #{it.id,jdbcType=BIGINT}
-                </if>
-            </trim>
-        </foreach>
+    <update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoBa.BaUser">
+        update ba_user
+        set `name` = #{name,jdbcType=VARCHAR},
+        phone = #{phone,jdbcType=VARCHAR},
+        password = #{password,jdbcType=VARCHAR},
+        disabled = #{disabled,jdbcType=TINYINT},
+        deleted = #{deleted,jdbcType=TINYINT}
+        where id = #{id,jdbcType=BIGINT}
     </update>
-    -->
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+        delete from ba_user
+        where id = #{id,jdbcType=BIGINT}
+    </delete>
+    <delete id="deleteLogicById" parameterType="java.lang.Long">
+        update ba_user set deleted = 1
+        where id = #{id,jdbcType=BIGINT}
+    </delete>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0