Commit a65b6aae1dd7e087d959c32d139b946fbd54a162

Authored by 黄 x
1 parent d1b6e5dc

feat: 添加用户时,进行手机号码、邮箱、用户名的验证

... ... @@ -145,6 +145,9 @@ public class YtUserController extends BaseController {
145 145 @RequestParam(value = "sendMsg", required = false, defaultValue = "false") boolean sendMsg,
146 146 @Validated({AddGroup.class}) @RequestBody UserDTO userDTO)
147 147 throws ThingsboardException {
  148 +
  149 + //检查用户手机号、邮箱
  150 + userService.validateUserNameAndPhoneNumberAndEmail(userDTO);
148 151 // 如果当前用户是租户管理员,则代表创建的用户为CUSTOMER_USER,则需要调用TB,否则为本平台的管理员不需要调用TB
149 152 boolean isTenantAdminOperator = getCurrentUser().isPtTenantAdmin();
150 153 if (isTenantAdminOperator) {
... ... @@ -234,7 +237,7 @@ public class YtUserController extends BaseController {
234 237 public ResponseResult<UserDTO> accountExist(@PathVariable String username)
235 238 throws ThingsboardException {
236 239 return ResponseResult.success(
237   - userService.accountExist(username,getCurrentUser().getCurrentTenantId()));
  240 + userService.accountExist(username));
238 241 }
239 242
240 243 @ApiOperation(value = "判断电话是否重复")
... ...
... ... @@ -552,12 +552,11 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
552 552 }
553 553
554 554 @Override
555   - public UserDTO accountExist(String userName, String tenantId) {
  555 + public UserDTO accountExist(String userName) {
556 556 if (StringUtils.isEmpty(userName)) {
557 557 throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
558 558 }
559 559 UserDTO userDTO = new UserDTO();
560   - userDTO.setTenantId(tenantId);
561 560 userDTO.setUsername(userName);
562 561 return baseMapper.findUserInfo(userDTO);
563 562 }
... ... @@ -575,7 +574,8 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
575 574 }
576 575 UserDTO userDTO = new UserDTO();
577 576 userDTO.setPhoneNumber(phoneNumber);
578   - return baseMapper.findUserInfoByPhoneNumber(userDTO);
  577 + List<UserDTO> list = baseMapper.findUserInfoByPhoneNumber(userDTO);
  578 + return null !=list && list.size()>0 ? list.get(0):null;
579 579 }
580 580
581 581 @Override
... ...
... ... @@ -32,7 +32,7 @@ public interface UserMapper extends BaseMapper<User> {
32 32
33 33 UserDTO findUserInfo(UserDTO userDTO);
34 34
35   - UserDTO findUserInfoByPhoneNumber(UserDTO userDTO);
  35 + List<UserDTO> findUserInfoByPhoneNumber(UserDTO userDTO);
36 36
37 37 String findUserCustomerIdById(@Param("userId") String userId);
38 38
... ...
... ... @@ -60,7 +60,7 @@ public interface YtUserService {
60 60 * @param username 账号
61 61 * @return 账号信息
62 62 */
63   - UserDTO accountExist(String username, String tenantId);
  63 + UserDTO accountExist(String username);
64 64
65 65 /**
66 66 * 判断电话是否注册过
... ...
... ... @@ -157,7 +157,6 @@
157 157 <include refid="columns"/>
158 158 FROM sys_user su
159 159 WHERE su.username=#{username}
160   - AND su.tenant_id=#{tenantId}
161 160 </select>
162 161 <select id="findUserInfoByPhoneNumber" resultMap="userDTOMap">
163 162 SELECT
... ...