sx/map
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

das接口新增

Browse Source
This commit is contained in:
chenhaojie 2024-06-27 16:45:38 +08:00
parent 6fea44df88
commit 979e2b2b28
5 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
das/src/main/java/com/das/modules/auth/domain/dto/ChangePasswordDto.java
View File

@ -10,5 +10,11 @@ public class ChangePasswordDto {
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
private Long id; private Long id;
private String phone;
private String email;
private String userName;
private String newPassword; private String newPassword;
} }

1
das/src/main/java/com/das/modules/auth/mapper/SysUserMapper.java
View File

@ -27,7 +27,6 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
long existUserByAccount(@Param("account") String account); long existUserByAccount(@Param("account") String account);
IPage<SysUserVo> queryUserList(IPage<SysUserVo> page, @Param("sysUser") SysUserQueryDto sysUserQueryDto); IPage<SysUserVo> queryUserList(IPage<SysUserVo> page, @Param("sysUser") SysUserQueryDto sysUserQueryDto);
long existUserByUserName(@Param("userName") String userName);
/** /**
* 根据用户id查询权限列表 * 根据用户id查询权限列表
* @param userId 用户id * @param userId 用户id

12
das/src/main/java/com/das/modules/auth/service/impl/LoginServiceImpl.java
View File

@ -135,15 +135,21 @@ public class LoginServiceImpl implements LoginService {
@Override @Override
public int changePassword(ChangePasswordDto changePasswordDto) { public int changePassword(ChangePasswordDto changePasswordDto) {
if (changePasswordDto.getId() == null || StringUtils.isEmpty(changePasswordDto.getNewPassword())) { if (changePasswordDto.getId() == null) {
throw new ServiceException("非法调用，参数缺失"); throw new ServiceException("非法调用，参数缺失");
} }
String passwordEncode = BCrypt.hashpw(changePasswordDto.getNewPassword(), BCrypt.gensalt());
SysUser sysUser = sysUserMapper.selectById(changePasswordDto.getId()); SysUser sysUser = sysUserMapper.selectById(changePasswordDto.getId());
if (sysUser == null) { if (sysUser == null) {
throw new ServiceException("用户不存在"); throw new ServiceException("用户不存在");
} }
sysUser.setPassword(passwordEncode); String newPassword ="";
if (!StringUtils.isEmpty(changePasswordDto.getNewPassword())) {
newPassword = BCrypt.hashpw(changePasswordDto.getNewPassword(), BCrypt.gensalt());
}
sysUser.setUserName(changePasswordDto.getUserName());
sysUser.setEmail(changePasswordDto.getEmail());
sysUser.setPhone(changePasswordDto.getPhone());
sysUser.setPassword(newPassword);
sysUser.setUpdatedTime(new Date()); sysUser.setUpdatedTime(new Date());
return sysUserMapper.updateById(sysUser); return sysUserMapper.updateById(sysUser);
} }

8
das/src/main/java/com/das/modules/auth/service/impl/SysUserServiceImpl.java
View File

@ -126,13 +126,13 @@ public class SysUserServiceImpl implements SysUserService {
if (sysUser == null) { if (sysUser == null) {
throw new ServiceException(String.format("账号 %d 不存在", sysUserDto.getId())); throw new ServiceException(String.format("账号 %d 不存在", sysUserDto.getId()));
} }
if (StringUtils.hasText(sysUserDto.getUserName())) { if (StringUtils.hasText(sysUserDto.getAccount())) {
//若与数据库中账户名相同 则表示未对名称进行修改 //若与数据库中账户名相同 则表示未对名称进行修改
if (!sysUser.getUserName().equals(sysUserDto.getUserName())) { if (!sysUser.getAccount().equals(sysUserDto.getAccount())) {
//判断账户名是否存在 //判断账户名是否存在
long userCount = sysUserMapper.existUserByUserName(sysUserDto.getUserName()); long userCount = sysUserMapper.existUserByAccount(sysUserDto.getAccount());
if (userCount > 0) { if (userCount > 0) {
throw new ServiceException(String.format("账户名 %s 已存在", sysUserDto.getUserName())); throw new ServiceException(String.format("账户名 %s 已存在", sysUserDto.getAccount()));
} }
} }
} }

4
das/src/main/resources/mapper/SysUserMapper.xml
View File

@ -42,10 +42,6 @@
select count(1) from sys_user t where t.account=#{account} select count(1) from sys_user t where t.account=#{account}
</select> </select>
<select id="existUserByUserName" resultType="java.lang.Long">
select count(1) from sys_user t where t.user_name=#{userName}
</select>
<select id="queryRoleByUserId" resultMap="UserRoleRelationMap"> <select id="queryRoleByUserId" resultMap="UserRoleRelationMap">
select sr.role_code,sr.role_name ,sr.id ,sr.revision from sys_role sr left join sys_r_user_role srur on sr.id = srur.role_id select sr.role_code,sr.role_name ,sr.id ,sr.revision from sys_role sr left join sys_r_user_role srur on sr.id = srur.role_id
where srur.user_id = #{id} where srur.user_id = #{id}