From af104024b067c71300c39915240bd03e249bac4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=A2=A6=E8=BF=9C?= <1063331231@qq.com> Date: Mon, 26 May 2025 09:53:33 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BD=BF=E8=83=BD=20=E5=A4=B1=E8=83=BD=20?= =?UTF-8?q?=E5=81=9C=E6=AD=A2=E8=BD=AC=E7=A7=BB=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cmd/debug/DebugDisabledAllMotorCommand.java | 31 ++++++++++++++++++++++ .../app/cmd/debug/DebugEnableAllMotorCommand.java | 31 ++++++++++++++++++++++ .../app/cmd/debug/DebugStopAllMotorCommand.java | 30 +++++++++++++++++++++ .../debug/step/DebugDisabledAllMotorCommand.java | 31 ---------------------- .../cmd/debug/step/DebugEnableAllMotorCommand.java | 31 ---------------------- .../cmd/debug/step/DebugStopAllMotorCommand.java | 30 --------------------- .../sgs/common/cmd/DeviceCommandGenerator.java | 5 +++- 7 files changed, 96 insertions(+), 93 deletions(-) create mode 100644 src/main/java/com/iflytop/sgs/app/cmd/debug/DebugDisabledAllMotorCommand.java create mode 100644 src/main/java/com/iflytop/sgs/app/cmd/debug/DebugEnableAllMotorCommand.java create mode 100644 src/main/java/com/iflytop/sgs/app/cmd/debug/DebugStopAllMotorCommand.java delete mode 100644 src/main/java/com/iflytop/sgs/app/cmd/debug/step/DebugDisabledAllMotorCommand.java delete mode 100644 src/main/java/com/iflytop/sgs/app/cmd/debug/step/DebugEnableAllMotorCommand.java delete mode 100644 src/main/java/com/iflytop/sgs/app/cmd/debug/step/DebugStopAllMotorCommand.java diff --git a/src/main/java/com/iflytop/sgs/app/cmd/debug/DebugDisabledAllMotorCommand.java b/src/main/java/com/iflytop/sgs/app/cmd/debug/DebugDisabledAllMotorCommand.java new file mode 100644 index 0000000..e1e102b --- /dev/null +++ b/src/main/java/com/iflytop/sgs/app/cmd/debug/DebugDisabledAllMotorCommand.java @@ -0,0 +1,31 @@ +package com.iflytop.sgs.app.cmd.debug.step; + +import com.iflytop.sgs.app.core.BaseCommandHandler; +import com.iflytop.sgs.app.model.dto.CmdDTO; +import com.iflytop.sgs.app.service.device.StepCommandService; +import com.iflytop.sgs.common.annotation.CommandMapping; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +import java.util.concurrent.CompletableFuture; + +/** + * 失能所有电机 + */ +@Slf4j +@Component +@RequiredArgsConstructor +@CommandMapping("debug_disabled_all_motor") +public class DebugDisabledAllMotorCommand extends BaseCommandHandler { + private final StepCommandService stepCommandService; + + @Override + public CompletableFuture handle(CmdDTO cmdDTO) throws Exception { + + return runAsync(() -> { + //stepCommandService.disabilityAll(); + }); + } +} + diff --git a/src/main/java/com/iflytop/sgs/app/cmd/debug/DebugEnableAllMotorCommand.java b/src/main/java/com/iflytop/sgs/app/cmd/debug/DebugEnableAllMotorCommand.java new file mode 100644 index 0000000..5b37cff --- /dev/null +++ b/src/main/java/com/iflytop/sgs/app/cmd/debug/DebugEnableAllMotorCommand.java @@ -0,0 +1,31 @@ +package com.iflytop.sgs.app.cmd.debug.step; + +import com.iflytop.sgs.app.core.BaseCommandHandler; +import com.iflytop.sgs.app.model.dto.CmdDTO; +import com.iflytop.sgs.app.service.device.StepCommandService; +import com.iflytop.sgs.common.annotation.CommandMapping; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +import java.util.concurrent.CompletableFuture; + +/** + * 使能所有电机 + */ +@Slf4j +@Component +@RequiredArgsConstructor +@CommandMapping("debug_enable_all_motor") +public class DebugEnableAllMotorCommand extends BaseCommandHandler { + private final StepCommandService stepCommandService; + + @Override + public CompletableFuture handle(CmdDTO cmdDTO) throws Exception { + + return runAsync(() -> { + //stepCommandService.enableAll(); + }); + } +} + diff --git a/src/main/java/com/iflytop/sgs/app/cmd/debug/DebugStopAllMotorCommand.java b/src/main/java/com/iflytop/sgs/app/cmd/debug/DebugStopAllMotorCommand.java new file mode 100644 index 0000000..efcf4b6 --- /dev/null +++ b/src/main/java/com/iflytop/sgs/app/cmd/debug/DebugStopAllMotorCommand.java @@ -0,0 +1,30 @@ +package com.iflytop.sgs.app.cmd.debug.step; + +import com.iflytop.sgs.app.core.BaseCommandHandler; +import com.iflytop.sgs.app.model.dto.CmdDTO; +import com.iflytop.sgs.app.service.device.StepCommandService; +import com.iflytop.sgs.common.annotation.CommandMapping; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +import java.util.concurrent.CompletableFuture; + +/** + * 停止所有电机 + */ +@Slf4j +@Component +@RequiredArgsConstructor +@CommandMapping("debug_stop_all_motor") +public class DebugStopAllMotorCommand extends BaseCommandHandler { + private final StepCommandService stepCommandService; + + @Override + public CompletableFuture handle(CmdDTO cmdDTO) throws Exception { + return runAsync(() -> { + //stepCommandService.stopAll(); + }); + } +} + diff --git a/src/main/java/com/iflytop/sgs/app/cmd/debug/step/DebugDisabledAllMotorCommand.java b/src/main/java/com/iflytop/sgs/app/cmd/debug/step/DebugDisabledAllMotorCommand.java deleted file mode 100644 index e1e102b..0000000 --- a/src/main/java/com/iflytop/sgs/app/cmd/debug/step/DebugDisabledAllMotorCommand.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.iflytop.sgs.app.cmd.debug.step; - -import com.iflytop.sgs.app.core.BaseCommandHandler; -import com.iflytop.sgs.app.model.dto.CmdDTO; -import com.iflytop.sgs.app.service.device.StepCommandService; -import com.iflytop.sgs.common.annotation.CommandMapping; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -import java.util.concurrent.CompletableFuture; - -/** - * 失能所有电机 - */ -@Slf4j -@Component -@RequiredArgsConstructor -@CommandMapping("debug_disabled_all_motor") -public class DebugDisabledAllMotorCommand extends BaseCommandHandler { - private final StepCommandService stepCommandService; - - @Override - public CompletableFuture handle(CmdDTO cmdDTO) throws Exception { - - return runAsync(() -> { - //stepCommandService.disabilityAll(); - }); - } -} - diff --git a/src/main/java/com/iflytop/sgs/app/cmd/debug/step/DebugEnableAllMotorCommand.java b/src/main/java/com/iflytop/sgs/app/cmd/debug/step/DebugEnableAllMotorCommand.java deleted file mode 100644 index 5b37cff..0000000 --- a/src/main/java/com/iflytop/sgs/app/cmd/debug/step/DebugEnableAllMotorCommand.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.iflytop.sgs.app.cmd.debug.step; - -import com.iflytop.sgs.app.core.BaseCommandHandler; -import com.iflytop.sgs.app.model.dto.CmdDTO; -import com.iflytop.sgs.app.service.device.StepCommandService; -import com.iflytop.sgs.common.annotation.CommandMapping; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -import java.util.concurrent.CompletableFuture; - -/** - * 使能所有电机 - */ -@Slf4j -@Component -@RequiredArgsConstructor -@CommandMapping("debug_enable_all_motor") -public class DebugEnableAllMotorCommand extends BaseCommandHandler { - private final StepCommandService stepCommandService; - - @Override - public CompletableFuture handle(CmdDTO cmdDTO) throws Exception { - - return runAsync(() -> { - //stepCommandService.enableAll(); - }); - } -} - diff --git a/src/main/java/com/iflytop/sgs/app/cmd/debug/step/DebugStopAllMotorCommand.java b/src/main/java/com/iflytop/sgs/app/cmd/debug/step/DebugStopAllMotorCommand.java deleted file mode 100644 index efcf4b6..0000000 --- a/src/main/java/com/iflytop/sgs/app/cmd/debug/step/DebugStopAllMotorCommand.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.iflytop.sgs.app.cmd.debug.step; - -import com.iflytop.sgs.app.core.BaseCommandHandler; -import com.iflytop.sgs.app.model.dto.CmdDTO; -import com.iflytop.sgs.app.service.device.StepCommandService; -import com.iflytop.sgs.common.annotation.CommandMapping; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -import java.util.concurrent.CompletableFuture; - -/** - * 停止所有电机 - */ -@Slf4j -@Component -@RequiredArgsConstructor -@CommandMapping("debug_stop_all_motor") -public class DebugStopAllMotorCommand extends BaseCommandHandler { - private final StepCommandService stepCommandService; - - @Override - public CompletableFuture handle(CmdDTO cmdDTO) throws Exception { - return runAsync(() -> { - //stepCommandService.stopAll(); - }); - } -} - 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 d4222ef..ef53a4e 100644 --- a/src/main/java/com/iflytop/sgs/common/cmd/DeviceCommandGenerator.java +++ b/src/main/java/com/iflytop/sgs/common/cmd/DeviceCommandGenerator.java @@ -1,7 +1,10 @@ package com.iflytop.sgs.common.cmd; -import com.iflytop.sgs.common.enums.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; /** * 生成给设备发送的指令