diff --git a/src/main/java/com/iflytop/sgs/app/cmd/debug/DebugBeeCloseCommand.java b/src/main/java/com/iflytop/sgs/app/cmd/debug/DebugBeeCloseCommand.java index af9530f..33d28bb 100644 --- a/src/main/java/com/iflytop/sgs/app/cmd/debug/DebugBeeCloseCommand.java +++ b/src/main/java/com/iflytop/sgs/app/cmd/debug/DebugBeeCloseCommand.java @@ -20,7 +20,7 @@ import java.util.concurrent.CompletableFuture; @Slf4j @Component @RequiredArgsConstructor -@CommandDebugMapping("door_close") +@CommandDebugMapping("bee_close") public class DebugBeeCloseCommand extends BaseCommandHandler { private final DeviceCommandService deviceCommandService; diff --git a/src/main/java/com/iflytop/sgs/app/cmd/debug/DebugBeeOpenCommand.java b/src/main/java/com/iflytop/sgs/app/cmd/debug/DebugBeeOpenCommand.java index f27ddff..7546441 100644 --- a/src/main/java/com/iflytop/sgs/app/cmd/debug/DebugBeeOpenCommand.java +++ b/src/main/java/com/iflytop/sgs/app/cmd/debug/DebugBeeOpenCommand.java @@ -20,7 +20,7 @@ import java.util.concurrent.CompletableFuture; @Slf4j @Component @RequiredArgsConstructor -@CommandDebugMapping("door_close") +@CommandDebugMapping("bee_open") public class DebugBeeOpenCommand extends BaseCommandHandler { private final DeviceCommandService deviceCommandService; diff --git a/src/main/java/com/iflytop/sgs/common/cmd/DeviceCommandGenerator.java b/src/main/java/com/iflytop/sgs/common/cmd/DeviceCommandGenerator.java index 2ff885c..53c1154 100644 --- a/src/main/java/com/iflytop/sgs/common/cmd/DeviceCommandGenerator.java +++ b/src/main/java/com/iflytop/sgs/common/cmd/DeviceCommandGenerator.java @@ -1,10 +1,7 @@ package com.iflytop.sgs.common.cmd; -import com.iflytop.sgs.common.enums.cmd.CmdAction; -import com.iflytop.sgs.common.enums.cmd.CmdColor; -import com.iflytop.sgs.common.enums.cmd.CmdDevice; -import com.iflytop.sgs.common.enums.cmd.CmdDirection; +import com.iflytop.sgs.common.enums.cmd.*; /** * 生成给设备发送的指令 @@ -560,7 +557,7 @@ public class DeviceCommandGenerator { */ public static DeviceCommandBundle beepOpen(String mode) { DeviceCommandParams params = new DeviceCommandParams(); - params.setMode(mode); + params.setBeepMode(CmdBeepMode.valueOf(mode)); return controlCmd(CmdDevice.beep, CmdAction.open, null, "蜂鸣器 开启"); }