From 3496e5390b866618efafd56159f36c91d0d22689 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期三, 10 一月 2024 16:32:53 +0800
Subject: [PATCH] 2024-01-10 朱宝民 重构分水房3个接口

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRoleMapper.xml |  188 ++++++++++++++++++++++++++--------------------
 1 files changed, 107 insertions(+), 81 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRoleMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRoleMapper.xml
index 79c6dfa..da62340 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRoleMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRoleMapper.xml
@@ -1,84 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.dy.pipIrrGlobal.daoBa.BaRoleMapper">
-
   <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoBa.BaRole">
-    <result column="id" jdbcType="BIGINT" property="id" />
+    <!--@mbg.generated-->
+    <!--@Table ba_role-->
+    <id column="id" jdbcType="BIGINT" property="id" />
     <result column="name" jdbcType="VARCHAR" property="name" />
-    <result property="deleted" column="deleted" typeHandler="com.dy.common.mybatis.envm.EnumCodeTypeHandler" javaType="com.dy.common.mybatis.envm.Deleted"/>
+    <result column="operator" jdbcType="BIGINT" property="operator" />
+    <result column="operate_dt" jdbcType="TIMESTAMP" property="operateDt" />
+    <result column="deleted" jdbcType="TINYINT" property="deleted" />
   </resultMap>
-
-  <resultMap id="partResultMap" type="com.dy.pipIrrGlobal.pojoBa.BaRole">
-    <result column="id" jdbcType="BIGINT" property="id" />
-    <result column="name" jdbcType="VARCHAR" property="name" />
-  </resultMap>
-
-  <resultMap id="someResultMap" extends="partResultMap" type="com.dy.pipIrrGlobal.pojoBa.BaRole">
-    <collection property="priviList" fetchType="eager" column="{roleId=id}" select="com.dy.pipIrrGlobal.daoBa.BaPrivilegeMapper.selectPrivilegeByRoleId" />
-  </resultMap>
-
   <sql id="Base_Column_List">
-    id, name, deleted
+    <!--@mbg.generated-->
+    id, `name`, `operator`, operate_dt, deleted
   </sql>
-
-  <sql id="part_Column_List">
-    id, name, deleted
-  </sql>
-
-  <select id="selectAll" resultMap="BaseResultMap">
-    select
-    <include refid="part_Column_List" />
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    <!--@mbg.generated-->
+    select 
+    <include refid="Base_Column_List" />
     from ba_role
-    where deleted!=1
+    where id = #{id,jdbcType=BIGINT}
   </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    <!--@mbg.generated-->
+    delete from ba_role
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
 
-  <select id="selectByUserId" resultMap="partResultMap">
-    select <include refid="part_Column_List" />
-    from ba_role r
-    inner join ba_user_role ur on r.id = ur.roleId
-    where r.deleted != 1
-    <if test="userId != null">
-      and ur.userId = #{userId,jdbcType=BIGINT}
-    </if>
-  </select>
-
-  <select id="selectTotal" parameterType="java.util.Map" resultType="java.lang.Long">
-    select
-    count(*)
-    from ba_role where deleted!=1
-    <trim prefix="and" suffixOverrides="and">
-      <if test="name != null and name != ''">
-        name like concat('%', #{name}, '%')
-      </if>
-    </trim>
-  </select>
-
-  <select id="selectSome" parameterType="java.util.Map" resultMap="someResultMap">
-    select
-    <include refid="part_Column_List" />
-    from ba_role where deleted!=1
-    <trim prefix="and" suffixOverrides="and">
-      <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,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
-      </if>
-    </trim>
-  </select>
-
-  <insert id="putin" parameterType="com.dy.pipIrrGlobal.pojoBa.BaRole">
-    insert into ba_role (<include refid="Base_Column_List" />)
-    values (#{id,jdbcType=BIGINT},
-            #{name,jdbcType=VARCHAR},
-            #{deleted, typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT}
-      )
+  <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoBa.BaRole">
+    <!--@mbg.generated-->
+    insert into ba_role (id, `name`, `operator`, 
+      operate_dt, deleted)
+    values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{operator,jdbcType=BIGINT}, 
+      #{operateDt,jdbcType=TIMESTAMP}, #{deleted,jdbcType=TINYINT})
   </insert>
 
   <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoBa.BaRole">
+    <!--@mbg.generated-->
     insert into ba_role
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -86,6 +44,12 @@
       </if>
       <if test="name != null">
         `name`,
+      </if>
+      <if test="operator != null">
+        `operator`,
+      </if>
+      <if test="operateDt != null">
+        operate_dt,
       </if>
       <if test="deleted != null">
         deleted,
@@ -98,41 +62,103 @@
       <if test="name != null">
         #{name,jdbcType=VARCHAR},
       </if>
+      <if test="operator != null">
+        #{operator,jdbcType=BIGINT},
+      </if>
+      <if test="operateDt != null">
+        #{operateDt,jdbcType=TIMESTAMP},
+      </if>
       <if test="deleted != null">
-        #{deleted,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT},
+        #{deleted,jdbcType=TINYINT},
       </if>
     </trim>
   </insert>
-
-
   <update id="updateByPrimaryKeySelective" parameterType="com.dy.pipIrrGlobal.pojoBa.BaRole">
+    <!--@mbg.generated-->
     update ba_role
     <set>
       <if test="name != null">
         `name` = #{name,jdbcType=VARCHAR},
       </if>
+      <if test="operator != null">
+        `operator` = #{operator,jdbcType=BIGINT},
+      </if>
+      <if test="operateDt != null">
+        operate_dt = #{operateDt,jdbcType=TIMESTAMP},
+      </if>
       <if test="deleted != null">
-        deleted = #{deleted,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT},
+        deleted = #{deleted,jdbcType=TINYINT},
       </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
-
   <update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoBa.BaRole">
+    <!--@mbg.generated-->
     update ba_role
     set `name` = #{name,jdbcType=VARCHAR},
-     deleted = #{deleted,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT}
+      `operator` = #{operator,jdbcType=BIGINT},
+      operate_dt = #{operateDt,jdbcType=TIMESTAMP},
+      deleted = #{deleted,jdbcType=TINYINT}
     where id = #{id,jdbcType=BIGINT}
   </update>
 
+  <!--鏍规嵁瑙掕壊鍚嶇О鏌ヨ璁板綍鏁伴噺锛屾坊鍔犺鑹叉椂鍒ゆ柇鏄惁閲嶅悕-->
+  <select id="getRecordCountByName" resultType="java.lang.Integer">
+    SELECT
+        COUNT(*) AS recordCount
+    FROM ba_role
+    WHERE name = #{roleName}
+  </select>
 
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    delete from ba_role
-    where id = #{id,jdbcType=BIGINT}
-  </delete>
+  <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇瑙掕壊璁板綍鏁�-->
+  <select id="getRecordCount" resultType="java.lang.Long">
+    SELECT
+        COUNT(*) AS recordCount
+    FROM ba_role role
+    LEFT JOIN ba_role_permissions per ON per.roleId = role.id
+    <where>
+      AND role.deleted = 0
 
-  <delete id="deleteLogicById" parameterType="java.lang.Long">
-    update ba_role set deleted = 1
-    where id = #{id,jdbcType=BIGINT}
-  </delete>
+      <if test = "roleId != null and roleId > 0">
+        AND role.id = ${roleId}
+      </if>
+
+      <if test = "roleName != null and roleName !=''">
+        AND role.name LIKE CONCAT('%',#{roleName},'%')
+      </if>
+    </where>
+  </select>
+
+  <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇瑙掕壊璁板綍-->
+  <select id="getRoles" resultType="com.dy.pipIrrGlobal.voBa.VoRole">
+    SELECT
+        (@i:=@i+1) AS id,
+        t.* FROM
+        (
+          SELECT
+            role.id AS roleId,
+            role.name AS roleName,
+            per.permissions,
+            (SELECT `name` FROM ba_user WHERE id =  role.operator) AS operator,
+            role.operate_dt AS operateDt
+          FROM ba_role role
+            LEFT JOIN ba_role_permissions per ON per.roleId = role.id
+          <where>
+            AND role.deleted = 0
+
+            <if test = "roleId != null and roleId > 0">
+              AND role.id = ${roleId}
+            </if>
+
+            <if test = "roleName != null and roleName !=''">
+              AND role.name LIKE CONCAT('%',#{roleName},'%')
+            </if>
+          </where>
+          ORDER BY role.operate_dt DESC
+          <if test="pageCurr != null and pageSize != null">
+            LIMIT ${pageCurr}, ${pageSize}
+          </if>
+      ) t
+    , (SELECT @i:=0) AS itable
+  </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0