From ca869ad6522246095f500c5e9d13fa990c9aeaec Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期四, 27 六月 2024 09:19:09 +0800
Subject: [PATCH] 2024-06-27 朱宝民 临时解决登录问题
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUser.java | 9 +
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaPrivilege.java | 42 +++++++
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaRolePrivilegeMapper.java | 47 +++++++
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaPrivilegeMapper.xml | 88 ++++++++++++++
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaPrivilegeMapper.java | 45 +++++++
pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml | 2
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRolePrivilegeMapper.xml | 61 ++++++++++
pipIrr-platform/pipIrr-global/src/main/resources/application-database-ym.yml | 4
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaRolePrivilege.java | 32 +++++
9 files changed, 327 insertions(+), 3 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..9c9cca4
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaPrivilegeMapper.java
@@ -0,0 +1,45 @@
+package com.dy.pipIrrGlobal.daoBa;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dy.pipIrrGlobal.pojoBa.BaPrivilege;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface BaPrivilegeMapper extends BaseMapper<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 putin(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/BaRolePrivilegeMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaRolePrivilegeMapper.java
new file mode 100644
index 0000000..ea41c94
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaRolePrivilegeMapper.java
@@ -0,0 +1,47 @@
+package com.dy.pipIrrGlobal.daoBa;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dy.pipIrrGlobal.pojoBa.BaRolePrivilege;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+@Mapper
+public interface BaRolePrivilegeMapper extends BaseMapper<BaRolePrivilege> {
+
+ /**
+ * insert record to table
+ * @param record the record
+ * @return insert count
+ */
+ int putin(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/pojoBa/BaPrivilege.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaPrivilege.java
new file mode 100644
index 0000000..bbedf86
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaPrivilege.java
@@ -0,0 +1,42 @@
+package com.dy.pipIrrGlobal.pojoBa;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
+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 io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+
+/**
+ * 鏉冮檺瀹炰綋
+ */
+@TableName(value="ba_privilege", autoResultMap = true)
+@Data
+@Builder
+@ToString
+@NoArgsConstructor
+@AllArgsConstructor
+@Schema(name = "鏉冮檺瀹炰綋")
+public class BaPrivilege implements BaseEntity {
+
+ public static final long serialVersionUID = 202310211551001L;
+
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ @TableId(type = IdType.INPUT)
+ private Long id;
+ /**
+ * 鏉冮檺缂栧彿
+ */
+ public Integer num;
+ /**
+ * 鏉冮檺鍚嶇О
+ */
+ public String name;
+ /**
+ * 鏉冮檺绫诲埆
+ */
+ public String type;
+
+}
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..ccf3c1a
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaRolePrivilege.java
@@ -0,0 +1,32 @@
+package com.dy.pipIrrGlobal.pojoBa;
+
+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.po.BaseEntity;
+import lombok.*;
+/**
+ * 瑙掕壊涓庢潈闄愬叧绯诲疄浣�
+ */
+@TableName(value="ba_role_privilege", autoResultMap = true)
+@Data
+@Builder
+@ToString
+@NoArgsConstructor
+@AllArgsConstructor
+public class BaRolePrivilege implements BaseEntity {
+
+ public static final long serialVersionUID = 202311062027001L;
+
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ @TableField(value = "roleId")
+ public Long roleId;
+
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ @TableField(value = "privilegeId")
+ 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 7f54c34..92317e8 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
@@ -127,6 +127,15 @@
public List<?> roleList ;
/**
+ * 鐢ㄦ埛鎵�鎷ユ湁鐨勬潈闄愶紝閽堝鐧诲綍搴旂敤
+ */
+ @Schema(hidden = true)
+ @TableField(exist = false)
+ @JSONField(serialize = false)
+ public List<Integer> privileges;
+
+
+ /**
* 鎵�灞炵墖鍖哄悕绉�
*/
@Schema(description = "鎵�灞炵墖鍖哄悕绉帮紝鐢ㄤ簬鏄剧ず锛岃〃鍗曚笉鐢ㄥ～鍐�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/application-database-ym.yml b/pipIrr-platform/pipIrr-global/src/main/resources/application-database-ym.yml
index 700142f..29fac5c 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/application-database-ym.yml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-database-ym.yml
@@ -5,8 +5,8 @@
#name: ym
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://192.168.40.166:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
-# url: jdbc:mysql://127.0.0.1:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
+# url: jdbc:mysql://192.168.40.166:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
+ url: jdbc:mysql://127.0.0.1:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
username: root
password: dysql,;.abc!@#
druid:
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
index 01b83ee..9fd4b6a 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
@@ -72,7 +72,7 @@
pipIrr:
global:
- dev: false #鏄惁寮�鍙戦樁娈碉紝true鎴杅alse
+ dev: true #鏄惁寮�鍙戦樁娈碉紝true鎴杅alse
dsName: ym #寮�鍙戦樁娈碉紝璁剧疆涓存椂鐨勬暟鎹簱鍚嶇О
mw:
webPort: 8070
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..6af6bd3
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaPrivilegeMapper.xml
@@ -0,0 +1,88 @@
+<?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_privilege-->
+ <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_privilege
+ </select>
+
+ <select id="selectPrivilegeByUserId" resultType="Integer">
+ select p.num
+ from ba_privilege 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_privilege 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="putin" parameterType="com.dy.pipIrrGlobal.pojoBa.BaPrivilege">
+ <!--@mbg.generated-->
+ insert into ba_privilege (<include refid="Base_Column_List" />)
+ 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_privilege
+ <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/BaRolePrivilegeMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRolePrivilegeMapper.xml
new file mode 100644
index 0000000..b90a5e9
--- /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="putin" 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
--
Gitblit v1.8.0