代码调整

This commit is contained in:
2023-06-15 16:01:50 +08:00
parent d9468d2c5e
commit 4350a2c342
22 changed files with 720 additions and 42 deletions

View File

@@ -80,6 +80,24 @@ public class UserController extends BaseController {
}
}
@OperateInfo
@ApiIgnore
@GetMapping("/getUserByPhone/{phone}")
@ApiOperation("根据手机号查询用户信息")
@ApiImplicitParam(name = "phone", value = "手机号", required = true)
public HttpResult<UserDTO> getUserByPhone(@PathVariable String phone) {
RequestUtil.saveLoginName(phone);
String methodDescribe = getMethodDescribe("getUserByPhone");
LogUtil.njcnDebug(log, "{},手机号为:{}", methodDescribe, phone);
UserDTO user = userService.loadUserByPhone(phone);
if (Objects.isNull(user)) {
throw new BusinessException(UserResponseEnum.LOGIN_PHONE_NOT_REGISTER);
} else {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, user, methodDescribe);
}
}
@OperateInfo
@GetMapping("/judgeUserStatus/{loginName}")
@ApiOperation("认证后根据用户名判断用户状态")

View File

@@ -27,6 +27,14 @@ public interface IUserService extends IService<User> {
*/
UserDTO getUserByName(String loginName);
/**
* 根据手机号查询用户信息
*
* @param phone 登录名
* @return 用户基本信息
*/
UserDTO loadUserByPhone(String phone);
/**
* 认证结束后,判断用户状态是否能正常访问系统
* @param loginName 登录名
@@ -160,4 +168,6 @@ public interface IUserService extends IService<User> {
String exportUser(UserParam.UserQueryParam queryParam,String methodDescribe);
boolean activateUser(String id);
}

View File

@@ -98,6 +98,17 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
return new UserDTO(user.getId(), user.getLoginName(), user.getName(), user.getPassword(), roleNames, userSet.getSecretKey(), userSet.getStandBy(), user.getDeptId(), user.getType());
}
@Override
public UserDTO loadUserByPhone(String phone) {
User user = getUserByPhone(phone,false,null);
if (Objects.isNull(user)) {
return null;
}
List<String> roleNames = roleService.getRoleNameByUserId(user.getId());
UserSet userSet = userSetService.lambdaQuery().eq(UserSet::getUserId, user.getId()).one();
return new UserDTO(user.getId(), user.getLoginName(), user.getName(), user.getPassword(), roleNames, userSet.getSecretKey(), userSet.getStandBy(), user.getDeptId(), user.getType());
}
@Override
public void judgeUserStatus(String loginName) {
User user = getUserByLoginName(loginName);