From 2f0dcc98caba0ca1f97c7fe346458d0a3fad5c7b Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期三, 29 五月 2024 17:17:21 +0800
Subject: [PATCH] 修改用户模块的一些代码问题 1.全局userId变id 2.修改分页查询SQL 3.修改修改用户信息接口
---
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserCtrl.java | 7
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUser.java | 2
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaUserMapper.java | 2
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml | 242 +++++++++++++++++++++++++++---------------------
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserSv.java | 7
5 files changed, 148 insertions(+), 112 deletions(-)
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 ac420c3..08a4e2f 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
@@ -129,4 +129,6 @@
* @return
*/
List<Map<String, Object>> getRoleNamesByUserId(@Param("userId") Long userId);
+
+ BaUser selectById(Long id);
}
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 1cfbd29..3e31caf 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
@@ -53,7 +53,7 @@
@JSONField(serializeUsing= ObjectWriterImplToString.class)
@TableId(value = "id", type = IdType.INPUT)
@Schema(description = "瀹炰綋id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Long userId;
+ public Long id;
@Schema(description = "鎵�灞炵墖鍖篒D", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
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 f99beee..57cba07 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml
@@ -2,34 +2,36 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<!--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="userId" column="id" />
+ <id property="id" column="id"/>
<result property="blockId" column="blockId"/>
<result property="userName" 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="disabled" typeHandler="com.dy.common.mybatis.envm.EnumCodeTypeHandler" javaType="com.dy.common.mybatis.envm.Disabled"/>
- <result property="deleted" column="deleted" typeHandler="com.dy.common.mybatis.envm.EnumCodeTypeHandler" javaType="com.dy.common.mybatis.envm.Deleted"/>
+ <result property="disabled" column="disabled" typeHandler="com.dy.common.mybatis.envm.EnumCodeTypeHandler"
+ javaType="com.dy.common.mybatis.envm.Disabled"/>
+ <result property="deleted" column="deleted" typeHandler="com.dy.common.mybatis.envm.EnumCodeTypeHandler"
+ javaType="com.dy.common.mybatis.envm.Deleted"/>
</resultMap>
<resultMap id="partResultMap" type="com.dy.pipIrrGlobal.pojoBa.BaUser">
<!--@mbg.generated-->
<!--@Table ba_user-->
- <id property="userId" column="id" />
+ <id property="id" column="id"/>
<result property="userName" 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"/>
+ <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="userId" column="id" />
+ <id property="id" column="id"/>
<result property="blockId" column="blockId"/>
<result property="userName" column="name"/>
<result property="phone" column="phone"/>
@@ -38,89 +40,112 @@
</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" />
+ <collection property="roleList" fetchType="eager" column="{userId=id}"
+ select="com.dy.pipIrrGlobal.daoBa.BaRoleMapper.selectByUserId"/>
</resultMap>
<sql id="Base_Column_List">
- id, blockId, name, phone, password, orgTag, supperAdmin, disabled, deleted
+ id,
+ blockId,
+ name,
+ phone,
+ password,
+ orgTag,
+ supperAdmin,
+ disabled,
+ deleted
</sql>
<sql id="part_Column_List">
- ${alias}.id, ${alias}.name, ${alias}.phone, ${alias}.disabled
+ ${alias}.id,
+ ${alias}.name,
+ ${alias}.phone,
+ ${alias}.disabled
</sql>
<sql id="Login_Column_List">
- id, blockId, name, phone, orgTag, supperAdmin
+ id,
+ blockId,
+ name,
+ phone,
+ orgTag,
+ supperAdmin
</sql>
- <select id="login" resultMap="loginResultMap" >
+ <select id="login" resultMap="loginResultMap">
select
- <include refid="Login_Column_List" />
+ <include refid="Login_Column_List"/>
from ba_user
- where disabled!=1 and deleted!=1 and phone=#{phone} and password=#{password}
+ where disabled!=1 and deleted!=1 and phone=#{phone}
+ and password=#{password}
</select>
<select id="selectTotal" parameterType="java.util.Map" resultType="java.lang.Long">
- select
- count(*)
+ select count(*)
from ba_user
where supperAdmin!=1 and deleted!=1
+
<trim prefix="and" suffixOverrides="and">
<if test="name != null and name != ''">
- name like concat('%', #{name}, '%') and
+ name like concat('%', #{name}
+ , '%')
+ and
</if>
- <if test="phone != null and phone !=''">
+ <if test="phone != null and phone != ''">
phone = #{phone,jdbcType=VARCHAR}
</if>
</trim>
</select>
<select id="selectSome" parameterType="java.util.Map" resultMap="someResultMap">
select
- <include refid="part_Column_List" >
+ <include refid="part_Column_List">
<property name="alias" value="bu"/>
- </include>,
- bb.`name` blockName
+ </include>
+ ,
+ bb.`name` blockName
from ba_user bu
- left join ba_block bb on bu.blockId = bb.id
+ left join ba_block bb on bu.blockId = bb.id
where bu.supperAdmin!=1 and bu.deleted!=1
+
<trim prefix="and" suffixOverrides="and">
<if test="name != null and name != ''">
- bu.name like concat('%', #{name}, '%') and
+ bu.name like concat('%', #{name}
+ , '%')
+ and
</if>
- <if test="phone != null and phone !=''">
+ <if test="phone != null and phone != ''">
bu.phone = #{phone,jdbcType=VARCHAR}
</if>
</trim>
order by id DESC
- <trim prefix="limit " >
+ <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="putin" parameterType="com.dy.pipIrrGlobal.pojoBa.BaUser">
- insert into ba_user (<include refid="Base_Column_List" />)
- values (#{userId,jdbcType=BIGINT},
- #{blockId,jdbcType=BIGINT},
- #{userName,jdbcType=VARCHAR},
- #{phone,jdbcType=VARCHAR},
- #{password,jdbcType=VARCHAR},
- #{orgTag,jdbcType=VARCHAR},
- #{supperAdmin,jdbcType=TINYINT},
- #{disabled,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT},
- #{deleted,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT}
- )
+ insert into ba_user (<include refid="Base_Column_List"/>)
+ values (#{id,jdbcType=BIGINT},
+ #{blockId,jdbcType=BIGINT},
+ #{userName,jdbcType=VARCHAR},
+ #{phone,jdbcType=VARCHAR},
+ #{password,jdbcType=VARCHAR},
+ #{orgTag,jdbcType=VARCHAR},
+ #{supperAdmin,jdbcType=TINYINT},
+ #{disabled,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT},
+ #{deleted,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT})
</insert>
<insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoBa.BaUser">
insert into ba_user
<trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="userId != null">
+ <if test="id != null">
id,
</if>
<if test="blockId != null">
blockId,
</if>
- <if test="userName != null">
+ <if test="userName != null">
`name`,
</if>
<if test="phone != null">
@@ -135,21 +160,21 @@
<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="userId != null">
- #{userId,jdbcType=BIGINT},
+ <if test="id != null">
+ #{id,jdbcType=BIGINT},
</if>
<if test="blockId != null">
#{blockId,jdbcType=BIGINT},
</if>
- <if test="userName != null">
+ <if test="userName != null">
#{userName,jdbcType=VARCHAR},
</if>
<if test="phone != null">
@@ -179,7 +204,7 @@
<if test="blockId != null">
blockId = #{blockId,jdbcType=BIGINT},
</if>
- <if test="userName != null">
+ <if test="userName != null">
`name` = #{userName,jdbcType=VARCHAR},
</if>
<if test="phone != null">
@@ -195,48 +220,50 @@
deleted = #{deleted,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT},
</if>
</set>
- where id = #{userId, jdbcType=BIGINT}
+ where id = #{id, jdbcType=BIGINT}
</update>
<update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoBa.BaUser">
update ba_user
- set blockId = #{blockId,jdbcType=BIGINT},
- `name` = #{userName,jdbcType=VARCHAR},
- phone = #{phone,jdbcType=VARCHAR},
- password = #{password,jdbcType=VARCHAR},
- disabled = #{disabled,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT},
- deleted = #{deleted,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT}
- where id = #{userId,jdbcType=BIGINT}
+ set blockId = #{blockId,jdbcType=BIGINT},
+ `name` = #{userName,jdbcType=VARCHAR},
+ phone = #{phone,jdbcType=VARCHAR},
+ password = #{password,jdbcType=VARCHAR},
+ disabled = #{disabled,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT},
+ deleted = #{deleted,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT}
+ where id = #{id,jdbcType=BIGINT}
</update>
- <update id="changePassword" >
+ <update id="changePassword">
update ba_user
set password = #{password,jdbcType=VARCHAR}
where id = #{id,jdbcType=BIGINT}
</update>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
- delete from ba_user
+ delete
+ from ba_user
where id = #{id,jdbcType=BIGINT}
</delete>
<delete id="deleteLogicById" parameterType="java.lang.Long">
- update ba_user set deleted = 1
+ update ba_user
+ set deleted = 1
where id = #{id,jdbcType=BIGINT}
</delete>
<!--鏍规嵁鐢ㄦ埛缂栧彿鑾峰彇鐢ㄦ埛淇℃伅-->
<!--2024-01-09 搴熷純-->
<select id="getUserInfos" resultType="com.dy.pipIrrGlobal.voBa.VoUserInfo">
- SELECT
- user.id AS userId,
- user.`name` AS userName,
- rol.id AS roleId,
- rol.`name` AS roleName,
- per.permissions
+ SELECT user.id AS userId,
+ user.`name` AS userName,
+ rol.id AS roleId,
+ rol.`name` AS roleName,
+ per.permissions
FROM ba_user user
- INNER JOIN ba_user_role use_rol ON user.id = use_rol.userId
+ INNER JOIN ba_user_role use_rol
+ ON user.id = use_rol.userId
INNER JOIN ba_role rol ON rol.id = use_rol.roleId
INNER JOIN ba_role_permissions per ON per.roleId = rol.id
<where>
- <if test = "userId != null and userId > 0">
+ <if test="userId != null and userId > 0">
AND user.id = ${userId}
</if>
</where>
@@ -244,18 +271,17 @@
<!--鏍规嵁鐢ㄦ埛缂栧彿鑾峰彇鐢ㄦ埛淇℃伅-->
<select id="getUserInfoById" resultType="java.util.Map">
- SELECT
- us.id AS userId,
- us.name AS userName,
- us.phone,
- IFNULL(us.blockId, 0) AS blockId,
- IFNULL(blo.name, 0) AS blockName
+ SELECT us.id AS userId,
+ us.name AS userName,
+ us.phone,
+ IFNULL(us.blockId, 0) AS blockId,
+ IFNULL(blo.name, 0) AS blockName
FROM ba_user us
- LEFT JOIN ba_block blo ON us.blockId = blo.id
+ LEFT JOIN ba_block blo ON us.blockId = blo.id
<where>
AND us.disabled = 0
- AND us.deleted = 0
- <if test = "userId != null and userId > 0">
+ AND us.deleted = 0
+ <if test="userId != null and userId > 0">
AND us.id = ${userId}
</if>
</where>
@@ -263,23 +289,26 @@
<!--鏍规嵁鎸囧畾鐨勬潯浠惰幏鍙栫敤鎴疯褰曟暟-->
<select id="getRecordCount" parameterType="java.util.Map" resultType="java.lang.Long">
- SELECT
- COUNT(*) AS recordCount
+ SELECT COUNT(*) AS recordCount
FROM ba_user user
- INNER JOIN ba_user_role usro ON usro.userId = user.id
+<!-- INNER JOIN ba_user_role usro ON usro.userId = user.id-->
<where>
AND user.supperAdmin != 1
- AND user.deleted = 0
+ AND user.deleted = 0
- <if test = "userName != null and userName !=''">
- AND user.name like CONCAT('%',#{userName},'%')
+ <if test="userName != null and userName != ''">
+ AND user.name like CONCAT('%'
+ , #{userName}
+ , '%')
</if>
- <if test = "phone != null and phone !=''">
- AND user.phone like CONCAT('%',#{phone},'%')
+ <if test="phone != null and phone != ''">
+ AND user.phone like CONCAT('%'
+ , #{phone}
+ , '%')
</if>
- <if test = "roleId != null and roleId > 0">
+ <if test="roleId != null and roleId > 0">
AND usro.roleId = ${roleId}
</if>
</where>
@@ -287,37 +316,36 @@
<!--鏍规嵁鎸囧畾鏉′欢鑾峰彇鐢ㄦ埛鍒楄〃-->
<select id="getUsers" resultType="com.dy.pipIrrGlobal.voBa.VoUserInfo">
- SELECT
- CAST(id AS char) AS userId,
- phone,
- name AS userName,
- disabled AS stateId,
- (CASE
- WHEN disabled = 0 THEN "姝ｅ父"
- WHEN disabled = 1 THEN "宸茬鐢�"
- END) AS stateName,
- CAST(blockId AS char) AS blockId,
- (SELECT name FROM ba_block WHERE id = user.blockId) AS blockName
+ SELECT CAST(user.id AS char) AS userId,
+ user.phone,
+ user.name AS userName,
+ user.disabled AS stateId,
+ (CASE
+ WHEN disabled = 0 THEN "姝ｅ父"
+ WHEN disabled = 1 THEN "宸茬鐢�"
+ END) AS stateName,
+ CAST(user.blockId AS char) AS blockId,
+ (SELECT name FROM ba_block WHERE id = user.blockId) AS blockName
FROM ba_user user
- INNER JOIN ba_user_role usro ON usro.userId = user.id
+<!-- INNER JOIN ba_user_role usro ON usro.userId = user.id-->
<where>
AND user.supperAdmin != 1
- AND user.deleted = 0
+ AND user.deleted = 0
- <if test = "userName != null and userName !=''">
- AND user.name like CONCAT('%',#{userName},'%')
+ <if test="userName != null and userName != ''">
+ AND user.name like CONCAT('%', #{userName}, '%')
</if>
- <if test = "phone != null and phone !=''">
- AND user.phone like CONCAT('%',#{phone},'%')
+ <if test="phone != null and phone != ''">
+ AND user.phone like CONCAT('%', #{phone}, '%')
</if>
- <if test = "roleId != null and roleId > 0">
+ <if test="roleId != null and roleId > 0">
AND usro.roleId = ${roleId}
</if>
</where>
ORDER BY user.id DESC
- <trim prefix="limit " >
+ <trim prefix="limit ">
<if test="start != null and count != null">
#{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
</if>
@@ -326,18 +354,22 @@
<!--鏍规嵁鐢ㄦ埛缂栧彿鑾峰彇瑙掕壊ID鍒楄〃-->
<select id="getRoleIdsByUserId" resultType="java.util.HashMap">
- SELECT
- roleId
+ SELECT roleId
FROM ba_user_role
WHERE userId = ${userId}
</select>
<select id="getRoleNamesByUserId" resultType="java.util.HashMap">
- SELECT
- ro.name AS roleName
+ SELECT ro.name AS roleName
FROM ba_user_role usro
INNER JOIN ba_role ro ON usro.roleId = ro.id
WHERE userId = ${userId}
+ </select>
+ <select id="selectById" resultMap="BaseResultMap">
+ select
+ <include refid="Base_Column_List"/>
+ from ba_user
+ where id = #{id,jdbcType=BIGINT}
</select>
</mapper>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserCtrl.java
index 3604402..2ac39f3 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserCtrl.java
@@ -149,7 +149,7 @@
if (bindingResult != null && bindingResult.hasErrors()) {
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
- po.userId = null;
+ po.id = null;
Long userId;
try {
po.supperAdmin = Constant.no.byteValue() ;
@@ -199,7 +199,7 @@
if (bindingResult != null && bindingResult.hasErrors()) {
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
- if (po.userId == null) {
+ if (po.id == null) {
return BaseResponseUtils.buildFail("鏃犳暟鎹疄浣揑D");
}
int count;
@@ -207,8 +207,9 @@
po.supperAdmin = null;//璁剧疆涓簄ull锛屼笉鍋氭洿鏂�
po.deleted = null;//璁剧疆涓簄ull锛屼笉鍋氭洿鏂�
po.orgTag = null;//璁剧疆涓簄ull锛屼笉鍋氭洿鏂�
+ po.password = MD5.encrypt(po.password);//杩涜鍔犲瘑
count = this.sv.update(po);
- this.sv.setRoles(po.userId, po.roleIds);
+ this.sv.setRoles(po.id, po.roleIds);
} catch (Exception e) {
log.error("淇濆瓨鐢ㄦ埛寮傚父", e);
return BaseResponseUtils.buildException(e.getMessage());
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserSv.java
index 9dce98e..6534304 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserSv.java
@@ -116,7 +116,7 @@
public Long save(BaUser po){
//return this.dao.putin(po) ;
this.dao.putin(po) ;
- return po.getUserId();
+ return po.getId();
}
/**
@@ -166,14 +166,15 @@
* @return 鎻掑叆鐢ㄦ埛涓庤鑹插叧鑱旇褰曟暟閲�
*/
public int setRoles(Long userId, String[] roleIds) {
- this.urDao.deleteByUserId(userId);
+
int count = 0;
if (roleIds != null && roleIds.length > 0) {
+ this.urDao.deleteByUserId(userId);
for (String roleId : roleIds) {
count += this.urDao.insertSelective(new BaUserRole(userId, Long.parseLong(roleId)));
}
}
- return count;
+ return 1;
}
/**
--
Gitblit v1.8.0