|
@@ -430,10 +430,11 @@ public class MercMiniDeviceController {
|
|
@ApiOperation("蓝牙开门-生成授权码")
|
|
@ApiOperation("蓝牙开门-生成授权码")
|
|
public R<Boolean> genCode(@RequestBody @Validated DeviceBluetoothAuthDto.GenCode dto) {
|
|
public R<Boolean> genCode(@RequestBody @Validated DeviceBluetoothAuthDto.GenCode dto) {
|
|
String deviceSn = dto.getDeviceSn();
|
|
String deviceSn = dto.getDeviceSn();
|
|
- DeviceSysinfo deviceSysinfo = deviceSysinfoService.getOne(Wrappers.<DeviceSysinfo>lambdaQuery().eq(DeviceSysinfo::getDeviceSn, deviceSn));
|
|
|
|
- if (deviceSysinfo == null) {
|
|
|
|
|
|
+ List<DeviceSysinfo> list = deviceSysinfoService.list(Wrappers.<DeviceSysinfo>lambdaQuery().eq(DeviceSysinfo::getDeviceSn, deviceSn).orderByDesc(DeviceSysinfo::getCreateTime));
|
|
|
|
+ if (CollUtil.isEmpty(list)) {
|
|
return R.fail("设备不存在!");
|
|
return R.fail("设备不存在!");
|
|
}
|
|
}
|
|
|
|
+ DeviceSysinfo deviceSysinfo = list.get(0);
|
|
Long deviceId = deviceSysinfo.getDeviceId();
|
|
Long deviceId = deviceSysinfo.getDeviceId();
|
|
// 用户输入的
|
|
// 用户输入的
|
|
String authCode = dto.getAuthCode();
|
|
String authCode = dto.getAuthCode();
|
|
@@ -472,10 +473,11 @@ public class MercMiniDeviceController {
|
|
@ApiOperation("蓝牙开门-校验并使用授权码")
|
|
@ApiOperation("蓝牙开门-校验并使用授权码")
|
|
public R<Boolean> verificationCode(@RequestBody @Validated DeviceBluetoothAuthDto.VerificationCode dto) {
|
|
public R<Boolean> verificationCode(@RequestBody @Validated DeviceBluetoothAuthDto.VerificationCode dto) {
|
|
String deviceSn = dto.getDeviceSn();
|
|
String deviceSn = dto.getDeviceSn();
|
|
- DeviceSysinfo deviceSysinfo = deviceSysinfoService.getOne(Wrappers.<DeviceSysinfo>lambdaQuery().eq(DeviceSysinfo::getDeviceSn, deviceSn));
|
|
|
|
- if (deviceSysinfo == null) {
|
|
|
|
|
|
+ List<DeviceSysinfo> list = deviceSysinfoService.list(Wrappers.<DeviceSysinfo>lambdaQuery().eq(DeviceSysinfo::getDeviceSn, deviceSn).orderByDesc(DeviceSysinfo::getCreateTime));
|
|
|
|
+ if (CollUtil.isEmpty(list)) {
|
|
return R.fail("设备不存在!");
|
|
return R.fail("设备不存在!");
|
|
}
|
|
}
|
|
|
|
+ DeviceSysinfo deviceSysinfo = list.get(0);
|
|
Long deviceId = deviceSysinfo.getDeviceId();
|
|
Long deviceId = deviceSysinfo.getDeviceId();
|
|
String authCode = dto.getAuthCode();
|
|
String authCode = dto.getAuthCode();
|
|
String cacheAuthCode = getCacheAuthCode(deviceId);
|
|
String cacheAuthCode = getCacheAuthCode(deviceId);
|