蓝牙开门-平台管理员生成授权码（通用码）

device-api-service-merc-mini/src/main/java/com/xy/controller/MercMiniDeviceController.java

@@ -472,7 +472,7 @@ public class MercMiniDeviceController {
 
     @PostMapping("genCodeByAdmin")
     @ApiOperation("蓝牙开门-平台管理员生成授权码（通用码）")
-    public R<Boolean> genCodeByAdmin(@RequestBody @Validated DeviceBluetoothAuthDto.GenCodeByAdmin dto) {
+    public R<Long> genCodeByAdmin(@RequestBody @Validated DeviceBluetoothAuthDto.GenCodeByAdmin dto) {
 
         long deviceId = YitIdHelper.nextId();
 
@@ -482,7 +482,8 @@ public class MercMiniDeviceController {
                 .setDeviceId(deviceId)
                 .setMercId(0L)
                 .setDeviceId(deviceId).setAuthCode(String.valueOf(deviceId));
-        return R.ok(deviceBluetoothAuthService.save(saveInfo));
+        deviceBluetoothAuthService.save(saveInfo);
+        return R.ok(deviceId);
     }
 
     @PostMapping("verificationBlueCode")

device-api/src/main/java/com/xy/dto/DeviceBluetoothAuthDto.java

@@ -52,10 +52,6 @@ public class DeviceBluetoothAuthDto {
     @Data
     @Accessors(chain = true)
     public static class GenCodeByAdmin {
-        @NotNull(message = "商户ID不可为空")
-        @ApiModelProperty(value = "商户ID")
-        private Long mercId;
-
 
 
     }