From 4ef44fad498ddfb2b157d6c74c515e4041ee71ea Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 07 十一月 2023 09:23:14 +0800
Subject: [PATCH] 增加角色Role、权限Privilege及他们关系实体，实体Mapper等内容
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUser.java | 12 +
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserRoleMapper.xml | 63 +++++++
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaRoleMapper.java | 14 +
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRoleMapper.xml | 28 ++
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaPrivilegeMapper.xml | 89 +++++++++
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaPrivilegeMapper.java | 43 ++++
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRolePrivilegeMapper.xml | 61 ++++++
/dev/null | 26 --
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaUserMapper.java | 12
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaUserRoleMapper.java | 45 +++++
pipIrr-platform/pipIrr-global/src/main/resources/mapper/DemoRoleMapper.xml | 8
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaPrivilege.java | 2
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml | 38 +++-
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaRole.java | 1
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaRolePrivilegeMapper.java | 46 +++++
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaRolePrivilege.java | 20 ++
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUserRole.java | 19 -
17 files changed, 458 insertions(+), 69 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaPrivilegeMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaPrivilegeMapper.java
new file mode 100644
index 0000000..e49075b
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaPrivilegeMapper.java
@@ -0,0 +1,43 @@
+package com.dy.pipIrrGlobal.daoBa;
+
+import com.dy.pipIrrGlobal.pojoBa.BaPrivilege;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface BaPrivilegeMapper extends com.baomidou.mybatisplus.core.mapper.Mapper<BaPrivilege> {
+ /**
+ * 鏌ヨ鍏ㄩ儴
+ * @return List<BaPrivilege>
+ */
+ List<BaPrivilege> selectAll() ;
+
+ /**
+ * 鏌ヨ鏌愪釜鐢ㄦ埛鎵�闅跺睘鎵�鏈夎鑹茬殑鎵�鏈夋潈闄�
+ * @param userId 鐢ㄦ埛ID
+ * @return List<Integer>
+ */
+ List<Integer> selectPrivilegeByUserId(@Param("userId") Long userId) ;
+
+ /**
+ * 鏌ヨ鏌愪釜瑙掕壊鎵�闅跺睘浜庤瑙掕壊鐨勬墍鏈夋潈闄�
+ * @param roleId 鐢ㄦ埛ID
+ * @return List<Integer>
+ */
+ List<Integer> selectPrivilegeByRoleId(@Param("roleId") Long roleId) ;
+
+ /**
+ * insert record to table
+ * @param record the record
+ * @return insert count
+ */
+ int insert(BaPrivilege record);
+
+ /**
+ * insert record to table selective
+ * @param record the record
+ * @return insert count
+ */
+ int insertSelective(BaPrivilege record);
+
+}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaRoleMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaRoleMapper.java
index a0e7f20..47dd186 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaRoleMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaRoleMapper.java
@@ -2,6 +2,7 @@
import com.dy.pipIrrGlobal.pojoBa.BaRole;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -21,5 +22,16 @@
*/
int insertSelective(BaRole record);
- List<BaRole> select() ;
+ /**
+ * 鏌ヨ鍏ㄩ儴
+ * @return List<BaRole>
+ */
+ List<BaRole> selectAll() ;
+
+ /**
+ * 鏌ヨ鏌愪釜鐢ㄦ埛鎵�闅跺睘浜庣殑瑙掕壊
+ * @param userId 鐢ㄦ埛ID
+ * @return List<BaRole>
+ */
+ List<BaRole> selectByUserId(@Param("userId") Long userId) ;
}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaRolePrivilegeMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaRolePrivilegeMapper.java
new file mode 100644
index 0000000..7e34db4
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaRolePrivilegeMapper.java
@@ -0,0 +1,46 @@
+package com.dy.pipIrrGlobal.daoBa;
+
+import com.dy.pipIrrGlobal.pojoBa.BaRolePrivilege;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+@Mapper
+public interface BaRolePrivilegeMapper {
+
+ /**
+ * insert record to table
+ * @param record the record
+ * @return insert count
+ */
+ int insert(BaRolePrivilege record);
+
+ /**
+ * insert record to table selective
+ * @param record the record
+ * @return insert count
+ */
+ int insertSelective(BaRolePrivilege record);
+
+ /**
+ * delete by primary key
+ * @param roleId primaryKey
+ * @param privilegeId primaryKey
+ * @return deleteCount
+ */
+ int deleteByPrimaryKey(@Param("roleId") Long roleId, @Param("privilegeId") Long privilegeId);
+
+ /**
+ * delete by roleId
+ * @param roleId 瑙掕壊ID
+ * @return deleteCount
+ */
+ int deleteByRoleId(@Param("roleId") Long roleId);
+
+ /**
+ * delete by roleId
+ * @param privilegeId 鏉冮檺ID
+ * @return deleteCount
+ */
+ int deleteByPrivilegeId(@Param("privilegeId") Long privilegeId);
+
+}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaUserMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaUserMapper.java
index 3460fc5..a88c072 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaUserMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaUserMapper.java
@@ -4,18 +4,14 @@
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
-import java.util.List;
-
@Mapper
-//public interface BaUserMapper extends com.baomidou.mybatisplus.core.mapper.Mapper<BaUser> {
-//public interface BaUserMapper extends com.baomidou.mybatisplus.core.mapper.BaseMapper<BaUser> {
-public interface BaUserMapper {
+public interface BaUserMapper extends com.baomidou.mybatisplus.core.mapper.Mapper<BaUser> {
/**
* 鐢ㄦ埛鐧诲綍
- * @param phone
- * @param password
- * @return
+ * @param phone 鎵嬫満鍙�
+ * @param password 瀵嗙爜
+ * @return BaUser
*/
BaUser login(@Param("phone") String phone, @Param("password") String password) ;
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaUserRoleMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaUserRoleMapper.java
new file mode 100644
index 0000000..bf9d163
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaUserRoleMapper.java
@@ -0,0 +1,45 @@
+package com.dy.pipIrrGlobal.daoBa;
+
+import com.dy.pipIrrGlobal.pojoBa.BaUserRole;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+@Mapper
+public interface BaUserRoleMapper {
+
+ /**
+ * insert record to table
+ * @param record the record
+ * @return insert count
+ */
+ int insert(BaUserRole record);
+
+ /**
+ * insert record to table selective
+ * @param record the record
+ * @return insert count
+ */
+ int insertSelective(BaUserRole record);
+
+ /**
+ * delete by primary key
+ * @param userId primaryKey
+ * @param roleId primaryKey
+ * @return deleteCount
+ */
+ int deleteByPrimaryKey(@Param("userId") Long userId, @Param("roleId") Long roleId);
+
+ /**
+ * delete by primary key
+ * @param userId primaryKey
+ * @return deleteCount
+ */
+ int deleteByUserId(@Param("userId") Long userId);
+
+ /**
+ * delete by primary key
+ * @param roleId primaryKey
+ * @return deleteCount
+ */
+ int deleteByRoleId(@Param("roleId") Long roleId);
+}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaPriviledge.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaPrivilege.java
similarity index 94%
rename from pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaPriviledge.java
rename to pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaPrivilege.java
index 474f956..cd07ecb 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaPriviledge.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaPrivilege.java
@@ -14,7 +14,7 @@
@ToString
@NoArgsConstructor
@AllArgsConstructor
-public class BaPriviledge implements BaseEntity {
+public class BaPrivilege implements BaseEntity {
public static final long serialVersionUID = 202310211551001L;
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaRole.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaRole.java
index f16a6b8..d60f91e 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaRole.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaRole.java
@@ -4,7 +4,6 @@
import com.alibaba.fastjson2.annotation.JSONField;
import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.dy.common.mybatis.envm.Deleted;
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaRolePriviledge.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaRolePriviledge.java
deleted file mode 100644
index 48d2704..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaRolePriviledge.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.dy.pipIrrGlobal.pojoBa;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.dy.common.po.BaseEntity;
-import lombok.*;
-
-import java.io.Serializable;
-
-@TableName(autoResultMap = true)
-@Data
-@Builder
-@ToString
-@NoArgsConstructor
-@AllArgsConstructor
-public class BaRolePriviledge implements BaseEntity {
-
- public static final long serialVersionUID = 202310211555001L;
-
- @TableId(value = "roleId", type = IdType.INPUT)
- public Long userId ;
-
- @TableId(value = "privId", type = IdType.INPUT)
- public Long privId ;
-}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaRolePrivilege.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaRolePrivilege.java
new file mode 100644
index 0000000..31f071d
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaRolePrivilege.java
@@ -0,0 +1,20 @@
+package com.dy.pipIrrGlobal.pojoBa;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
+@TableName(autoResultMap = true)
+@Data
+@Builder
+@ToString
+@NoArgsConstructor
+@AllArgsConstructor
+public class BaRolePrivilege {
+
+ public static final long serialVersionUID = 202311062027001L;
+
+ public Long roleId;
+
+ public Long privilegeId;
+
+}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUser.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUser.java
index cfc2764..407df37 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUser.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUser.java
@@ -8,11 +8,11 @@
import com.dy.common.po.BaseEntity;
import lombok.*;
-import java.io.Serializable;
+import java.util.List;
/**
- * @TableName(value = 鈥渁鈥�, autoResultMap = true)
+ * TableName(value = 鈥渁鈥�, autoResultMap = true)
* autoResultMap鍙傛暟涓簍rue鏃讹紝琛ㄦ槑涓埆瀛楁鍦ㄦ煡璇㈠鐞嗙殑鏃跺�欒嚜鍔ㄨ浆鎹负瀵硅薄锛�
* 鍙�傚悎璁剧疆浜員ypeHandler銆乯dbcTyped鐨勬儏鍐点�俛utoResultMap 鑷姩鏄犲皠锛�
* 閫氬父閰嶅悎 @TableField() 涓�璧蜂娇鐢紝纭畾鏄犲皠瑙勮寖鎬с��
@@ -66,7 +66,7 @@
/**
* 鏄惁瓒呯骇绠＄悊鍛� 1:鏄�,0:鍚�
*/
- public Byte superAdmin;
+ public Byte supperAdmin;
/**
* 鏄惁绂佺敤 0:鍚�,1:鏄�
@@ -77,4 +77,10 @@
* 鏄惁鍒犻櫎: 0琛ㄧず鏈垹闄� 1琛ㄧず鍒犻櫎.
*/
public Deleted deleted;
+
+ /**
+ * 鐢ㄦ埛鎵�鎷ユ湁鐨勬潈闄�
+ */
+ @TableField(exist=false)
+ public List<Integer> privileges;
}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUserRole.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUserRole.java
index 04e4ac0..bcceb8d 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUserRole.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUserRole.java
@@ -1,13 +1,7 @@
package com.dy.pipIrrGlobal.pojoBa;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
-import com.dy.common.po.BaseEntity;
import lombok.*;
-
-import java.io.Serializable;
@TableName(autoResultMap = true)
@Data
@@ -15,13 +9,12 @@
@ToString
@NoArgsConstructor
@AllArgsConstructor
-public class BaUserRole implements BaseEntity {
+public class BaUserRole {
- public static final long serialVersionUID = 202310211554001L;
+ public static final long serialVersionUID = 202311061942001L;
- @TableId(value = "userId", type = IdType.INPUT)
- public Long userId ;
+ private Long userId;
- @TableId(value = "roleId", type = IdType.INPUT)
- public Long roleId ;
-}
+ private Long roleId;
+
+}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaPrivilegeMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaPrivilegeMapper.xml
new file mode 100644
index 0000000..c52b2eb
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaPrivilegeMapper.xml
@@ -0,0 +1,89 @@
+<?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.BaPrivilegeMapper">
+
+ <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoBa.BaPrivilege">
+ <!--@mbg.generated-->
+ <!--@Table ba_priviledge-->
+ <result column="id" jdbcType="BIGINT" property="id" />
+ <result column="num" jdbcType="INTEGER" property="num" />
+ <result column="name" jdbcType="VARCHAR" property="name" />
+ <result column="type" jdbcType="VARCHAR" property="type" />
+ </resultMap>
+
+ <sql id="Base_Column_List">
+ <!--@mbg.generated-->
+ id, num, name, type
+ </sql>
+
+ <select id="selectAll" resultMap="BaseResultMap">
+ select
+ <include refid="Base_Column_List" />
+ from ba_priviledge
+ </select>
+
+ <select id="selectPrivilegeByUserId" resultType="Integer">
+ select p.num
+ from ba_priviledge p
+ inner join ba_role_privilege rp on p.id = rp.privilegeId
+ inner join ba_user_role ur on rp.roleId = ur.roleId
+ inner join ba_role r on ur.roleId = r.id
+ where r.deleted != 1
+ <if test="userId != null">
+ and ur.userId = #{userId, jdbcType=BIGINT}
+ </if>
+ </select>
+
+ <select id="selectPrivilegeByRoleId" resultType="Integer">
+ select p.num
+ from ba_priviledge p
+ inner join ba_role_privilege rp on p.id = rp.privilegeId
+ <if test="roleId != null">
+ where rp.roleId = #{roleId, jdbcType=BIGINT}
+ </if>
+ </select>
+
+ <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoBa.BaPrivilege">
+ <!--@mbg.generated-->
+ insert into ba_priviledge (id, num, name, type
+ )
+ values (#{id,jdbcType=BIGINT},
+ #{num,jdbcType=INTEGER},
+ #{name,jdbcType=VARCHAR},
+ #{type, jdbcType=VARCHAR}
+ )
+ </insert>
+
+ <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoBa.BaPrivilege">
+ <!--@mbg.generated-->
+ insert into ba_priviledge
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="id != null">
+ id,
+ </if>
+ <if test="num != null">
+ id,
+ </if>
+ <if test="name != null">
+ name,
+ </if>
+ <if test="type != null">
+ type,
+ </if>
+ </trim>
+ <trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="id != null">
+ #{id,jdbcType=BIGINT},
+ </if>
+ <if test="num != null">
+ #{name,jdbcType=INTEGER},
+ </if>
+ <if test="name != null">
+ #{name,jdbcType=VARCHAR},
+ </if>
+ <if test="type != null">
+ #{type,jdbcType=VARCHAR},
+ </if>
+ </trim>
+ </insert>
+</mapper>
\ No newline at end of file
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 e722f57..29d8fe7 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRoleMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRoleMapper.xml
@@ -1,24 +1,44 @@
<?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">
<!--@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 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 *
+
+ <sql id="Base_Column_List">
+ <!--@mbg.generated-->
+ id, name, deleted
+ </sql>
+
+ <select id="selectAll" resultMap="BaseResultMap">
+ select
+ <include refid="Base_Column_List" />
from ba_role
</select>
+
+ <select id="selectByUserId" resultMap="BaseResultMap">
+ select <include refid="Base_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>
+
<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}
+ values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{deleted, typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT}
)
</insert>
+
<insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoBa.BaRole">
<!--@mbg.generated-->
insert into ba_role
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRolePrivilegeMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRolePrivilegeMapper.xml
new file mode 100644
index 0000000..2ab0a18
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRolePrivilegeMapper.xml
@@ -0,0 +1,61 @@
+<?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.BaRolePrivilegeMapper">
+
+ <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoBa.BaRolePrivilege">
+ <!--@mbg.generated-->
+ <!--@Table ba_role_privilege-->
+ <id column="roleId" jdbcType="BIGINT" property="roleId" />
+ <id column="privilegeId" jdbcType="BIGINT" property="privilegeId" />
+ </resultMap>
+
+ <sql id="Base_Column_List">
+ <!--@mbg.generated-->
+ roleId, privilegeId
+ </sql>
+
+ <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoBa.BaRolePrivilege">
+ <!--@mbg.generated-->
+ insert into ba_role_privilege (roleId, privilegeId)
+ values (#{roleId,jdbcType=BIGINT}, #{privilegeId,jdbcType=BIGINT})
+ </insert>
+
+ <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoBa.BaRolePrivilege">
+ <!--@mbg.generated-->
+ insert into ba_role_privilege
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="roleId != null">
+ roleId,
+ </if>
+ <if test="privilegeId != null">
+ privilegeId,
+ </if>
+ </trim>
+ <trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="roleId != null">
+ #{roleId,jdbcType=BIGINT},
+ </if>
+ <if test="privilegeId != null">
+ #{privilegeId,jdbcType=BIGINT},
+ </if>
+ </trim>
+ </insert>
+
+ <delete id="deleteByPrimaryKey" parameterType="map">
+ <!--@mbg.generated-->
+ delete from ba_role_privilege
+ where roleId = #{roleId,jdbcType=BIGINT}
+ and privilegeId = #{privilegeId,jdbcType=BIGINT}
+ </delete>
+
+ <delete id="deleteByRoleId" parameterType="long">
+ delete from ba_role_privilege
+ where roleId = #{roleId,jdbcType=BIGINT}
+ </delete>
+
+ <delete id="deleteByPrivilegeId" parameterType="long">
+ delete from ba_role_privilege
+ where privilegeId = #{privilegeId,jdbcType=BIGINT}
+ </delete>
+
+</mapper>
\ No newline at end of file
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 20721d8..af96f76 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml
@@ -3,24 +3,40 @@
<!--namespace瀵瑰簲mapper鎺ュ彛鎵�鍦ㄧ殑浣嶇疆-->
<mapper namespace="com.dy.pipIrrGlobal.daoBa.BaUserMapper">
+ <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoBa.BaUser">
+ <!--@mbg.generated-->
+ <!--@Table ba_user-->
+ <id property="id" column="id" />
+ <result property="name" column="name"/>
+ <result property="phone" column="phone"/>
+ <result property="password" column="password"/>
+ <result property="orgTag" column="orgTag"/>
+ <result property="supperAdmin" column="supperAdmin"/>
+ <result property="disabled" column="deleted"/>
+ </resultMap>
+
<resultMap id="login" type="com.dy.pipIrrGlobal.pojoBa.BaUser">
<id property="id" column="id" />
<result property="name" column="name"/>
<result property="phone" column="phone"/>
<result property="orgTag" column="orgTag"/>
+ <result property="supperAdmin" column="supperAdmin"/>
</resultMap>
- <!--
- <select id="login" resultMap="login">
- select id, name, phone, orgTag
- from ba_user
- where disabled=0 and deleted=0 and phone=#{phone} and password=#{password}
- </select>
- <select id="login" resultType="com.dy.pipIrrGlobal.pojoBa.BaUser">
- select id, name, phone, orgTag
- -->
+
+ <sql id="Base_Column_List">
+ <!--@mbg.generated-->
+ id, name, phone, password, orgTag, supperAdmin, deleted
+ </sql>
+
+ <sql id="Login_Column_List">
+ <!--@mbg.generated-->
+ id, name, phone, orgTag, supperAdmin
+ </sql>
+
<select id="login" resultMap="login" >
- select *
- from ba_user r
+ select
+ <include refid="Login_Column_List" />
+ from ba_user
where disabled=0 and deleted=0 and phone=#{phone} and password=#{password}
</select>
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserRoleMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserRoleMapper.xml
new file mode 100644
index 0000000..5b84062
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserRoleMapper.xml
@@ -0,0 +1,63 @@
+<?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.BaUserRoleMapper">
+
+ <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoBa.BaUserRole">
+ <!--@mbg.generated-->
+ <!--@Table ba_user_role-->
+ <id column="userId" jdbcType="BIGINT" property="userId" />
+ <id column="roleId" jdbcType="BIGINT" property="roleId" />
+ </resultMap>
+
+ <sql id="Base_Column_List">
+ <!--@mbg.generated-->
+ userId, roleId
+ </sql>
+
+ <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoBa.BaUserRole">
+ <!--@mbg.generated-->
+ insert into ba_user_role (userId, roleId)
+ values (#{userId,jdbcType=BIGINT}, #{roleId,jdbcType=BIGINT})
+ </insert>
+
+ <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoBa.BaUserRole">
+ <!--@mbg.generated-->
+ insert into ba_user_role
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="userId != null">
+ userId,
+ </if>
+ <if test="roleId != null">
+ roleId,
+ </if>
+ </trim>
+ <trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="userId != null">
+ #{userId,jdbcType=BIGINT},
+ </if>
+ <if test="roleId != null">
+ #{roleId,jdbcType=BIGINT},
+ </if>
+ </trim>
+ </insert>
+
+ <delete id="deleteByPrimaryKey" parameterType="map">
+ <!--@mbg.generated-->
+ delete from ba_user_role
+ where userId = #{userId,jdbcType=BIGINT}
+ and roleId = #{roleId,jdbcType=BIGINT}
+ </delete>
+
+ <delete id="deleteByUserId" parameterType="long">
+ <!--@mbg.generated-->
+ delete from ba_user_role
+ where userId = #{userId,jdbcType=BIGINT}
+ </delete>
+
+ <delete id="deleteByRoleId" parameterType="long">
+ <!--@mbg.generated-->
+ delete from ba_user_role
+ where userId = #{roleId,jdbcType=BIGINT}
+ </delete>
+
+</mapper>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/DemoRoleMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/DemoRoleMapper.xml
index 2ab986b..3bb647f 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/DemoRoleMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/DemoRoleMapper.xml
@@ -1,17 +1,20 @@
<?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.daoDemo.DemoRoleMapper">
+
<resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoDemo.DemoRole">
<!--@mbg.generated-->
<!--@Table demo_role-->
<id column="id" jdbcType="BIGINT" property="id" />
<result column="name" jdbcType="VARCHAR" property="name" />
- <result column="deleted" jdbcType="TINYINT" property="deleted" />
+ <result property="deleted" column="deleted" typeHandler="com.dy.common.mybatis.envm.EnumCodeTypeHandler" javaType="com.dy.common.mybatis.envm.Deleted"/>
</resultMap>
+
<sql id="Base_Column_List">
<!--@mbg.generated-->
id, `name`, deleted
</sql>
+
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--@mbg.generated-->
select
@@ -19,11 +22,13 @@
from demo_role
where id = #{id,jdbcType=BIGINT}
</select>
+
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
<!--@mbg.generated-->
delete from demo_role
where id = #{id,jdbcType=BIGINT}
</delete>
+
<insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoDemo.DemoRole">
<!--@mbg.generated-->
insert into demo_role (id, `name`, deleted
@@ -31,6 +36,7 @@
values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{deleted,jdbcType=TINYINT}
)
</insert>
+
<insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoDemo.DemoRole">
<!--@mbg.generated-->
insert into demo_role
--
Gitblit v1.8.0