From 5f2374e96dd07b18295322eac5076dabc435207e Mon Sep 17 00:00:00 2001 From: chenhaojie Date: Fri, 28 Jun 2024 10:09:30 +0800 Subject: [PATCH 1/7] =?UTF-8?q?das=E6=8E=A5=E5=8F=A3=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/controller/SysUserController.java | 11 +++ .../auth/domain/dto/ChangePasswordDto.java | 6 +- .../modules/auth/domain/dto/SysUserDto.java | 84 +++++++++---------- .../modules/auth/service/SysUserService.java | 2 + .../auth/service/impl/LoginServiceImpl.java | 7 +- .../auth/service/impl/SysRoleServiceImpl.java | 9 +- .../auth/service/impl/SysUserServiceImpl.java | 17 ++++ .../main/resources/mapper/SysMenuMapper.xml | 2 +- 8 files changed, 82 insertions(+), 56 deletions(-) diff --git a/das/src/main/java/com/das/modules/auth/controller/SysUserController.java b/das/src/main/java/com/das/modules/auth/controller/SysUserController.java index 1439c2dd..51a6e074 100644 --- a/das/src/main/java/com/das/modules/auth/controller/SysUserController.java +++ b/das/src/main/java/com/das/modules/auth/controller/SysUserController.java @@ -79,4 +79,15 @@ public class SysUserController { public PageDataInfo queryUserList(@RequestBody SysUserQueryDto sysUserQueryDto, PageQuery pageQuery) { return sysUserService.queryUserList(sysUserQueryDto, pageQuery); } + + + /** + * 用户信息修改接口 + * @return 结果提示信息 + */ + @PostMapping("/updateById") + public R updateUserById(@RequestBody SysUserDto sysUserDto) { + sysUserService.updateUserById(sysUserDto); + return R.success(); + } } diff --git a/das/src/main/java/com/das/modules/auth/domain/dto/ChangePasswordDto.java b/das/src/main/java/com/das/modules/auth/domain/dto/ChangePasswordDto.java index 7a205b05..d33e8dd5 100644 --- a/das/src/main/java/com/das/modules/auth/domain/dto/ChangePasswordDto.java +++ b/das/src/main/java/com/das/modules/auth/domain/dto/ChangePasswordDto.java @@ -10,11 +10,7 @@ public class ChangePasswordDto { @JsonSerialize(using = ToStringSerializer.class) private Long id; - private String phone; - - private String email; - - private String userName; + private String oldPassword; private String newPassword; } diff --git a/das/src/main/java/com/das/modules/auth/domain/dto/SysUserDto.java b/das/src/main/java/com/das/modules/auth/domain/dto/SysUserDto.java index 305c5588..25f2ec74 100644 --- a/das/src/main/java/com/das/modules/auth/domain/dto/SysUserDto.java +++ b/das/src/main/java/com/das/modules/auth/domain/dto/SysUserDto.java @@ -10,46 +10,46 @@ import java.util.List; @Data public class SysUserDto implements Serializable { - /** - * 角色ID - */ - @JsonSerialize(using = ToStringSerializer.class) - private Long id; - /** - * 账号 - */ - private String account; - /** - * 密码 - */ - private String password; - /** - * 职员名称 - */ - private String userName; - /** - * 职员邮箱 - */ - private String email; - /** - * 手机号 - */ - private String phone; - /** - * 所属机构id - */ - @JsonSerialize(using = ToStringSerializer.class) - private Long orgId; - /** - * 最后登录时间 - */ - private Date lastLogin; - /** - * 乐观锁 - */ - private Integer revision; - /** - * 角色列表 - */ - private List roleList; + /** + * 角色ID + */ + @JsonSerialize(using = ToStringSerializer.class) + private Long id; + /** + * 账号 + */ + private String account; + /** + * 密码 + */ + private String password; + /** + * 职员名称 + */ + private String userName; + /** + * 职员邮箱 + */ + private String email; + /** + * 手机号 + */ + private String phone; + /** + * 所属机构id + */ + @JsonSerialize(using = ToStringSerializer.class) + private Long orgId; + /** + * 最后登录时间 + */ + private Date lastLogin; + /** + * 乐观锁 + */ + private Integer revision; + /** + * 角色列表 + */ + private List roleList; } diff --git a/das/src/main/java/com/das/modules/auth/service/SysUserService.java b/das/src/main/java/com/das/modules/auth/service/SysUserService.java index 1ad89b85..d0c1985c 100644 --- a/das/src/main/java/com/das/modules/auth/service/SysUserService.java +++ b/das/src/main/java/com/das/modules/auth/service/SysUserService.java @@ -12,6 +12,8 @@ public interface SysUserService { SysUserDto updateUser(SysUserDto sysUserDto); + SysUserDto updateUserById(SysUserDto sysUserDto); + void deleteUser(DeleteDto deleteDto); PageDataInfo queryUserList(SysUserQueryDto sysUserQueryDto, PageQuery pageQuery); diff --git a/das/src/main/java/com/das/modules/auth/service/impl/LoginServiceImpl.java b/das/src/main/java/com/das/modules/auth/service/impl/LoginServiceImpl.java index a57d6230..4cdc799b 100644 --- a/das/src/main/java/com/das/modules/auth/service/impl/LoginServiceImpl.java +++ b/das/src/main/java/com/das/modules/auth/service/impl/LoginServiceImpl.java @@ -142,14 +142,15 @@ public class LoginServiceImpl implements LoginService { if (sysUser == null) { throw new ServiceException("用户不存在"); } + if (!BCrypt.checkpw(changePasswordDto.getOldPassword(), sysUser.getPassword())) { + throw new ServiceException("原密码不正确"); + } String newPassword =""; if (!StringUtils.isEmpty(changePasswordDto.getNewPassword())) { newPassword = BCrypt.hashpw(changePasswordDto.getNewPassword(), BCrypt.gensalt()); sysUser.setPassword(newPassword); } - sysUser.setUserName(changePasswordDto.getUserName()); - sysUser.setEmail(changePasswordDto.getEmail()); - sysUser.setPhone(changePasswordDto.getPhone()); + sysUser.setUpdatedBy(sysUser.getAccount()); sysUser.setUpdatedTime(new Date()); return sysUserMapper.updateById(sysUser); } diff --git a/das/src/main/java/com/das/modules/auth/service/impl/SysRoleServiceImpl.java b/das/src/main/java/com/das/modules/auth/service/impl/SysRoleServiceImpl.java index ce2c2b9c..8416d817 100644 --- a/das/src/main/java/com/das/modules/auth/service/impl/SysRoleServiceImpl.java +++ b/das/src/main/java/com/das/modules/auth/service/impl/SysRoleServiceImpl.java @@ -112,17 +112,16 @@ public class SysRoleServiceImpl implements SysRoleService { @Override public SysRoleDto updateRole(SysRoleDto sysRoleDto) { - SysRole sysRole = new SysRole(); if (StringUtils.isEmpty(sysRoleDto.getId())) { throw new ServiceException("参数缺失"); } - SysRole role = sysRoleMapper.selectByCode(sysRoleDto.getRoleCode()); - if (role == null) { - throw new ServiceException(String.format("角色 %s 不存在", sysRoleDto.getRoleCode())); + SysRole sysRole = sysRoleMapper.selectById(sysRoleDto.getId()); + if (sysRole == null) { + throw new ServiceException(String.format("角色 %s 不存在", sysRoleDto.getId())); } if (StringUtils.hasText(sysRoleDto.getRoleName())) { //若与数据库中角色名相同 则表示未对名称进行修改 - if (!role.getRoleName().equals(sysRoleDto.getRoleName())) { + if (!sysRole.getRoleName().equals(sysRoleDto.getRoleName())) { //判断角色名是否存在 long roleCount = sysRoleMapper.existRoleByName(sysRoleDto.getRoleName()); if (roleCount > 0) { diff --git a/das/src/main/java/com/das/modules/auth/service/impl/SysUserServiceImpl.java b/das/src/main/java/com/das/modules/auth/service/impl/SysUserServiceImpl.java index db417b57..21758eae 100644 --- a/das/src/main/java/com/das/modules/auth/service/impl/SysUserServiceImpl.java +++ b/das/src/main/java/com/das/modules/auth/service/impl/SysUserServiceImpl.java @@ -166,6 +166,23 @@ public class SysUserServiceImpl implements SysUserService { return sysUserDto; } + @Override + public SysUserDto updateUserById(SysUserDto sysUserDto) { + SysUser sysUser = new SysUser(); + if (sysUserDto.getId() == null) { + throw new ServiceException("参数缺失"); + } + SysUser oldSysUser = sysUserMapper.selectById(sysUserDto.getId()); + sysUser.setId(sysUserDto.getId()); + sysUser.setUpdatedTime(new Date()); + sysUser.setUserName(sysUserDto.getUserName()); + sysUser.setEmail(sysUserDto.getEmail()); + sysUser.setPhone(sysUserDto.getPhone()); + sysUser.setUpdatedBy(oldSysUser.getAccount()); + sysUserMapper.updateById(sysUser); + return sysUserDto; + } + @Override public void deleteUser(DeleteDto deleteDto) { if (StringUtils.isEmpty(deleteDto.getId())) { diff --git a/das/src/main/resources/mapper/SysMenuMapper.xml b/das/src/main/resources/mapper/SysMenuMapper.xml index ee5d7cea..1c4f73d0 100644 --- a/das/src/main/resources/mapper/SysMenuMapper.xml +++ b/das/src/main/resources/mapper/SysMenuMapper.xml @@ -57,7 +57,7 @@