From b9675b8776553828294bc635879d317b7bb83cc2 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 29 十一月 2023 20:09:52 +0800
Subject: [PATCH] 1、meterNo改为rtuAddr; 2、去掉一些main方法； 3、pom.xml中依赖common和global的<scope>provided</scope>改为<scope>compile</scope> 4、pipIrr-mwTest-server一些修改； 5、.gitignore文件提交。
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRoleMapper.xml | 67 +++++++++++++++++++++++++++++++++
1 files changed, 66 insertions(+), 1 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 660cf0d..14923bd 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRoleMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRoleMapper.xml
@@ -13,6 +13,10 @@
<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
</sql>
@@ -23,8 +27,9 @@
<select id="selectAll" resultMap="BaseResultMap">
select
- <include refid="Base_Column_List" />
+ <include refid="part_Column_List" />
from ba_role
+ where deleted!=1
</select>
<select id="selectByUserId" resultMap="partResultMap">
@@ -35,6 +40,34 @@
<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">
+ 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">
+ 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="insert" parameterType="com.dy.pipIrrGlobal.pojoBa.BaRole">
@@ -70,4 +103,36 @@
</if>
</trim>
</insert>
+
+
+ <update id="updateByPrimaryKeySelective" parameterType="com.dy.pipIrrGlobal.pojoBa.BaRole">
+ update ba_role
+ <set>
+ <if test="name != null">
+ `name` = #{name,jdbcType=VARCHAR},
+ </if>
+ <if test="deleted != null">
+ deleted = #{deleted,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT},
+ </if>
+ </set>
+ where id = #{id,jdbcType=BIGINT}
+ </update>
+
+ <update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoBa.BaRole">
+ update ba_role
+ set `name` = #{name,jdbcType=VARCHAR},
+ deleted = #{deleted,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT}
+ where id = #{id,jdbcType=BIGINT}
+ </update>
+
+
+ <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+ delete from ba_role
+ where id = #{id,jdbcType=BIGINT}
+ </delete>
+
+ <delete id="deleteLogicById" parameterType="java.lang.Long">
+ update ba_role set deleted = 1
+ where id = #{id,jdbcType=BIGINT}
+ </delete>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0