diff --git a/src/main/java/com/iflytop/gd/app/cmd/debug/ColdTrapStartRecycleCommandHandler.java b/src/main/java/com/iflytop/gd/app/cmd/debug/ColdTrapStartRecycleCommand.java similarity index 93% rename from src/main/java/com/iflytop/gd/app/cmd/debug/ColdTrapStartRecycleCommandHandler.java rename to src/main/java/com/iflytop/gd/app/cmd/debug/ColdTrapStartRecycleCommand.java index 3cc0bb5..3c7948a 100644 --- a/src/main/java/com/iflytop/gd/app/cmd/debug/ColdTrapStartRecycleCommandHandler.java +++ b/src/main/java/com/iflytop/gd/app/cmd/debug/ColdTrapStartRecycleCommand.java @@ -20,7 +20,7 @@ import java.util.concurrent.CompletableFuture; @Component @RequiredArgsConstructor @CommandMapping("debug_cold_trap_start_recycle") -public class ColdTrapStartRecycleCommandHandler extends BaseCommandHandler { +public class ColdTrapStartRecycleCommand extends BaseCommandHandler { private final DeviceCommandService deviceCommandService; @Override diff --git a/src/main/java/com/iflytop/gd/app/cmd/debug/ColdTrapStartRefrigerationCommandHandler.java b/src/main/java/com/iflytop/gd/app/cmd/debug/ColdTrapStartRefrigerationCommand.java similarity index 93% rename from src/main/java/com/iflytop/gd/app/cmd/debug/ColdTrapStartRefrigerationCommandHandler.java rename to src/main/java/com/iflytop/gd/app/cmd/debug/ColdTrapStartRefrigerationCommand.java index 3bd8421..7dff130 100644 --- a/src/main/java/com/iflytop/gd/app/cmd/debug/ColdTrapStartRefrigerationCommandHandler.java +++ b/src/main/java/com/iflytop/gd/app/cmd/debug/ColdTrapStartRefrigerationCommand.java @@ -20,7 +20,7 @@ import java.util.concurrent.CompletableFuture; @Component @RequiredArgsConstructor @CommandMapping("debug_cold_trap_start_refrigeration") -public class ColdTrapStartRefrigerationCommandHandler extends BaseCommandHandler { +public class ColdTrapStartRefrigerationCommand extends BaseCommandHandler { private final DeviceCommandService deviceCommandService; @Override diff --git a/src/main/java/com/iflytop/gd/app/cmd/debug/ColdTrapStopHeatingCommandHandler.java b/src/main/java/com/iflytop/gd/app/cmd/debug/ColdTrapStopHeatingCommand.java similarity index 89% rename from src/main/java/com/iflytop/gd/app/cmd/debug/ColdTrapStopHeatingCommandHandler.java rename to src/main/java/com/iflytop/gd/app/cmd/debug/ColdTrapStopHeatingCommand.java index e855aff..77e8d64 100644 --- a/src/main/java/com/iflytop/gd/app/cmd/debug/ColdTrapStopHeatingCommandHandler.java +++ b/src/main/java/com/iflytop/gd/app/cmd/debug/ColdTrapStopHeatingCommand.java @@ -16,7 +16,7 @@ import java.util.concurrent.CompletableFuture; @Component @RequiredArgsConstructor @CommandMapping("debug_cold_trap_stop_heating") -public class ColdTrapStopHeatingCommandHandler extends BaseCommandHandler { +public class ColdTrapStopHeatingCommand extends BaseCommandHandler { @Override public CompletableFuture handle(CmdDTO cmdDTO) { return runAsync(() -> { diff --git a/src/main/java/com/iflytop/gd/app/cmd/debug/ColdTrapStopRecycleCommandHandler.java b/src/main/java/com/iflytop/gd/app/cmd/debug/ColdTrapStopRecycleCommand.java similarity index 93% rename from src/main/java/com/iflytop/gd/app/cmd/debug/ColdTrapStopRecycleCommandHandler.java rename to src/main/java/com/iflytop/gd/app/cmd/debug/ColdTrapStopRecycleCommand.java index fc00b96..2189ed5 100644 --- a/src/main/java/com/iflytop/gd/app/cmd/debug/ColdTrapStopRecycleCommandHandler.java +++ b/src/main/java/com/iflytop/gd/app/cmd/debug/ColdTrapStopRecycleCommand.java @@ -20,7 +20,7 @@ import java.util.concurrent.CompletableFuture; @Component @RequiredArgsConstructor @CommandMapping("debug_cold_trap_stop_recycle") -public class ColdTrapStopRecycleCommandHandler extends BaseCommandHandler { +public class ColdTrapStopRecycleCommand extends BaseCommandHandler { private final DeviceCommandService deviceCommandService; @Override diff --git a/src/main/java/com/iflytop/gd/app/cmd/debug/ColdTrapStopRefrigerationCommandHandler.java b/src/main/java/com/iflytop/gd/app/cmd/debug/ColdTrapStopRefrigerationCommand.java similarity index 93% rename from src/main/java/com/iflytop/gd/app/cmd/debug/ColdTrapStopRefrigerationCommandHandler.java rename to src/main/java/com/iflytop/gd/app/cmd/debug/ColdTrapStopRefrigerationCommand.java index f41f195..0d17bc1 100644 --- a/src/main/java/com/iflytop/gd/app/cmd/debug/ColdTrapStopRefrigerationCommandHandler.java +++ b/src/main/java/com/iflytop/gd/app/cmd/debug/ColdTrapStopRefrigerationCommand.java @@ -20,7 +20,7 @@ import java.util.concurrent.CompletableFuture; @Component @RequiredArgsConstructor @CommandMapping("debug_cold_trap_stop_refrigeration") -public class ColdTrapStopRefrigerationCommandHandler extends BaseCommandHandler { +public class ColdTrapStopRefrigerationCommand extends BaseCommandHandler { private final DeviceCommandService deviceCommandService; @Override diff --git a/src/main/java/com/iflytop/gd/app/cmd/debug/CoverElevatorLiftDownCommandHandler.java b/src/main/java/com/iflytop/gd/app/cmd/debug/CoverElevatorLiftDownCommand.java similarity index 95% rename from src/main/java/com/iflytop/gd/app/cmd/debug/CoverElevatorLiftDownCommandHandler.java rename to src/main/java/com/iflytop/gd/app/cmd/debug/CoverElevatorLiftDownCommand.java index 7644c5b..db27c20 100644 --- a/src/main/java/com/iflytop/gd/app/cmd/debug/CoverElevatorLiftDownCommandHandler.java +++ b/src/main/java/com/iflytop/gd/app/cmd/debug/CoverElevatorLiftDownCommand.java @@ -20,7 +20,7 @@ import java.util.concurrent.CompletableFuture; @Component @RequiredArgsConstructor @CommandMapping("debug_cover_elevator_lift_down") -public class CoverElevatorLiftDownCommandHandler extends BaseCommandHandler { +public class CoverElevatorLiftDownCommand extends BaseCommandHandler { private final DeviceCommandService deviceCommandService; @Override diff --git a/src/main/java/com/iflytop/gd/app/cmd/debug/CoverElevatorLiftUpCommandHandler.java b/src/main/java/com/iflytop/gd/app/cmd/debug/CoverElevatorLiftUpCommand.java similarity index 95% rename from src/main/java/com/iflytop/gd/app/cmd/debug/CoverElevatorLiftUpCommandHandler.java rename to src/main/java/com/iflytop/gd/app/cmd/debug/CoverElevatorLiftUpCommand.java index 5cc4482..10ea2ef 100644 --- a/src/main/java/com/iflytop/gd/app/cmd/debug/CoverElevatorLiftUpCommandHandler.java +++ b/src/main/java/com/iflytop/gd/app/cmd/debug/CoverElevatorLiftUpCommand.java @@ -21,7 +21,7 @@ import java.util.concurrent.CompletableFuture; @Component @RequiredArgsConstructor @CommandMapping("debug_cover_elevator_lift_up") -public class CoverElevatorLiftUpCommandHandler extends BaseCommandHandler { +public class CoverElevatorLiftUpCommand extends BaseCommandHandler { private final DeviceCommandService deviceCommandService; @Override diff --git a/src/main/java/com/iflytop/gd/app/cmd/debug/CoverElevatorResetCommandHandler.java b/src/main/java/com/iflytop/gd/app/cmd/debug/CoverElevatorResetCommand.java similarity index 94% rename from src/main/java/com/iflytop/gd/app/cmd/debug/CoverElevatorResetCommandHandler.java rename to src/main/java/com/iflytop/gd/app/cmd/debug/CoverElevatorResetCommand.java index 45a95f5..7fb3b6b 100644 --- a/src/main/java/com/iflytop/gd/app/cmd/debug/CoverElevatorResetCommandHandler.java +++ b/src/main/java/com/iflytop/gd/app/cmd/debug/CoverElevatorResetCommand.java @@ -20,7 +20,7 @@ import java.util.concurrent.CompletableFuture; @Component @RequiredArgsConstructor @CommandMapping("debug_cover_elevator_reset") -public class CoverElevatorResetCommandHandler extends BaseCommandHandler { +public class CoverElevatorResetCommand extends BaseCommandHandler { private final DeviceCommandService deviceCommandService; @Override diff --git a/src/main/java/com/iflytop/gd/app/cmd/debug/CoverElevatorStopCommandHandler.java b/src/main/java/com/iflytop/gd/app/cmd/debug/CoverElevatorStopCommand.java similarity index 94% rename from src/main/java/com/iflytop/gd/app/cmd/debug/CoverElevatorStopCommandHandler.java rename to src/main/java/com/iflytop/gd/app/cmd/debug/CoverElevatorStopCommand.java index 6bdabe7..1bb2da5 100644 --- a/src/main/java/com/iflytop/gd/app/cmd/debug/CoverElevatorStopCommandHandler.java +++ b/src/main/java/com/iflytop/gd/app/cmd/debug/CoverElevatorStopCommand.java @@ -20,7 +20,7 @@ import java.util.concurrent.CompletableFuture; @Component @RequiredArgsConstructor @CommandMapping("debug_cover_elevator_stop") -public class CoverElevatorStopCommandHandler extends BaseCommandHandler { +public class CoverElevatorStopCommand extends BaseCommandHandler { private final DeviceCommandService deviceCommandService; @Override diff --git a/src/main/java/com/iflytop/gd/app/cmd/debug/DoorCloseCommand.java b/src/main/java/com/iflytop/gd/app/cmd/debug/DoorCloseCommand.java new file mode 100644 index 0000000..5f3be75 --- /dev/null +++ b/src/main/java/com/iflytop/gd/app/cmd/debug/DoorCloseCommand.java @@ -0,0 +1,35 @@ +package com.iflytop.gd.app.cmd.debug; + +import com.iflytop.gd.app.core.BaseCommandHandler; +import com.iflytop.gd.app.model.dto.CmdDTO; +import com.iflytop.gd.app.service.DeviceCommandService; +import com.iflytop.gd.common.annotation.CommandMapping; +import com.iflytop.gd.common.cmd.CommandFuture; +import com.iflytop.gd.common.cmd.DeviceCommandBundle; +import com.iflytop.gd.common.cmd.DeviceCommandGenerator; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +import java.util.concurrent.CompletableFuture; + +/** + * 处理关门指令 + */ +@Slf4j +@Component +@RequiredArgsConstructor +@CommandMapping("debug_door_close") +public class DoorCloseCommand extends BaseCommandHandler { + private final DeviceCommandService deviceCommandService; + + @Override + public CompletableFuture handle(CmdDTO cmdDTO) { + return runAsync(() -> { + DeviceCommandBundle deviceCommand = DeviceCommandGenerator.doorOrigin(); + CommandFuture deviceCommandFuture = deviceCommandService.sendCommand(cmdDTO.getCommandId(), cmdDTO.getCommand(), deviceCommand); + commandWait(deviceCommandFuture); + }); + } +} + diff --git a/src/main/java/com/iflytop/gd/app/cmd/debug/DoorCloseCommandHandler.java b/src/main/java/com/iflytop/gd/app/cmd/debug/DoorCloseCommandHandler.java deleted file mode 100644 index ff62266..0000000 --- a/src/main/java/com/iflytop/gd/app/cmd/debug/DoorCloseCommandHandler.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.iflytop.gd.app.cmd.debug; - -import com.iflytop.gd.app.core.BaseCommandHandler; -import com.iflytop.gd.app.model.dto.CmdDTO; -import com.iflytop.gd.app.model.entity.DevicePosition; -import com.iflytop.gd.app.service.DeviceCommandService; -import com.iflytop.gd.app.service.DevicePositionService; -import com.iflytop.gd.common.annotation.CommandMapping; -import com.iflytop.gd.common.cmd.CommandFuture; -import com.iflytop.gd.common.cmd.DeviceCommandBundle; -import com.iflytop.gd.common.cmd.DeviceCommandGenerator; -import com.iflytop.gd.common.enums.data.DevicePositionCode; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -import java.util.concurrent.CompletableFuture; - -/** - * 处理关门指令 - */ -@Slf4j -@Component -@RequiredArgsConstructor -@CommandMapping("debug_door_close") -public class DoorCloseCommandHandler extends BaseCommandHandler { - private final DeviceCommandService deviceCommandService; - - @Override - public CompletableFuture handle(CmdDTO cmdDTO) { - return runAsync(() -> { - DeviceCommandBundle deviceCommand = DeviceCommandGenerator.doorOrigin(); - CommandFuture deviceCommandFuture = deviceCommandService.sendCommand(cmdDTO.getCommandId(), cmdDTO.getCommand(), deviceCommand); - commandWait(deviceCommandFuture); - }); - } -} - diff --git a/src/main/java/com/iflytop/gd/app/cmd/debug/DoorOpenCommandHandler.java b/src/main/java/com/iflytop/gd/app/cmd/debug/DoorOpenCommand.java similarity index 95% rename from src/main/java/com/iflytop/gd/app/cmd/debug/DoorOpenCommandHandler.java rename to src/main/java/com/iflytop/gd/app/cmd/debug/DoorOpenCommand.java index 7320d3e..8cd6015 100644 --- a/src/main/java/com/iflytop/gd/app/cmd/debug/DoorOpenCommandHandler.java +++ b/src/main/java/com/iflytop/gd/app/cmd/debug/DoorOpenCommand.java @@ -23,7 +23,7 @@ import java.util.concurrent.CompletableFuture; @Component @RequiredArgsConstructor @CommandMapping("debug_door_open") -public class DoorOpenCommandHandler extends BaseCommandHandler { +public class DoorOpenCommand extends BaseCommandHandler { private final DeviceCommandService deviceCommandService; private final DevicePositionService devicePositionService; diff --git a/src/main/java/com/iflytop/gd/app/cmd/debug/DoorStopCommandHandler.java b/src/main/java/com/iflytop/gd/app/cmd/debug/DoorStopCommand.java similarity index 94% rename from src/main/java/com/iflytop/gd/app/cmd/debug/DoorStopCommandHandler.java rename to src/main/java/com/iflytop/gd/app/cmd/debug/DoorStopCommand.java index 9a98e56..7a3aab7 100644 --- a/src/main/java/com/iflytop/gd/app/cmd/debug/DoorStopCommandHandler.java +++ b/src/main/java/com/iflytop/gd/app/cmd/debug/DoorStopCommand.java @@ -20,7 +20,7 @@ import java.util.concurrent.CompletableFuture; @Component @RequiredArgsConstructor @CommandMapping("debug_door_stop") -public class DoorStopCommandHandler extends BaseCommandHandler { +public class DoorStopCommand extends BaseCommandHandler { private final DeviceCommandService deviceCommandService; @Override diff --git a/src/main/java/com/iflytop/gd/app/cmd/debug/FanStartCommandHandler.java b/src/main/java/com/iflytop/gd/app/cmd/debug/FanStartCommand.java similarity index 96% rename from src/main/java/com/iflytop/gd/app/cmd/debug/FanStartCommandHandler.java rename to src/main/java/com/iflytop/gd/app/cmd/debug/FanStartCommand.java index ec44e2c..be697e4 100644 --- a/src/main/java/com/iflytop/gd/app/cmd/debug/FanStartCommandHandler.java +++ b/src/main/java/com/iflytop/gd/app/cmd/debug/FanStartCommand.java @@ -21,7 +21,7 @@ import java.util.concurrent.CompletableFuture; @Component @RequiredArgsConstructor @CommandMapping("debug_fan_start") -public class FanStartCommandHandler extends BaseCommandHandler { +public class FanStartCommand extends BaseCommandHandler { private final DeviceCommandService deviceCommandService; @Override diff --git a/src/main/java/com/iflytop/gd/app/cmd/debug/FanStopCommandHandler.java b/src/main/java/com/iflytop/gd/app/cmd/debug/FanStopCommand.java similarity index 96% rename from src/main/java/com/iflytop/gd/app/cmd/debug/FanStopCommandHandler.java rename to src/main/java/com/iflytop/gd/app/cmd/debug/FanStopCommand.java index 210ddd7..895032f 100644 --- a/src/main/java/com/iflytop/gd/app/cmd/debug/FanStopCommandHandler.java +++ b/src/main/java/com/iflytop/gd/app/cmd/debug/FanStopCommand.java @@ -21,7 +21,7 @@ import java.util.concurrent.CompletableFuture; @Component @RequiredArgsConstructor @CommandMapping("debug_fan_stop") -public class FanStopCommandHandler extends BaseCommandHandler { +public class FanStopCommand extends BaseCommandHandler { private final DeviceCommandService deviceCommandService; @Override diff --git a/src/main/java/com/iflytop/gd/app/cmd/debug/HeaterStartCommandHandler.java b/src/main/java/com/iflytop/gd/app/cmd/debug/HeaterStartCommand.java similarity index 96% rename from src/main/java/com/iflytop/gd/app/cmd/debug/HeaterStartCommandHandler.java rename to src/main/java/com/iflytop/gd/app/cmd/debug/HeaterStartCommand.java index 92797b1..6230e5a 100644 --- a/src/main/java/com/iflytop/gd/app/cmd/debug/HeaterStartCommandHandler.java +++ b/src/main/java/com/iflytop/gd/app/cmd/debug/HeaterStartCommand.java @@ -21,7 +21,7 @@ import java.util.concurrent.CompletableFuture; @Component @RequiredArgsConstructor @CommandMapping("debug_heater_start") -public class HeaterStartCommandHandler extends BaseCommandHandler { +public class HeaterStartCommand extends BaseCommandHandler { private final DeviceCommandService deviceCommandService; @Override diff --git a/src/main/java/com/iflytop/gd/app/cmd/debug/HeaterStartHeatMaintainingCommandHandler.java b/src/main/java/com/iflytop/gd/app/cmd/debug/HeaterStartHeatMaintainingCommand.java similarity index 88% rename from src/main/java/com/iflytop/gd/app/cmd/debug/HeaterStartHeatMaintainingCommandHandler.java rename to src/main/java/com/iflytop/gd/app/cmd/debug/HeaterStartHeatMaintainingCommand.java index cdc599d..dc424e7 100644 --- a/src/main/java/com/iflytop/gd/app/cmd/debug/HeaterStartHeatMaintainingCommandHandler.java +++ b/src/main/java/com/iflytop/gd/app/cmd/debug/HeaterStartHeatMaintainingCommand.java @@ -16,7 +16,7 @@ import java.util.concurrent.CompletableFuture; @Component @RequiredArgsConstructor @CommandMapping("debug_heater_start_heat_maintaining") -public class HeaterStartHeatMaintainingCommandHandler extends BaseCommandHandler { +public class HeaterStartHeatMaintainingCommand extends BaseCommandHandler { @Override public CompletableFuture handle(CmdDTO cmdDTO) { return runAsync(() -> { diff --git a/src/main/java/com/iflytop/gd/app/cmd/debug/HeaterStopCommandHandler.java b/src/main/java/com/iflytop/gd/app/cmd/debug/HeaterStopCommand.java similarity index 96% rename from src/main/java/com/iflytop/gd/app/cmd/debug/HeaterStopCommandHandler.java rename to src/main/java/com/iflytop/gd/app/cmd/debug/HeaterStopCommand.java index f292b5e..aaa45f1 100644 --- a/src/main/java/com/iflytop/gd/app/cmd/debug/HeaterStopCommandHandler.java +++ b/src/main/java/com/iflytop/gd/app/cmd/debug/HeaterStopCommand.java @@ -21,7 +21,7 @@ import java.util.concurrent.CompletableFuture; @Component @RequiredArgsConstructor @CommandMapping("debug_heater_stop") -public class HeaterStopCommandHandler extends BaseCommandHandler { +public class HeaterStopCommand extends BaseCommandHandler { private final DeviceCommandService deviceCommandService; @Override diff --git a/src/main/java/com/iflytop/gd/app/cmd/debug/HeaterStopMaintainingCommandHandler.java b/src/main/java/com/iflytop/gd/app/cmd/debug/HeaterStopMaintainingCommand.java similarity index 88% rename from src/main/java/com/iflytop/gd/app/cmd/debug/HeaterStopMaintainingCommandHandler.java rename to src/main/java/com/iflytop/gd/app/cmd/debug/HeaterStopMaintainingCommand.java index 7a59906..541506c 100644 --- a/src/main/java/com/iflytop/gd/app/cmd/debug/HeaterStopMaintainingCommandHandler.java +++ b/src/main/java/com/iflytop/gd/app/cmd/debug/HeaterStopMaintainingCommand.java @@ -16,7 +16,7 @@ import java.util.concurrent.CompletableFuture; @Component @RequiredArgsConstructor @CommandMapping("debug_heater_stop_heat_maintaining") -public class HeaterStopMaintainingCommandHandler extends BaseCommandHandler { +public class HeaterStopMaintainingCommand extends BaseCommandHandler { @Override public CompletableFuture handle(CmdDTO cmdDTO) { return runAsync(() -> { diff --git a/src/main/java/com/iflytop/gd/app/cmd/debug/HoldingJawCloseCommandHandler.java b/src/main/java/com/iflytop/gd/app/cmd/debug/HoldingJawCloseCommand.java similarity index 97% rename from src/main/java/com/iflytop/gd/app/cmd/debug/HoldingJawCloseCommandHandler.java rename to src/main/java/com/iflytop/gd/app/cmd/debug/HoldingJawCloseCommand.java index d2ab8ce..1801aa1 100644 --- a/src/main/java/com/iflytop/gd/app/cmd/debug/HoldingJawCloseCommandHandler.java +++ b/src/main/java/com/iflytop/gd/app/cmd/debug/HoldingJawCloseCommand.java @@ -20,7 +20,7 @@ import java.util.concurrent.CompletableFuture; @Component @RequiredArgsConstructor @CommandMapping("debug_holding_jaw_close") -public class HoldingJawCloseCommandHandler extends BaseCommandHandler { +public class HoldingJawCloseCommand extends BaseCommandHandler { private final DeviceCommandService deviceCommandService; private boolean stop = false; diff --git a/src/main/java/com/iflytop/gd/app/cmd/debug/HoldingJawOpenCommandHandler.java b/src/main/java/com/iflytop/gd/app/cmd/debug/HoldingJawOpenCommand.java similarity index 97% rename from src/main/java/com/iflytop/gd/app/cmd/debug/HoldingJawOpenCommandHandler.java rename to src/main/java/com/iflytop/gd/app/cmd/debug/HoldingJawOpenCommand.java index c4a98f3..620a464 100644 --- a/src/main/java/com/iflytop/gd/app/cmd/debug/HoldingJawOpenCommandHandler.java +++ b/src/main/java/com/iflytop/gd/app/cmd/debug/HoldingJawOpenCommand.java @@ -20,7 +20,7 @@ import java.util.concurrent.CompletableFuture; @Component @RequiredArgsConstructor @CommandMapping("debug_holding_jaw_open") -public class HoldingJawOpenCommandHandler extends BaseCommandHandler { +public class HoldingJawOpenCommand extends BaseCommandHandler { private final DeviceCommandService deviceCommandService; private boolean stop = false; diff --git a/src/main/java/com/iflytop/gd/app/cmd/debug/HoldingJawPauseCommandHandler.java b/src/main/java/com/iflytop/gd/app/cmd/debug/HoldingJawPauseCommand.java similarity index 85% rename from src/main/java/com/iflytop/gd/app/cmd/debug/HoldingJawPauseCommandHandler.java rename to src/main/java/com/iflytop/gd/app/cmd/debug/HoldingJawPauseCommand.java index df27814..c9d6ecb 100644 --- a/src/main/java/com/iflytop/gd/app/cmd/debug/HoldingJawPauseCommandHandler.java +++ b/src/main/java/com/iflytop/gd/app/cmd/debug/HoldingJawPauseCommand.java @@ -20,13 +20,13 @@ import java.util.concurrent.CompletableFuture; @Component @RequiredArgsConstructor @CommandMapping("debug_holding_jaw_pause") -public class HoldingJawPauseCommandHandler extends BaseCommandHandler { +public class HoldingJawPauseCommand extends BaseCommandHandler { private final DeviceCommandService deviceCommandService; - private final HoldingJawOpenCommandHandler holdingJawOpenCommandHandler; + private final HoldingJawOpenCommand holdingJawOpenCommand; @Override public CompletableFuture handle(CmdDTO cmdDTO) { - holdingJawOpenCommandHandler.stop(); + holdingJawOpenCommand.stop(); return runAsync(() -> { DeviceCommandBundle deviceCommand = DeviceCommandGenerator.clawStop(); CommandFuture deviceCommandFuture = deviceCommandService.sendCommand(cmdDTO.getCommandId(), cmdDTO.getCommand(), deviceCommand); diff --git a/src/main/java/com/iflytop/gd/app/cmd/debug/LiquidArmResetCommandHandler.java b/src/main/java/com/iflytop/gd/app/cmd/debug/LiquidArmResetCommand.java similarity index 93% rename from src/main/java/com/iflytop/gd/app/cmd/debug/LiquidArmResetCommandHandler.java rename to src/main/java/com/iflytop/gd/app/cmd/debug/LiquidArmResetCommand.java index 4672e15..afa1e9a 100644 --- a/src/main/java/com/iflytop/gd/app/cmd/debug/LiquidArmResetCommandHandler.java +++ b/src/main/java/com/iflytop/gd/app/cmd/debug/LiquidArmResetCommand.java @@ -18,7 +18,7 @@ import java.util.concurrent.CompletableFuture; @Component @RequiredArgsConstructor @CommandMapping("debug_liquid_arm_reset") -public class LiquidArmResetCommandHandler extends BaseCommandHandler { +public class LiquidArmResetCommand extends BaseCommandHandler { private final LiquidDistributionArmDriver liquidDistributionArmDriver; @Override diff --git a/src/main/java/com/iflytop/gd/app/cmd/debug/LiquidArmRotateCommandHandler.java b/src/main/java/com/iflytop/gd/app/cmd/debug/LiquidArmRotateCommand.java similarity index 97% rename from src/main/java/com/iflytop/gd/app/cmd/debug/LiquidArmRotateCommandHandler.java rename to src/main/java/com/iflytop/gd/app/cmd/debug/LiquidArmRotateCommand.java index 80c7702..d1fc489 100644 --- a/src/main/java/com/iflytop/gd/app/cmd/debug/LiquidArmRotateCommandHandler.java +++ b/src/main/java/com/iflytop/gd/app/cmd/debug/LiquidArmRotateCommand.java @@ -22,7 +22,7 @@ import java.util.concurrent.CompletableFuture; @Component @RequiredArgsConstructor @CommandMapping("debug_liquid_arm_rotation") -public class LiquidArmRotateCommandHandler extends BaseCommandHandler { +public class LiquidArmRotateCommand extends BaseCommandHandler { private final DeviceCommandService deviceCommandService; @Override diff --git a/src/main/java/com/iflytop/gd/app/cmd/debug/LiquidArmStopCommandHandler.java b/src/main/java/com/iflytop/gd/app/cmd/debug/LiquidArmStopCommand.java similarity index 96% rename from src/main/java/com/iflytop/gd/app/cmd/debug/LiquidArmStopCommandHandler.java rename to src/main/java/com/iflytop/gd/app/cmd/debug/LiquidArmStopCommand.java index d298dfc..ac665ce 100644 --- a/src/main/java/com/iflytop/gd/app/cmd/debug/LiquidArmStopCommandHandler.java +++ b/src/main/java/com/iflytop/gd/app/cmd/debug/LiquidArmStopCommand.java @@ -22,7 +22,7 @@ import java.util.concurrent.CompletableFuture; @Component @RequiredArgsConstructor @CommandMapping("debug_liquid_arm_stop") -public class LiquidArmStopCommandHandler extends BaseCommandHandler { +public class LiquidArmStopCommand extends BaseCommandHandler { private final DeviceCommandService deviceCommandService; @Override diff --git a/src/main/java/com/iflytop/gd/app/cmd/debug/LiquidPumpStartCommandHandler.java b/src/main/java/com/iflytop/gd/app/cmd/debug/LiquidPumpStartCommand.java similarity index 98% rename from src/main/java/com/iflytop/gd/app/cmd/debug/LiquidPumpStartCommandHandler.java rename to src/main/java/com/iflytop/gd/app/cmd/debug/LiquidPumpStartCommand.java index 41e7d81..36a8d50 100644 --- a/src/main/java/com/iflytop/gd/app/cmd/debug/LiquidPumpStartCommandHandler.java +++ b/src/main/java/com/iflytop/gd/app/cmd/debug/LiquidPumpStartCommand.java @@ -21,7 +21,7 @@ import java.util.concurrent.CompletableFuture; @Component @RequiredArgsConstructor @CommandMapping("debug_liquid_pump_start") -public class LiquidPumpStartCommandHandler extends BaseCommandHandler { +public class LiquidPumpStartCommand extends BaseCommandHandler { private final DeviceCommandService deviceCommandService; @Override diff --git a/src/main/java/com/iflytop/gd/app/cmd/debug/LiquidPumpStopCommandHandler.java b/src/main/java/com/iflytop/gd/app/cmd/debug/LiquidPumpStopCommand.java similarity index 96% rename from src/main/java/com/iflytop/gd/app/cmd/debug/LiquidPumpStopCommandHandler.java rename to src/main/java/com/iflytop/gd/app/cmd/debug/LiquidPumpStopCommand.java index a1dc945..acf6596 100644 --- a/src/main/java/com/iflytop/gd/app/cmd/debug/LiquidPumpStopCommandHandler.java +++ b/src/main/java/com/iflytop/gd/app/cmd/debug/LiquidPumpStopCommand.java @@ -21,7 +21,7 @@ import java.util.concurrent.CompletableFuture; @Component @RequiredArgsConstructor @CommandMapping("debug_liquid_pump_stop") -public class LiquidPumpStopCommandHandler extends BaseCommandHandler { +public class LiquidPumpStopCommand extends BaseCommandHandler { private final DeviceCommandService deviceCommandService; @Override diff --git a/src/main/java/com/iflytop/gd/app/cmd/debug/PalletElevatorLiftDownCommandHandler.java b/src/main/java/com/iflytop/gd/app/cmd/debug/PalletElevatorLiftDownCommand.java similarity index 98% rename from src/main/java/com/iflytop/gd/app/cmd/debug/PalletElevatorLiftDownCommandHandler.java rename to src/main/java/com/iflytop/gd/app/cmd/debug/PalletElevatorLiftDownCommand.java index dda4be0..0570e52 100644 --- a/src/main/java/com/iflytop/gd/app/cmd/debug/PalletElevatorLiftDownCommandHandler.java +++ b/src/main/java/com/iflytop/gd/app/cmd/debug/PalletElevatorLiftDownCommand.java @@ -22,7 +22,7 @@ import java.util.concurrent.CompletableFuture; @Component @RequiredArgsConstructor @CommandMapping("debug_pallet_elevator_lift_down") -public class PalletElevatorLiftDownCommandHandler extends BaseCommandHandler { +public class PalletElevatorLiftDownCommand extends BaseCommandHandler { private final DeviceCommandService deviceCommandService; private boolean stop = false; diff --git a/src/main/java/com/iflytop/gd/app/cmd/debug/PalletElevatorLiftUpCommandHandler.java b/src/main/java/com/iflytop/gd/app/cmd/debug/PalletElevatorLiftUpCommand.java similarity index 98% rename from src/main/java/com/iflytop/gd/app/cmd/debug/PalletElevatorLiftUpCommandHandler.java rename to src/main/java/com/iflytop/gd/app/cmd/debug/PalletElevatorLiftUpCommand.java index 7fd4cb1..d9b8b81 100644 --- a/src/main/java/com/iflytop/gd/app/cmd/debug/PalletElevatorLiftUpCommandHandler.java +++ b/src/main/java/com/iflytop/gd/app/cmd/debug/PalletElevatorLiftUpCommand.java @@ -21,7 +21,7 @@ import java.util.concurrent.CompletableFuture; @Component @RequiredArgsConstructor @CommandMapping("debug_pallet_elevator_lift_up") -public class PalletElevatorLiftUpCommandHandler extends BaseCommandHandler { +public class PalletElevatorLiftUpCommand extends BaseCommandHandler { private final DeviceCommandService deviceCommandService; private boolean stop = false; diff --git a/src/main/java/com/iflytop/gd/app/cmd/debug/PalletElevatorStopCommandHandler.java b/src/main/java/com/iflytop/gd/app/cmd/debug/PalletElevatorStopCommand.java similarity index 84% rename from src/main/java/com/iflytop/gd/app/cmd/debug/PalletElevatorStopCommandHandler.java rename to src/main/java/com/iflytop/gd/app/cmd/debug/PalletElevatorStopCommand.java index 4377d1d..6ab74c2 100644 --- a/src/main/java/com/iflytop/gd/app/cmd/debug/PalletElevatorStopCommandHandler.java +++ b/src/main/java/com/iflytop/gd/app/cmd/debug/PalletElevatorStopCommand.java @@ -22,15 +22,15 @@ import java.util.concurrent.CompletableFuture; @Component @RequiredArgsConstructor @CommandMapping("debug_pallet_elevator_stop") -public class PalletElevatorStopCommandHandler extends BaseCommandHandler { +public class PalletElevatorStopCommand extends BaseCommandHandler { private final DeviceCommandService deviceCommandService; - private final PalletElevatorLiftUpCommandHandler palletElevatorLiftUpCommandHandler; - private final PalletElevatorLiftDownCommandHandler palletElevatorLiftDownCommandHandler; + private final PalletElevatorLiftUpCommand palletElevatorLiftUpCommand; + private final PalletElevatorLiftDownCommand palletElevatorLiftDownCommand; @Override public CompletableFuture handle(CmdDTO cmdDTO) { - palletElevatorLiftUpCommandHandler.stop(); - palletElevatorLiftDownCommandHandler.stop(); + palletElevatorLiftUpCommand.stop(); + palletElevatorLiftDownCommand.stop(); return runAsync(() -> { String index = cmdDTO.getStringParam("index"); HeatModuleCode heatModuleId = HeatModuleCode.valueOf(index); diff --git a/src/main/java/com/iflytop/gd/app/cmd/debug/ShakerStartCommandHandler.java b/src/main/java/com/iflytop/gd/app/cmd/debug/ShakerStartCommand.java similarity index 95% rename from src/main/java/com/iflytop/gd/app/cmd/debug/ShakerStartCommandHandler.java rename to src/main/java/com/iflytop/gd/app/cmd/debug/ShakerStartCommand.java index afdfbc0..f5673f7 100644 --- a/src/main/java/com/iflytop/gd/app/cmd/debug/ShakerStartCommandHandler.java +++ b/src/main/java/com/iflytop/gd/app/cmd/debug/ShakerStartCommand.java @@ -20,7 +20,7 @@ import java.util.concurrent.CompletableFuture; @Component @RequiredArgsConstructor @CommandMapping("debug_shaker_start") -public class ShakerStartCommandHandler extends BaseCommandHandler { +public class ShakerStartCommand extends BaseCommandHandler { private final DeviceCommandService deviceCommandService; @Override diff --git a/src/main/java/com/iflytop/gd/app/cmd/debug/ShakerStopCommandHandler.java b/src/main/java/com/iflytop/gd/app/cmd/debug/ShakerStopCommand.java similarity index 94% rename from src/main/java/com/iflytop/gd/app/cmd/debug/ShakerStopCommandHandler.java rename to src/main/java/com/iflytop/gd/app/cmd/debug/ShakerStopCommand.java index 89fb743..4dfbf61 100644 --- a/src/main/java/com/iflytop/gd/app/cmd/debug/ShakerStopCommandHandler.java +++ b/src/main/java/com/iflytop/gd/app/cmd/debug/ShakerStopCommand.java @@ -20,7 +20,7 @@ import java.util.concurrent.CompletableFuture; @Component @RequiredArgsConstructor @CommandMapping("debug_shaker_stop") -public class ShakerStopCommandHandler extends BaseCommandHandler { +public class ShakerStopCommand extends BaseCommandHandler { private final DeviceCommandService deviceCommandService; @Override diff --git a/src/main/java/com/iflytop/gd/app/cmd/debug/TransportationArmMoveCommandHandler.java b/src/main/java/com/iflytop/gd/app/cmd/debug/TransportationArmMoveCommand.java similarity index 98% rename from src/main/java/com/iflytop/gd/app/cmd/debug/TransportationArmMoveCommandHandler.java rename to src/main/java/com/iflytop/gd/app/cmd/debug/TransportationArmMoveCommand.java index 0b48387..6c86423 100644 --- a/src/main/java/com/iflytop/gd/app/cmd/debug/TransportationArmMoveCommandHandler.java +++ b/src/main/java/com/iflytop/gd/app/cmd/debug/TransportationArmMoveCommand.java @@ -22,7 +22,7 @@ import java.util.concurrent.CompletableFuture; @Component @RequiredArgsConstructor @CommandMapping("debug_transportation_arm_move") -public class TransportationArmMoveCommandHandler extends BaseCommandHandler { +public class TransportationArmMoveCommand extends BaseCommandHandler { private final DeviceCommandService deviceCommandService; private boolean stop = false; diff --git a/src/main/java/com/iflytop/gd/app/cmd/debug/TransportationArmResetCommandHandler.java b/src/main/java/com/iflytop/gd/app/cmd/debug/TransportationArmResetCommand.java similarity index 96% rename from src/main/java/com/iflytop/gd/app/cmd/debug/TransportationArmResetCommandHandler.java rename to src/main/java/com/iflytop/gd/app/cmd/debug/TransportationArmResetCommand.java index 1f2f590..b80ac88 100644 --- a/src/main/java/com/iflytop/gd/app/cmd/debug/TransportationArmResetCommandHandler.java +++ b/src/main/java/com/iflytop/gd/app/cmd/debug/TransportationArmResetCommand.java @@ -22,7 +22,7 @@ import java.util.concurrent.CompletableFuture; @Component @RequiredArgsConstructor @CommandMapping("debug_transportation_arm_reset") -public class TransportationArmResetCommandHandler extends BaseCommandHandler { +public class TransportationArmResetCommand extends BaseCommandHandler { private final DeviceCommandService deviceCommandService; @Override diff --git a/src/main/java/com/iflytop/gd/app/cmd/debug/TransportationArmStopCommandHandler.java b/src/main/java/com/iflytop/gd/app/cmd/debug/TransportationArmStopCommand.java similarity index 91% rename from src/main/java/com/iflytop/gd/app/cmd/debug/TransportationArmStopCommandHandler.java rename to src/main/java/com/iflytop/gd/app/cmd/debug/TransportationArmStopCommand.java index fc6b754..a3e57d4 100644 --- a/src/main/java/com/iflytop/gd/app/cmd/debug/TransportationArmStopCommandHandler.java +++ b/src/main/java/com/iflytop/gd/app/cmd/debug/TransportationArmStopCommand.java @@ -22,13 +22,13 @@ import java.util.concurrent.CompletableFuture; @Component @RequiredArgsConstructor @CommandMapping("debug_transportation_arm_stop") -public class TransportationArmStopCommandHandler extends BaseCommandHandler { +public class TransportationArmStopCommand extends BaseCommandHandler { private final DeviceCommandService deviceCommandService; - private final TransportationArmMoveCommandHandler transportationArmMoveCommandHandler; + private final TransportationArmMoveCommand transportationArmMoveCommand; @Override public CompletableFuture handle(CmdDTO cmdDTO) { - transportationArmMoveCommandHandler.stop(); + transportationArmMoveCommand.stop(); return runAsync(() -> { List dim = (List) cmdDTO.getParams().get("dim"); List futuresList = new ArrayList<>();