|
@@ -5,6 +5,7 @@ import cn.hutool.core.collection.CollUtil;
|
|
|
import cn.hutool.core.util.BooleanUtil;
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
+import cn.hutool.json.JSONUtil;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
import com.github.yitter.idgen.YitIdHelper;
|
|
@@ -35,6 +36,7 @@ import com.xy.vo.DeviceDetailVO;
|
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
import lombok.AllArgsConstructor;
|
|
|
+import lombok.extern.slf4j.Slf4j;
|
|
|
import org.springframework.validation.annotation.Validated;
|
|
|
import org.springframework.web.bind.annotation.PostMapping;
|
|
|
import org.springframework.web.bind.annotation.RequestBody;
|
|
@@ -58,6 +60,7 @@ import static com.xy.utils.Beans.copy;
|
|
|
@RestMappingController("merc-mini/device")
|
|
|
@AllArgsConstructor
|
|
|
@Api(tags = "小程序-设备")
|
|
|
+@Slf4j
|
|
|
public class MercMiniDeviceController {
|
|
|
|
|
|
/**
|
|
@@ -517,6 +520,7 @@ public class MercMiniDeviceController {
|
|
|
@PostMapping("verificationCode")
|
|
|
@ApiOperation("蓝牙开门-校验并使用授权码")
|
|
|
public R<Boolean> verificationCode(@RequestBody @Validated DeviceBluetoothAuthDto.VerificationCode dto) {
|
|
|
+ log.info("蓝牙开门-校验并使用授权码:" + JSONUtil.toJsonPrettyStr(dto));
|
|
|
String deviceSn = dto.getDeviceSn();
|
|
|
List<DeviceSysinfo> list = deviceSysinfoService.list(Wrappers.<DeviceSysinfo>lambdaQuery().eq(DeviceSysinfo::getDeviceSn, deviceSn).orderByDesc(DeviceSysinfo::getCreateTime));
|
|
|
if (CollUtil.isEmpty(list)) {
|