Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

liurunyu

5 天以前 e5c29d6ac2b210a9385723598d79a42ae5a9679e

 pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRoleMapper.xml

@@ -1,24 +1,75 @@
<?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">-->
<!--    &lt;!&ndash;@mbg.generated&ndash;&gt;-->
<!--    &lt;!&ndash;@Table ba_role&ndash;&gt;-->
<!--    <id column="id" jdbcType="BIGINT" property="id" />-->
<!--    <result column="name" jdbcType="VARCHAR" property="name" />-->
<!--    <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="BaseResultMap" type="com.dy.pipIrrGlobal.pojoBa.BaRole">
    <!--@mbg.generated-->
    <!--@Table ba_role-->
    <result column="id" jdbcType="BIGINT" property="id" />
    <result column="name" jdbcType="VARCHAR" property="name" />
    <result column="deleted" jdbcType="TINYINT" property="deleted" />
    <result column="operator" jdbcType="BIGINT" property="operator" />
    <result column="operate_dt" jdbcType="TIMESTAMP" property="operateDt" />
    <result property="deleted" column="deleted" typeHandler="com.dy.common.mybatis.envm.EnumCodeTypeHandler" javaType="com.dy.common.mybatis.envm.Deleted"/>
  </resultMap>
  <select id="select" resultMap="BaseResultMap">
    select *
    from ba_role

  <resultMap id="partResultMap" type="com.dy.pipIrrGlobal.pojoBa.BaRole">
    <result column="id" jdbcType="BIGINT" property="id" />
    <result column="name" jdbcType="VARCHAR" property="name" />
    <result column="operator" jdbcType="BIGINT" property="operator" />
    <result column="operate_dt" jdbcType="TIMESTAMP" property="operateDt" />
  </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="part_Column_List">
    id, name, operator, operate_dt, deleted
  </sql>

  <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>

  <sql id="Base_Column_List">
    <!--@mbg.generated-->
    id, `name`, `operator`, operate_dt, deleted
  </sql>
  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
    <!--@mbg.generated-->
    select 
    <include refid="Base_Column_List" />
    from ba_role
    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>

  <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoBa.BaRole">
    <!--@mbg.generated-->
    insert into ba_role (id, `name`, deleted
      )
    values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{deleted,jdbcType=TINYINT}
      )
    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
@@ -28,6 +79,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,
@@ -40,9 +97,108 @@
      <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,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,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},
      `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>

<!--  &lt;!&ndash;根据指定条件获取角色记录数&ndash;&gt;-->
<!--  <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-->

<!--      <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>-->

<!--  &lt;!&ndash;根据指定条件获取角色记录&ndash;&gt;-->
<!--  <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>-->

  <!--根据roleId逻辑删除角色对象-->
  <update id="deleteRoleById">
    UPDATE ba_role SET deleted = 1 WHERE id = ${roleId}
  </update>
</mapper>