forked from dyf/fys-Multi-tenant
绑定蓝牙问题解决
This commit is contained in:
@ -18,14 +18,14 @@ public class PasswordLoginBody extends LoginBody {
|
|||||||
* 用户名
|
* 用户名
|
||||||
*/
|
*/
|
||||||
@NotBlank(message = "{user.username.not.blank}")
|
@NotBlank(message = "{user.username.not.blank}")
|
||||||
@Length(min = 2, max = 30, message = "{user.username.length.valid}")
|
// @Length(min = 2, max = 30, message = "{user.username.length.valid}")
|
||||||
private String username;
|
private String username;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 用户密码
|
* 用户密码
|
||||||
*/
|
*/
|
||||||
@NotBlank(message = "{user.password.not.blank}")
|
@NotBlank(message = "{user.password.not.blank}")
|
||||||
@Length(min = 5, max = 30, message = "{user.password.length.valid}")
|
// @Length(min = 5, max = 30, message = "{user.password.length.valid}")
|
||||||
private String password;
|
private String password;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -163,6 +163,10 @@ public class AppUserServiceImpl implements IAppUserService {
|
|||||||
appUserVo.setNickName(user.getNickName());
|
appUserVo.setNickName(user.getNickName());
|
||||||
appUserVo.setGender(user.getSex());
|
appUserVo.setGender(user.getSex());
|
||||||
appUserVo.setPhone(user.getPhonenumber());
|
appUserVo.setPhone(user.getPhonenumber());
|
||||||
|
SysOssVo oss = sysOssService.getById(user.getAvatar());
|
||||||
|
if(oss != null){
|
||||||
|
appUserVo.setAvatarPath(oss.getUrl());
|
||||||
|
}
|
||||||
return appUserVo;
|
return appUserVo;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -547,7 +547,7 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impleme
|
|||||||
deviceUpdateWrapper.eq("id", device.getId())
|
deviceUpdateWrapper.eq("id", device.getId())
|
||||||
.set("binding_status", BindingStatusEnum.BOUND.getCode())
|
.set("binding_status", BindingStatusEnum.BOUND.getCode())
|
||||||
.set("binding_user_id", userId);
|
.set("binding_user_id", userId);
|
||||||
return baseMapper.update(null, qw);
|
return baseMapper.update(null, deviceUpdateWrapper);
|
||||||
} else {
|
} else {
|
||||||
throw new RuntimeException("通讯方式错误");
|
throw new RuntimeException("通讯方式错误");
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user