From 21eb47b061d16056f37eee47928c7fe629b63061 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期日, 12 十一月 2023 20:18:15 +0800
Subject: [PATCH] 实体修改用户密码功能，实现密码MD5加密功能，及其他代码完善
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml | 237 ++++++++++++++++++++++++++--------------------------------
1 files changed, 106 insertions(+), 131 deletions(-)
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 3eb39b3..6ed6777 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml
@@ -16,7 +16,18 @@
<result property="deleted" column="deleted" typeHandler="com.dy.common.mybatis.envm.EnumCodeTypeHandler" javaType="com.dy.common.mybatis.envm.Deleted"/>
</resultMap>
- <resultMap id="login" type="com.dy.pipIrrGlobal.pojoBa.BaUser">
+ <resultMap id="partResultMap" 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="orgTag" column="orgTag"/>
+ <result property="supperAdmin" column="supperAdmin"/>
+ <result property="disabled" column="disabled" typeHandler="com.dy.common.mybatis.envm.EnumCodeTypeHandler" javaType="com.dy.common.mybatis.envm.Disabled"/>
+ </resultMap>
+
+ <resultMap id="loginResultMap" type="com.dy.pipIrrGlobal.pojoBa.BaUser">
<id property="id" column="id" />
<result property="name" column="name"/>
<result property="phone" column="phone"/>
@@ -24,91 +35,81 @@
<result property="supperAdmin" column="supperAdmin"/>
</resultMap>
+ <resultMap id="someResultMap" extends="partResultMap" type="com.dy.pipIrrGlobal.pojoBa.BaUser">
+ <collection property="roleList" fetchType="eager" column="{userId=id}" select="com.dy.pipIrrGlobal.daoBa.BaRoleMapper.selectByUserId" />
+ </resultMap>
+
<sql id="Base_Column_List">
- <!--@mbg.generated-->
id, name, phone, password, orgTag, supperAdmin, disabled, deleted
</sql>
+ <sql id="part_Column_List">
+ id, name, phone, disabled
+ </sql>
+
<sql id="Login_Column_List">
- <!--@mbg.generated-->
id, name, phone, orgTag, supperAdmin
</sql>
- <select id="login" resultMap="login" >
+ <select id="login" resultMap="loginResultMap" >
select
<include refid="Login_Column_List" />
from ba_user
- where disabled=0 and deleted=0 and phone=#{phone} and password=#{password}
+ where disabled!=1 and deleted!=1 and phone=#{phone} and password=#{password}
</select>
- <!--
- <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoBa.BaUser">
- <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long" id="selectKey">
- SELECT LAST_INSERT_ID()
- </selectKey>
- insert into ba_user
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="id != null">
- id,
- </if>
+ <select id="selectTotal" parameterType="java.util.Map" resultType="java.lang.Long">
+ select
+ count(*)
+ from ba_user where supperAdmin!=1 and deleted!=1
+ <trim prefix="and" suffixOverrides="and">
<if test="name != null">
- name,
+ name like concat('%', #{name}, '%') and
</if>
<if test="phone != null">
- phone,
- </if>
- <if test="password != null">
- password,
- </if>
- <if test="orgTag != null">
- orgTag,
- </if>
- <if test="supperAdmin != null">
- supperAdmin,
- </if>
- <if test="disabled != null">
- disabled,
- </if>
- <if test="deleted != null">
- deleted,
+ phone = '#{phone,jdbcType=VARCHAR}'
</if>
</trim>
- <trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="id != null">
- #{id, jdbcType=BIGINT},
- </if>
+ </select>
+ <select id="selectSome" parameterType="java.util.Map" resultMap="someResultMap">
+ select
+ <include refid="part_Column_List" />
+ from ba_user where supperAdmin!=1 and deleted!=1
+ <trim prefix="and" suffixOverrides="and">
<if test="name != null">
- #{name, jdbcType=VARCHAR},
+ name like concat('%', #{name}, '%') and
</if>
<if test="phone != null">
- #{phone, jdbcType=VARCHAR},
- </if>
- <if test="password != null">
- #{password, jdbcType=VARCHAR},
- </if>
- <if test="orgTag != null">
- #{orgTag, jdbcType=VARCHAR},
- </if>
- <if test="supperAdmin != null">
- #{supperAdmin, jdbcType=SMALLINT},
- </if>
- <if test="disabled != null">
- #{disabled, jdbcType=SMALLINT},
- </if>
- <if test="deleted != null">
- #{deleted, jdbcType=SMALLINT},
+ phone = '#{phone,jdbcType=VARCHAR}'
</if>
</trim>
+ order by id DESC
+ <trim prefix="limit " >
+ <if test="start != null and count != null">
+ #{start}, #{count}
+ </if>
+ </trim>
+ </select>
+ <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoBa.BaUser">
+ insert into ba_user (<include refid="Base_Column_List" />)
+ values (#{id,jdbcType=BIGINT},
+ #{name,jdbcType=VARCHAR},
+ #{phone,jdbcType=VARCHAR},
+ #{password,jdbcType=VARCHAR},
+ #{orgTag,jdbcType=VARCHAR},
+ #{supperAdmin,jdbcType=TINYINT},
+ #{disabled,jdbcType=TINYINT},
+ #{deleted,jdbcType=TINYINT}
+ )
</insert>
-
- <insert id="insertOnDuplicateUpdate" parameterType="com.dy.pipIrrGlobal.pojoBa.BaUser">
+ <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoBa.BaUser">
insert into ba_user
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
id,
</if>
<if test="name != null">
- name,
+ `name`,
</if>
<if test="phone != null">
phone,
@@ -122,109 +123,83 @@
<if test="supperAdmin != null">
supperAdmin,
</if>
- <if test="disabled != null">
- disabled,
+ <if test="disabled != null">
+ disabled,
</if>
- <if test="deleted != null">
+ <if test="deleted != null">
deleted,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
- #{id, jdbcType=BIGINT},
+ #{id,jdbcType=BIGINT},
</if>
<if test="name != null">
- #{name, jdbcType=VARCHAR},
+ #{name,jdbcType=VARCHAR},
</if>
<if test="phone != null">
- #{phone, jdbcType=VARCHAR},
+ #{phone,jdbcType=VARCHAR},
</if>
<if test="password != null">
- #{password, jdbcType=VARCHAR},
+ #{password,jdbcType=VARCHAR},
</if>
<if test="orgTag != null">
- #{orgTag, jdbcType=VARCHAR},
+ #{orgTag,jdbcType=VARCHAR},
</if>
<if test="supperAdmin != null">
- #{supperAdmin, jdbcType=SMALLINT},
+ #{supperAdmin,jdbcType=TINYINT},
</if>
<if test="disabled != null">
- #{disabled, jdbcType=SMALLINT},
+ #{disabled,jdbcType=TINYINT},
</if>
<if test="deleted != null">
- #{deleted, jdbcType=SMALLINT},
- </if>
- </trim>
- ON DUPLICATE KEY UPDATE
- <trim suffixOverrides="," >
- <if test="id != null" >
- id = #{id, jdbcType=BIGINT},
+ #{deleted,jdbcType=TINYINT},
</if>
</trim>
</insert>
- <update id="updateSelective" parameterType="com.dy.pipIrrGlobal.pojoBa.BaUser" >
- UPDATE ba_user
- <set >
- <if test="name != null" >
- name = #{name, jdbcType=VARCHAR},
+ <update id="updateByPrimaryKeySelective" parameterType="com.dy.pipIrrGlobal.pojoBa.BaUser">
+ update ba_user
+ <set>
+ <if test="name != null">
+ `name` = #{name,jdbcType=VARCHAR},
</if>
- <if test="phone != null" >
- phone = #{phone, jdbcType=VARCHAR},
+ <if test="phone != null">
+ phone = #{phone,jdbcType=VARCHAR},
</if>
- <if test="password != null" >
- phone = #{password, jdbcType=VARCHAR},
+ <if test="password != null">
+ password = #{password,jdbcType=VARCHAR},
+ </if>
+ <if test="disabled != null">
+ disabled = #{disabled,jdbcType=TINYINT},
+ </if>
+ <if test="deleted != null">
+ deleted = #{deleted,jdbcType=TINYINT},
</if>
</set>
- WHERE
- <trim prefixOverrides="and | or">
- <if test="id != null">
- AND id = #{id,jdbcType=BIGINT}
- </if>
- </trim>
+ where id = #{id,jdbcType=BIGINT}
+ </update>
+ <update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoBa.BaUser">
+ update ba_user
+ set `name` = #{name,jdbcType=VARCHAR},
+ phone = #{phone,jdbcType=VARCHAR},
+ password = #{password,jdbcType=VARCHAR},
+ disabled = #{disabled,jdbcType=TINYINT},
+ deleted = #{deleted,jdbcType=TINYINT}
+ where id = #{id,jdbcType=BIGINT}
+ </update>
+ <update id="changePassword" >
+ update ba_user
+ set password = #{password,jdbcType=VARCHAR}
+ where id = #{id,jdbcType=BIGINT}
</update>
- <insert id="batchInsert" parameterType="java.util.List">
- <selectKey resultType="java.lang.Long" keyProperty="id" order="AFTER" id="batchInsert">
- SELECT LAST_INSERT_ID()
- </selectKey>
- INSERT INTO ba_user(id, name, phone, password, orgTag, supperAdmin, disabled, deleted)
- VALUES
- <foreach collection="list" item="it" index="index" separator=",">
- (
- #{it.id, jdbcType=BIGINT},
- #{it.name, jdbcType=VARCHAR},
- #{it.phone, jdbcType=VARCHAR},
- #{it.password, jdbcType=VARCHAR},
- #{it.orgTag, jdbcType=VARCHAR},
- #{it.supperAdmin, jdbcType=SMALLINT},
- #{it.disabled, jdbcType=SMALLINT},
- #{it.deleted, jdbcType=SMALLINT}
- )
- </foreach>
- </insert>
-
- <update id="batchUpdate" parameterType="java.util.List">
- <foreach collection="list" item="it" separator=";">
- UPDATE ba_user
- <set >
- <if test="it.name != null" >
- name = #{it.name, jdbcType=VARCHAR},
- </if>
- <if test="it.phone != null" >
- phone = #{it.phone, jdbcType=VARCHAR},
- </if>
- <if test="it.password != null" >
- phone = #{it.password, jdbcType=VARCHAR},
- </if>
- </set>
- WHERE
- <trim prefixOverrides="and | or">
- <if test="it.id != null">
- AND id = #{it.id,jdbcType=BIGINT}
- </if>
- </trim>
- </foreach>
- </update>
- -->
+ <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+ delete from ba_user
+ where id = #{id,jdbcType=BIGINT}
+ </delete>
+ <delete id="deleteLogicById" parameterType="java.lang.Long">
+ update ba_user set deleted = 1
+ where id = #{id,jdbcType=BIGINT}
+ </delete>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0