refactor(system): 移除 me 接口中的操作日志注解
移除了 UserController 类中 me 方法的 @OperationLogAnnotation 注解,该注解用于记录操作类型为"登录"的日志。此次修改可能是为了优化日志记录策略或调整性能。
This commit is contained in:
parent
f7e9e60a50
commit
c6e1dbb37b
@ -10,10 +10,9 @@ import lombok.Getter;
|
|||||||
|
|
||||||
@Getter
|
@Getter
|
||||||
public enum FunctionTypeEnum implements IEnum<String>, IState<FunctionTypeEnum> {
|
public enum FunctionTypeEnum implements IEnum<String>, IState<FunctionTypeEnum> {
|
||||||
save("save", "save"),
|
create("create", "create"),
|
||||||
update("update", "update"),
|
update("update", "update"),
|
||||||
delete("delete", "delete"),
|
delete("delete", "delete"),
|
||||||
query("query", "query"),
|
|
||||||
other("other", "other");
|
other("other", "other");
|
||||||
|
|
||||||
private final String code;
|
private final String code;
|
||||||
|
@ -15,7 +15,7 @@ public @interface OperationLogAnnotation {
|
|||||||
String content() default "";
|
String content() default "";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 操作类型,例如:SAVE, UPDATE, DELETE, QUERY
|
* 操作类型,例如:SAVE, UPDATE, DELETE
|
||||||
*/
|
*/
|
||||||
String operationType() default "";
|
String operationType() default "";
|
||||||
}
|
}
|
||||||
|
@ -21,6 +21,7 @@ import org.springframework.beans.BeanUtils;
|
|||||||
import org.springframework.security.core.context.SecurityContextHolder;
|
import org.springframework.security.core.context.SecurityContextHolder;
|
||||||
import org.springframework.security.crypto.password.PasswordEncoder;
|
import org.springframework.security.crypto.password.PasswordEncoder;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
@ -40,21 +41,26 @@ import java.util.stream.Collectors;
|
|||||||
public class UserServiceImpl extends ServiceImpl<UserRepository, User> implements UserService {
|
public class UserServiceImpl extends ServiceImpl<UserRepository, User> implements UserService {
|
||||||
|
|
||||||
private final PasswordEncoder passwordEncoder;
|
private final PasswordEncoder passwordEncoder;
|
||||||
private final RoleServiceImpl roleService;
|
|
||||||
private final DeptServiceImpl deptService;
|
|
||||||
private final sendMail send;
|
private final sendMail send;
|
||||||
private final UserMapper userMapper;
|
private final UserMapper userMapper;
|
||||||
private final RoleRepository roleRepository;
|
private final RoleRepository roleRepository;
|
||||||
private final RoleMenuRepository RoleMenuRepository;
|
|
||||||
private final RoleMenuRepository roleMenuRepository;
|
|
||||||
private final MenuRepository menuRepository;
|
private final MenuRepository menuRepository;
|
||||||
private final UserRolesRepository userRolesRepository;
|
private final UserRolesRepository userRolesRepository;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@Transactional
|
||||||
public Boolean create(UserCreateDto dto) {
|
public Boolean create(UserCreateDto dto) {
|
||||||
User user = new User();
|
User user = new User();
|
||||||
dto.setRoleId(dto.getRoleIds().get(0));
|
dto.setRoleId(dto.getRoleIds().get(0));
|
||||||
userMapper.convert(dto, user);
|
userMapper.convert(dto, user);
|
||||||
|
boolean existsByPhone = count(new LambdaQueryWrapper<User>().eq(User::getPhone, dto.getPhone())) > 0;
|
||||||
|
boolean existsByEmail = count(new LambdaQueryWrapper<User>().eq(User::getEmail, dto.getEmail())) > 0;
|
||||||
|
if (user.getPhone().equals(dto.getPhone()) && existsByPhone) {
|
||||||
|
throw new ConstraintException("phone", dto.phone, "手机号已存在");
|
||||||
|
}
|
||||||
|
if (user.getEmail().equals(dto.getEmail()) && existsByEmail) {
|
||||||
|
throw new ConstraintException("email", dto.email, "邮箱地址已存在");
|
||||||
|
}
|
||||||
boolean saveSuccess = save(user);
|
boolean saveSuccess = save(user);
|
||||||
if (!saveSuccess) {
|
if (!saveSuccess) {
|
||||||
return false;
|
return false;
|
||||||
@ -65,16 +71,9 @@ public class UserServiceImpl extends ServiceImpl<UserRepository, User> implement
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
|
@Transactional
|
||||||
public Boolean update(UserUpdateDto dto, Long id) {
|
public Boolean update(UserUpdateDto dto, Long id) {
|
||||||
User user = getById(id);
|
User user = getById(id);
|
||||||
boolean existsByPhone = count(new LambdaQueryWrapper<User>().eq(User::getPhone, dto.getPhone())) > 0;
|
|
||||||
boolean existsByEmail = count(new LambdaQueryWrapper<User>().eq(User::getEmail, dto.getEmail())) > 0;
|
|
||||||
if (user.getPhone().equals(dto.getPhone()) && existsByPhone) {
|
|
||||||
throw new ConstraintException("phone", dto.phone, "手机号已存在");
|
|
||||||
}
|
|
||||||
if (user.getEmail().equals(dto.getEmail()) && existsByEmail) {
|
|
||||||
throw new ConstraintException("email", dto.email, "邮箱地址已存在");
|
|
||||||
}
|
|
||||||
if (dto.getRoleIds() != null && !dto.getRoleIds().isEmpty()) {
|
if (dto.getRoleIds() != null && !dto.getRoleIds().isEmpty()) {
|
||||||
userRolesRepository.delete(new LambdaQueryWrapper<UserRole>().eq(UserRole::getUserId, id));
|
userRolesRepository.delete(new LambdaQueryWrapper<UserRole>().eq(UserRole::getUserId, id));
|
||||||
dto.setRoleId(dto.getRoleIds().get(0));
|
dto.setRoleId(dto.getRoleIds().get(0));
|
||||||
@ -85,6 +84,7 @@ public class UserServiceImpl extends ServiceImpl<UserRepository, User> implement
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@Transactional
|
||||||
public Boolean updatePassword(String password, Long id) {
|
public Boolean updatePassword(String password, Long id) {
|
||||||
User user = getById(id);
|
User user = getById(id);
|
||||||
user.setPassword(passwordEncoder.encode(password));
|
user.setPassword(passwordEncoder.encode(password));
|
||||||
@ -92,6 +92,7 @@ public class UserServiceImpl extends ServiceImpl<UserRepository, User> implement
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@Transactional
|
||||||
public Boolean toggle(Long id) {
|
public Boolean toggle(Long id) {
|
||||||
User user = getById(id);
|
User user = getById(id);
|
||||||
user.setEnableState(!user.getEnableState());
|
user.setEnableState(!user.getEnableState());
|
||||||
@ -111,6 +112,7 @@ public class UserServiceImpl extends ServiceImpl<UserRepository, User> implement
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@Transactional
|
||||||
public Boolean selfUpdate(UserDetailsImpl userDetails, UserSelfUpdateDto dto) {
|
public Boolean selfUpdate(UserDetailsImpl userDetails, UserSelfUpdateDto dto) {
|
||||||
User user = getById(userDetails.getId());
|
User user = getById(userDetails.getId());
|
||||||
boolean existsByPhone = count(new LambdaQueryWrapper<User>().ne(User::getId, userDetails.getId()).eq(User::getPhone, dto.getPhone())) > 0;
|
boolean existsByPhone = count(new LambdaQueryWrapper<User>().ne(User::getId, userDetails.getId()).eq(User::getPhone, dto.getPhone())) > 0;
|
||||||
@ -127,6 +129,7 @@ public class UserServiceImpl extends ServiceImpl<UserRepository, User> implement
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@Transactional
|
||||||
public Boolean selfUpdatePassword(UserDetailsImpl userDetails, UserSelfUpdatePasswordDto dto) {
|
public Boolean selfUpdatePassword(UserDetailsImpl userDetails, UserSelfUpdatePasswordDto dto) {
|
||||||
User user = getById(userDetails.getId());
|
User user = getById(userDetails.getId());
|
||||||
if (!passwordEncoder.matches(dto.oldPassword, user.password)) {
|
if (!passwordEncoder.matches(dto.oldPassword, user.password)) {
|
||||||
@ -137,6 +140,7 @@ public class UserServiceImpl extends ServiceImpl<UserRepository, User> implement
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@Transactional
|
||||||
public UserDetailsImpl switchRole(Long roleId) {
|
public UserDetailsImpl switchRole(Long roleId) {
|
||||||
Role role = roleRepository.selectById(roleId);
|
Role role = roleRepository.selectById(roleId);
|
||||||
if (role == null) {
|
if (role == null) {
|
||||||
|
Loading…
Reference in New Issue
Block a user