ContiNew/continew-admin
1
1
Fork 0
mirror of https://github.com/continew-org/continew-admin.git synced 2025-10-31 10:57:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: 优化部分方法排序

Browse Source
This commit is contained in:
Charles7c
2024-05-18 19:10:21 +08:00
parent 5f5fee63f8
commit 651cc8ae71
3 changed files with 44 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
continew-admin-system/src/main/java/top/continew/admin/system/service/UserService.java
View File

@@ -25,8 +25,8 @@ import top.continew.admin.system.model.req.UserReq;
import top.continew.admin.system.model.req.UserRoleUpdateReq; import top.continew.admin.system.model.req.UserRoleUpdateReq;
import top.continew.admin.system.model.resp.UserDetailResp; import top.continew.admin.system.model.resp.UserDetailResp;
import top.continew.admin.system.model.resp.UserResp; import top.continew.admin.system.model.resp.UserResp;
import top.continew.starter.extension.crud.service.BaseService;
import top.continew.starter.data.mybatis.plus.service.IService; import top.continew.starter.data.mybatis.plus.service.IService;
import top.continew.starter.extension.crud.service.BaseService;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.List; import java.util.List;
@@ -47,6 +47,22 @@ public interface UserService extends BaseService<UserResp, UserDetailResp, UserQ
*/ */
Long add(UserDO user); Long add(UserDO user);
/**
* 重置密码
*
* @param req 重置信息
* @param id ID
*/
void resetPassword(UserPasswordResetReq req, Long id);
/**
* 修改角色
*
* @param updateReq 修改信息
* @param id ID
*/
void updateRole(UserRoleUpdateReq updateReq, Long id);
/** /**
* 上传头像 * 上传头像
* *
@@ -73,6 +89,14 @@ public interface UserService extends BaseService<UserResp, UserDetailResp, UserQ
*/ */
void updatePassword(String oldPassword, String newPassword, Long id); void updatePassword(String oldPassword, String newPassword, Long id);
/**
* 密码是否已过期
*
* @param pwdResetTime 上次重置密码时间
* @return 是否过期
*/
boolean isPasswordExpired(LocalDateTime pwdResetTime);
/** /**
* 修改手机号 * 修改手机号
* *
@@ -91,22 +115,6 @@ public interface UserService extends BaseService<UserResp, UserDetailResp, UserQ
*/ */
void updateEmail(String newEmail, String oldPassword, Long id); void updateEmail(String newEmail, String oldPassword, Long id);
/**
* 重置密码
*
* @param req 重置信息
* @param id ID
*/
void resetPassword(UserPasswordResetReq req, Long id);
/**
* 修改角色
*
* @param updateReq 修改信息
* @param id ID
*/
void updateRole(UserRoleUpdateReq updateReq, Long id);
/** /**
* 根据用户名查询 * 根据用户名查询
* *
@@ -138,12 +146,4 @@ public interface UserService extends BaseService<UserResp, UserDetailResp, UserQ
* @return 用户数量 * @return 用户数量
*/ */
Long countByDeptIds(List<Long> deptIds); Long countByDeptIds(List<Long> deptIds);
/**
* 密码是否已过期
*
* @param pwdResetTime 上次重置密码时间
* @return 是否过期
*/
boolean isPasswordExpired(LocalDateTime pwdResetTime);
} }

4
continew-admin-system/src/main/java/top/continew/admin/system/service/impl/UserPasswordHistoryServiceImpl.java
View File

@@ -17,6 +17,7 @@
package top.continew.admin.system.service.impl; package top.continew.admin.system.service.impl;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@@ -43,6 +44,9 @@ public class UserPasswordHistoryServiceImpl implements UserPasswordHistoryServic
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void add(Long userId, String password, int count) { public void add(Long userId, String password, int count) {
if (StrUtil.isBlank(password)) {
return;
}
baseMapper.insert(new UserPasswordHistoryDO(userId, password)); baseMapper.insert(new UserPasswordHistoryDO(userId, password));
// 删除过期历史密码 // 删除过期历史密码
baseMapper.deleteExpired(userId, count); baseMapper.deleteExpired(userId, count);

30
continew-admin-system/src/main/java/top/continew/admin/system/service/impl/UserServiceImpl.java
View File

@@ -158,6 +158,21 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, UserDO, UserRes
super.delete(ids); super.delete(ids);
} }
@Override
public void resetPassword(UserPasswordResetReq req, Long id) {
UserDO user = super.getById(id);
user.setPassword(req.getNewPassword());
user.setPwdResetTime(LocalDateTime.now());
baseMapper.updateById(user);
}
@Override
public void updateRole(UserRoleUpdateReq updateReq, Long id) {
super.getById(id);
// 保存用户和角色关联
userRoleService.add(updateReq.getRoleIds(), id);
}
@Override @Override
public String uploadAvatar(MultipartFile avatarFile, Long id) { public String uploadAvatar(MultipartFile avatarFile, Long id) {
String avatarImageType = FileNameUtil.extName(avatarFile.getOriginalFilename()); String avatarImageType = FileNameUtil.extName(avatarFile.getOriginalFilename());
@@ -241,21 +256,6 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, UserDO, UserRes
baseMapper.lambdaUpdate().set(UserDO::getEmail, newEmail).eq(UserDO::getId, id).update(); baseMapper.lambdaUpdate().set(UserDO::getEmail, newEmail).eq(UserDO::getId, id).update();
} }
@Override
public void resetPassword(UserPasswordResetReq req, Long id) {
UserDO user = super.getById(id);
user.setPassword(req.getNewPassword());
user.setPwdResetTime(LocalDateTime.now());
baseMapper.updateById(user);
}
@Override
public void updateRole(UserRoleUpdateReq updateReq, Long id) {
super.getById(id);
// 保存用户和角色关联
userRoleService.add(updateReq.getRoleIds(), id);
}
@Override @Override
public UserDO getByUsername(String username) { public UserDO getByUsername(String username) {
return baseMapper.selectByUsername(username); return baseMapper.selectByUsername(username);