From e45ec09b2498e45f5047386309ccc7ccd8f488d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=A2=A6=E8=BF=9C?= <1063331231@qq.com> Date: Fri, 25 Jul 2025 14:49:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../colortitration/app/command/control/heat/HeatRodCloseCommand.java | 4 ++-- .../colortitration/app/command/control/heat/HeatRodOpenCommand.java | 4 ++-- .../app/command/control/pipeline/PipelineCleanStartCommand.java | 4 ++-- .../app/command/control/pipeline/PipelineCleanStopCommand.java | 4 ++-- .../app/command/control/pipeline/PipelineDrainStartCommand.java | 4 ++-- .../app/command/control/pipeline/PipelineDrainStopCommand.java | 4 ++-- .../app/command/control/pipeline/PipelinePreFillStartCommand.java | 4 ++-- .../app/command/control/pipeline/PipelinePreFillStopCommand.java | 4 ++-- .../app/command/control/pipeline/WastePoolDrainStartCommand.java | 4 ++-- .../app/command/control/pipeline/WastePoolDrainStopCommand.java | 4 ++-- .../app/command/control/solution/ShakeStartCommand.java | 4 ++-- .../colortitration/app/command/control/solution/ShakeStopCommand.java | 4 ++-- .../app/command/control/solution/SolutionAddCommand.java | 4 ++-- .../app/command/control/solution/SolutionStopCommand.java | 4 ++-- .../command/control/transfer/HeatAreaMoveTitrationAreaCommand.java | 4 ++-- .../command/control/transfer/TitrationAreaMoveHeatAreaCommand.java | 4 ++-- .../app/command/control/transfer/TitrationMoveTrayAreaCommand.java | 4 ++-- .../app/command/control/transfer/TrayMoveTitrationAreaCommand.java | 4 ++-- .../iflytop/colortitration/app/command/debug/HeatRodCloseCommand.java | 2 +- .../iflytop/colortitration/app/command/debug/HeatRodGetCommand.java | 2 ++ .../iflytop/colortitration/app/command/debug/HeatRodOpenCommand.java | 2 +- 21 files changed, 40 insertions(+), 38 deletions(-) diff --git a/src/main/java/com/iflytop/colortitration/app/command/control/heat/HeatRodCloseCommand.java b/src/main/java/com/iflytop/colortitration/app/command/control/heat/HeatRodCloseCommand.java index 8ac884a..8824375 100644 --- a/src/main/java/com/iflytop/colortitration/app/command/control/heat/HeatRodCloseCommand.java +++ b/src/main/java/com/iflytop/colortitration/app/command/control/heat/HeatRodCloseCommand.java @@ -1,6 +1,6 @@ package com.iflytop.colortitration.app.command.control.heat; -import com.iflytop.colortitration.app.common.annotation.CommandDebugMapping; +import com.iflytop.colortitration.app.common.annotation.CommandMapping; import com.iflytop.colortitration.app.common.enums.MultipleModuleCode; import com.iflytop.colortitration.app.core.command.BaseCommandHandler; import com.iflytop.colortitration.app.model.dto.CommandDTO; @@ -20,7 +20,7 @@ import java.util.concurrent.CompletableFuture; @Slf4j @Component @RequiredArgsConstructor -@CommandDebugMapping("heater_stop") +@CommandMapping("heater_stop") public class HeatRodCloseCommand extends BaseCommandHandler { private final HeatModuleService heatModuleService; diff --git a/src/main/java/com/iflytop/colortitration/app/command/control/heat/HeatRodOpenCommand.java b/src/main/java/com/iflytop/colortitration/app/command/control/heat/HeatRodOpenCommand.java index c98864a..904ef48 100644 --- a/src/main/java/com/iflytop/colortitration/app/command/control/heat/HeatRodOpenCommand.java +++ b/src/main/java/com/iflytop/colortitration/app/command/control/heat/HeatRodOpenCommand.java @@ -1,6 +1,6 @@ package com.iflytop.colortitration.app.command.control.heat; -import com.iflytop.colortitration.app.common.annotation.CommandDebugMapping; +import com.iflytop.colortitration.app.common.annotation.CommandMapping; import com.iflytop.colortitration.app.common.enums.MultipleModuleCode; import com.iflytop.colortitration.app.core.command.BaseCommandHandler; import com.iflytop.colortitration.app.model.dto.CommandDTO; @@ -20,7 +20,7 @@ import java.util.concurrent.CompletableFuture; @Slf4j @Component @RequiredArgsConstructor -@CommandDebugMapping("heater_start") +@CommandMapping("heater_start") public class HeatRodOpenCommand extends BaseCommandHandler { private final HeatModuleService heatModuleService; diff --git a/src/main/java/com/iflytop/colortitration/app/command/control/pipeline/PipelineCleanStartCommand.java b/src/main/java/com/iflytop/colortitration/app/command/control/pipeline/PipelineCleanStartCommand.java index bf6b62f..614df85 100644 --- a/src/main/java/com/iflytop/colortitration/app/command/control/pipeline/PipelineCleanStartCommand.java +++ b/src/main/java/com/iflytop/colortitration/app/command/control/pipeline/PipelineCleanStartCommand.java @@ -1,6 +1,6 @@ package com.iflytop.colortitration.app.command.control.pipeline; -import com.iflytop.colortitration.app.common.annotation.CommandDebugMapping; +import com.iflytop.colortitration.app.common.annotation.CommandMapping; import com.iflytop.colortitration.app.common.enums.MultipleModuleCode; import com.iflytop.colortitration.app.core.command.BaseCommandHandler; import com.iflytop.colortitration.app.model.dto.CommandDTO; @@ -20,7 +20,7 @@ import java.util.concurrent.CompletableFuture; @Slf4j @Component @RequiredArgsConstructor -@CommandDebugMapping("solution_clean_start") +@CommandMapping("solution_clean_start") public class PipelineCleanStartCommand extends BaseCommandHandler { private final TitrationModuleService titrationModuleService; diff --git a/src/main/java/com/iflytop/colortitration/app/command/control/pipeline/PipelineCleanStopCommand.java b/src/main/java/com/iflytop/colortitration/app/command/control/pipeline/PipelineCleanStopCommand.java index f178c26..862dec2 100644 --- a/src/main/java/com/iflytop/colortitration/app/command/control/pipeline/PipelineCleanStopCommand.java +++ b/src/main/java/com/iflytop/colortitration/app/command/control/pipeline/PipelineCleanStopCommand.java @@ -1,6 +1,6 @@ package com.iflytop.colortitration.app.command.control.pipeline; -import com.iflytop.colortitration.app.common.annotation.CommandDebugMapping; +import com.iflytop.colortitration.app.common.annotation.CommandMapping; import com.iflytop.colortitration.app.common.enums.MultipleModuleCode; import com.iflytop.colortitration.app.core.command.BaseCommandHandler; import com.iflytop.colortitration.app.model.dto.CommandDTO; @@ -20,7 +20,7 @@ import java.util.concurrent.CompletableFuture; @Slf4j @Component @RequiredArgsConstructor -@CommandDebugMapping("solution_clean_stop") +@CommandMapping("solution_clean_stop") public class PipelineCleanStopCommand extends BaseCommandHandler { private final TitrationModuleService titrationModuleService; diff --git a/src/main/java/com/iflytop/colortitration/app/command/control/pipeline/PipelineDrainStartCommand.java b/src/main/java/com/iflytop/colortitration/app/command/control/pipeline/PipelineDrainStartCommand.java index 8ae5da7..bbd3a25 100644 --- a/src/main/java/com/iflytop/colortitration/app/command/control/pipeline/PipelineDrainStartCommand.java +++ b/src/main/java/com/iflytop/colortitration/app/command/control/pipeline/PipelineDrainStartCommand.java @@ -1,6 +1,6 @@ package com.iflytop.colortitration.app.command.control.pipeline; -import com.iflytop.colortitration.app.common.annotation.CommandDebugMapping; +import com.iflytop.colortitration.app.common.annotation.CommandMapping; import com.iflytop.colortitration.app.common.enums.MultipleModuleCode; import com.iflytop.colortitration.app.core.command.BaseCommandHandler; import com.iflytop.colortitration.app.model.dto.CommandDTO; @@ -20,7 +20,7 @@ import java.util.concurrent.CompletableFuture; @Slf4j @Component @RequiredArgsConstructor -@CommandDebugMapping("solution_drain_start") +@CommandMapping("solution_drain_start") public class PipelineDrainStartCommand extends BaseCommandHandler { private final TitrationModuleService titrationModuleService; diff --git a/src/main/java/com/iflytop/colortitration/app/command/control/pipeline/PipelineDrainStopCommand.java b/src/main/java/com/iflytop/colortitration/app/command/control/pipeline/PipelineDrainStopCommand.java index 74d7dda..3feae3f 100644 --- a/src/main/java/com/iflytop/colortitration/app/command/control/pipeline/PipelineDrainStopCommand.java +++ b/src/main/java/com/iflytop/colortitration/app/command/control/pipeline/PipelineDrainStopCommand.java @@ -1,6 +1,6 @@ package com.iflytop.colortitration.app.command.control.pipeline; -import com.iflytop.colortitration.app.common.annotation.CommandDebugMapping; +import com.iflytop.colortitration.app.common.annotation.CommandMapping; import com.iflytop.colortitration.app.common.enums.MultipleModuleCode; import com.iflytop.colortitration.app.core.command.BaseCommandHandler; import com.iflytop.colortitration.app.model.dto.CommandDTO; @@ -20,7 +20,7 @@ import java.util.concurrent.CompletableFuture; @Slf4j @Component @RequiredArgsConstructor -@CommandDebugMapping("solution_drain_stop") +@CommandMapping("solution_drain_stop") public class PipelineDrainStopCommand extends BaseCommandHandler { private final TitrationModuleService titrationModuleService; diff --git a/src/main/java/com/iflytop/colortitration/app/command/control/pipeline/PipelinePreFillStartCommand.java b/src/main/java/com/iflytop/colortitration/app/command/control/pipeline/PipelinePreFillStartCommand.java index ca0e79d..340192b 100644 --- a/src/main/java/com/iflytop/colortitration/app/command/control/pipeline/PipelinePreFillStartCommand.java +++ b/src/main/java/com/iflytop/colortitration/app/command/control/pipeline/PipelinePreFillStartCommand.java @@ -1,6 +1,6 @@ package com.iflytop.colortitration.app.command.control.pipeline; -import com.iflytop.colortitration.app.common.annotation.CommandDebugMapping; +import com.iflytop.colortitration.app.common.annotation.CommandMapping; import com.iflytop.colortitration.app.common.enums.MultipleModuleCode; import com.iflytop.colortitration.app.core.command.BaseCommandHandler; import com.iflytop.colortitration.app.model.dto.CommandDTO; @@ -20,7 +20,7 @@ import java.util.concurrent.CompletableFuture; @Slf4j @Component @RequiredArgsConstructor -@CommandDebugMapping("solution_pre_fill_start") +@CommandMapping("solution_pre_fill_start") public class PipelinePreFillStartCommand extends BaseCommandHandler { private final TitrationModuleService titrationModuleService; diff --git a/src/main/java/com/iflytop/colortitration/app/command/control/pipeline/PipelinePreFillStopCommand.java b/src/main/java/com/iflytop/colortitration/app/command/control/pipeline/PipelinePreFillStopCommand.java index ce6c064..e340328 100644 --- a/src/main/java/com/iflytop/colortitration/app/command/control/pipeline/PipelinePreFillStopCommand.java +++ b/src/main/java/com/iflytop/colortitration/app/command/control/pipeline/PipelinePreFillStopCommand.java @@ -1,6 +1,6 @@ package com.iflytop.colortitration.app.command.control.pipeline; -import com.iflytop.colortitration.app.common.annotation.CommandDebugMapping; +import com.iflytop.colortitration.app.common.annotation.CommandMapping; import com.iflytop.colortitration.app.common.enums.MultipleModuleCode; import com.iflytop.colortitration.app.core.command.BaseCommandHandler; import com.iflytop.colortitration.app.model.dto.CommandDTO; @@ -20,7 +20,7 @@ import java.util.concurrent.CompletableFuture; @Slf4j @Component @RequiredArgsConstructor -@CommandDebugMapping("solution_pre_fill_stop") +@CommandMapping("solution_pre_fill_stop") public class PipelinePreFillStopCommand extends BaseCommandHandler { private final TitrationModuleService titrationModuleService; diff --git a/src/main/java/com/iflytop/colortitration/app/command/control/pipeline/WastePoolDrainStartCommand.java b/src/main/java/com/iflytop/colortitration/app/command/control/pipeline/WastePoolDrainStartCommand.java index cb199d6..29a9996 100644 --- a/src/main/java/com/iflytop/colortitration/app/command/control/pipeline/WastePoolDrainStartCommand.java +++ b/src/main/java/com/iflytop/colortitration/app/command/control/pipeline/WastePoolDrainStartCommand.java @@ -1,6 +1,6 @@ package com.iflytop.colortitration.app.command.control.pipeline; -import com.iflytop.colortitration.app.common.annotation.CommandDebugMapping; +import com.iflytop.colortitration.app.common.annotation.CommandMapping; import com.iflytop.colortitration.app.core.command.BaseCommandHandler; import com.iflytop.colortitration.app.model.dto.CommandDTO; import com.iflytop.colortitration.app.service.module.TitrationModuleService; @@ -16,7 +16,7 @@ import java.util.concurrent.CompletableFuture; @Slf4j @Component @RequiredArgsConstructor -@CommandDebugMapping("solution_waste_drain_start") +@CommandMapping("solution_waste_drain_start") public class WastePoolDrainStartCommand extends BaseCommandHandler { private final TitrationModuleService titrationModuleService; diff --git a/src/main/java/com/iflytop/colortitration/app/command/control/pipeline/WastePoolDrainStopCommand.java b/src/main/java/com/iflytop/colortitration/app/command/control/pipeline/WastePoolDrainStopCommand.java index d93cb31..5d87ffc 100644 --- a/src/main/java/com/iflytop/colortitration/app/command/control/pipeline/WastePoolDrainStopCommand.java +++ b/src/main/java/com/iflytop/colortitration/app/command/control/pipeline/WastePoolDrainStopCommand.java @@ -1,6 +1,6 @@ package com.iflytop.colortitration.app.command.control.pipeline; -import com.iflytop.colortitration.app.common.annotation.CommandDebugMapping; +import com.iflytop.colortitration.app.common.annotation.CommandMapping; import com.iflytop.colortitration.app.core.command.BaseCommandHandler; import com.iflytop.colortitration.app.model.dto.CommandDTO; import com.iflytop.colortitration.app.service.module.TitrationModuleService; @@ -16,7 +16,7 @@ import java.util.concurrent.CompletableFuture; @Slf4j @Component @RequiredArgsConstructor -@CommandDebugMapping("solution_waste_drain_stop") +@CommandMapping("solution_waste_drain_stop") public class WastePoolDrainStopCommand extends BaseCommandHandler { private final TitrationModuleService titrationModuleService; diff --git a/src/main/java/com/iflytop/colortitration/app/command/control/solution/ShakeStartCommand.java b/src/main/java/com/iflytop/colortitration/app/command/control/solution/ShakeStartCommand.java index 8d5039f..01e4a41 100644 --- a/src/main/java/com/iflytop/colortitration/app/command/control/solution/ShakeStartCommand.java +++ b/src/main/java/com/iflytop/colortitration/app/command/control/solution/ShakeStartCommand.java @@ -1,6 +1,6 @@ package com.iflytop.colortitration.app.command.control.solution; -import com.iflytop.colortitration.app.common.annotation.CommandDebugMapping; +import com.iflytop.colortitration.app.common.annotation.CommandMapping; import com.iflytop.colortitration.app.common.enums.MultipleModuleCode; import com.iflytop.colortitration.app.core.command.BaseCommandHandler; import com.iflytop.colortitration.app.model.dto.CommandDTO; @@ -20,7 +20,7 @@ import java.util.concurrent.CompletableFuture; @Slf4j @Component @RequiredArgsConstructor -@CommandDebugMapping("shake_start") +@CommandMapping("shake_start") public class ShakeStartCommand extends BaseCommandHandler { private final TitrationModuleService titrationModuleService; diff --git a/src/main/java/com/iflytop/colortitration/app/command/control/solution/ShakeStopCommand.java b/src/main/java/com/iflytop/colortitration/app/command/control/solution/ShakeStopCommand.java index 85c423b..2edeaf1 100644 --- a/src/main/java/com/iflytop/colortitration/app/command/control/solution/ShakeStopCommand.java +++ b/src/main/java/com/iflytop/colortitration/app/command/control/solution/ShakeStopCommand.java @@ -1,6 +1,6 @@ package com.iflytop.colortitration.app.command.control.solution; -import com.iflytop.colortitration.app.common.annotation.CommandDebugMapping; +import com.iflytop.colortitration.app.common.annotation.CommandMapping; import com.iflytop.colortitration.app.common.enums.MultipleModuleCode; import com.iflytop.colortitration.app.core.command.BaseCommandHandler; import com.iflytop.colortitration.app.model.dto.CommandDTO; @@ -20,7 +20,7 @@ import java.util.concurrent.CompletableFuture; @Slf4j @Component @RequiredArgsConstructor -@CommandDebugMapping("shake_stop") +@CommandMapping("shake_stop") public class ShakeStopCommand extends BaseCommandHandler { private final TitrationModuleService titrationModuleService; diff --git a/src/main/java/com/iflytop/colortitration/app/command/control/solution/SolutionAddCommand.java b/src/main/java/com/iflytop/colortitration/app/command/control/solution/SolutionAddCommand.java index 178876c..24682ea 100644 --- a/src/main/java/com/iflytop/colortitration/app/command/control/solution/SolutionAddCommand.java +++ b/src/main/java/com/iflytop/colortitration/app/command/control/solution/SolutionAddCommand.java @@ -1,6 +1,6 @@ package com.iflytop.colortitration.app.command.control.solution; -import com.iflytop.colortitration.app.common.annotation.CommandDebugMapping; +import com.iflytop.colortitration.app.common.annotation.CommandMapping; import com.iflytop.colortitration.app.common.enums.MultipleModuleCode; import com.iflytop.colortitration.app.core.command.BaseCommandHandler; import com.iflytop.colortitration.app.model.dto.CommandDTO; @@ -20,7 +20,7 @@ import java.util.concurrent.CompletableFuture; @Slf4j @Component @RequiredArgsConstructor -@CommandDebugMapping("solution_add_start") +@CommandMapping("solution_add_start") public class SolutionAddCommand extends BaseCommandHandler { private final TitrationModuleService titrationModuleService; diff --git a/src/main/java/com/iflytop/colortitration/app/command/control/solution/SolutionStopCommand.java b/src/main/java/com/iflytop/colortitration/app/command/control/solution/SolutionStopCommand.java index f809265..f5d7127 100644 --- a/src/main/java/com/iflytop/colortitration/app/command/control/solution/SolutionStopCommand.java +++ b/src/main/java/com/iflytop/colortitration/app/command/control/solution/SolutionStopCommand.java @@ -1,6 +1,6 @@ package com.iflytop.colortitration.app.command.control.solution; -import com.iflytop.colortitration.app.common.annotation.CommandDebugMapping; +import com.iflytop.colortitration.app.common.annotation.CommandMapping; import com.iflytop.colortitration.app.common.enums.MultipleModuleCode; import com.iflytop.colortitration.app.core.command.BaseCommandHandler; import com.iflytop.colortitration.app.model.dto.CommandDTO; @@ -20,7 +20,7 @@ import java.util.concurrent.CompletableFuture; @Slf4j @Component @RequiredArgsConstructor -@CommandDebugMapping("solution_add_stop") +@CommandMapping("solution_add_stop") public class SolutionStopCommand extends BaseCommandHandler { private final TitrationModuleService titrationModuleService; diff --git a/src/main/java/com/iflytop/colortitration/app/command/control/transfer/HeatAreaMoveTitrationAreaCommand.java b/src/main/java/com/iflytop/colortitration/app/command/control/transfer/HeatAreaMoveTitrationAreaCommand.java index 6408a33..9f597ec 100644 --- a/src/main/java/com/iflytop/colortitration/app/command/control/transfer/HeatAreaMoveTitrationAreaCommand.java +++ b/src/main/java/com/iflytop/colortitration/app/command/control/transfer/HeatAreaMoveTitrationAreaCommand.java @@ -1,6 +1,6 @@ package com.iflytop.colortitration.app.command.control.transfer; -import com.iflytop.colortitration.app.common.annotation.CommandDebugMapping; +import com.iflytop.colortitration.app.common.annotation.CommandMapping; import com.iflytop.colortitration.app.common.enums.MultipleModuleCode; import com.iflytop.colortitration.app.core.command.BaseCommandHandler; import com.iflytop.colortitration.app.core.state.DeviceState; @@ -22,7 +22,7 @@ import java.util.concurrent.CompletableFuture; @Slf4j @Component @RequiredArgsConstructor -@CommandDebugMapping("heat_move_to_titration_area") +@CommandMapping("heat_move_to_titration_area") public class HeatAreaMoveTitrationAreaCommand extends BaseCommandHandler { private final DeviceState deviceState; private final TransferModuleService transferModuleService; diff --git a/src/main/java/com/iflytop/colortitration/app/command/control/transfer/TitrationAreaMoveHeatAreaCommand.java b/src/main/java/com/iflytop/colortitration/app/command/control/transfer/TitrationAreaMoveHeatAreaCommand.java index d1879d4..bf6a412 100644 --- a/src/main/java/com/iflytop/colortitration/app/command/control/transfer/TitrationAreaMoveHeatAreaCommand.java +++ b/src/main/java/com/iflytop/colortitration/app/command/control/transfer/TitrationAreaMoveHeatAreaCommand.java @@ -1,6 +1,6 @@ package com.iflytop.colortitration.app.command.control.transfer; -import com.iflytop.colortitration.app.common.annotation.CommandDebugMapping; +import com.iflytop.colortitration.app.common.annotation.CommandMapping; import com.iflytop.colortitration.app.common.enums.MultipleModuleCode; import com.iflytop.colortitration.app.core.command.BaseCommandHandler; import com.iflytop.colortitration.app.core.state.DeviceState; @@ -22,7 +22,7 @@ import java.util.concurrent.CompletableFuture; @Slf4j @Component @RequiredArgsConstructor -@CommandDebugMapping("titration_move_to_heat_area") +@CommandMapping("titration_move_to_heat_area") public class TitrationAreaMoveHeatAreaCommand extends BaseCommandHandler { private final DeviceState deviceState; private final TransferModuleService transferModuleService; diff --git a/src/main/java/com/iflytop/colortitration/app/command/control/transfer/TitrationMoveTrayAreaCommand.java b/src/main/java/com/iflytop/colortitration/app/command/control/transfer/TitrationMoveTrayAreaCommand.java index 90bc1e8..6344e55 100644 --- a/src/main/java/com/iflytop/colortitration/app/command/control/transfer/TitrationMoveTrayAreaCommand.java +++ b/src/main/java/com/iflytop/colortitration/app/command/control/transfer/TitrationMoveTrayAreaCommand.java @@ -1,6 +1,6 @@ package com.iflytop.colortitration.app.command.control.transfer; -import com.iflytop.colortitration.app.common.annotation.CommandDebugMapping; +import com.iflytop.colortitration.app.common.annotation.CommandMapping; import com.iflytop.colortitration.app.common.enums.MultipleModuleCode; import com.iflytop.colortitration.app.core.command.BaseCommandHandler; import com.iflytop.colortitration.app.core.state.DeviceState; @@ -22,7 +22,7 @@ import java.util.concurrent.CompletableFuture; @Slf4j @Component @RequiredArgsConstructor -@CommandDebugMapping("titration_move_tray_area") +@CommandMapping("titration_move_tray_area") public class TitrationMoveTrayAreaCommand extends BaseCommandHandler { private final DeviceState deviceState; private final TransferModuleService transferModuleService; diff --git a/src/main/java/com/iflytop/colortitration/app/command/control/transfer/TrayMoveTitrationAreaCommand.java b/src/main/java/com/iflytop/colortitration/app/command/control/transfer/TrayMoveTitrationAreaCommand.java index 2e8e6c2..3853803 100644 --- a/src/main/java/com/iflytop/colortitration/app/command/control/transfer/TrayMoveTitrationAreaCommand.java +++ b/src/main/java/com/iflytop/colortitration/app/command/control/transfer/TrayMoveTitrationAreaCommand.java @@ -1,6 +1,6 @@ package com.iflytop.colortitration.app.command.control.transfer; -import com.iflytop.colortitration.app.common.annotation.CommandDebugMapping; +import com.iflytop.colortitration.app.common.annotation.CommandMapping; import com.iflytop.colortitration.app.common.enums.MultipleModuleCode; import com.iflytop.colortitration.app.core.command.BaseCommandHandler; import com.iflytop.colortitration.app.core.state.DeviceState; @@ -22,7 +22,7 @@ import java.util.concurrent.CompletableFuture; @Slf4j @Component @RequiredArgsConstructor -@CommandDebugMapping("tray_move_titration_area") +@CommandMapping("tray_move_titration_area") public class TrayMoveTitrationAreaCommand extends BaseCommandHandler { private final DeviceState deviceState; private final TransferModuleService transferModuleService; diff --git a/src/main/java/com/iflytop/colortitration/app/command/debug/HeatRodCloseCommand.java b/src/main/java/com/iflytop/colortitration/app/command/debug/HeatRodCloseCommand.java index a368aca..52133ce 100644 --- a/src/main/java/com/iflytop/colortitration/app/command/debug/HeatRodCloseCommand.java +++ b/src/main/java/com/iflytop/colortitration/app/command/debug/HeatRodCloseCommand.java @@ -19,7 +19,7 @@ import java.util.concurrent.CompletableFuture; * 加热棒关闭 */ @Slf4j -@Component +@Component("HeatRodCloseDebugCommand") @RequiredArgsConstructor @CommandDebugMapping("heater_stop") public class HeatRodCloseCommand extends BaseCommandHandler { diff --git a/src/main/java/com/iflytop/colortitration/app/command/debug/HeatRodGetCommand.java b/src/main/java/com/iflytop/colortitration/app/command/debug/HeatRodGetCommand.java index d4e3b01..1126fa6 100644 --- a/src/main/java/com/iflytop/colortitration/app/command/debug/HeatRodGetCommand.java +++ b/src/main/java/com/iflytop/colortitration/app/command/debug/HeatRodGetCommand.java @@ -1,5 +1,6 @@ package com.iflytop.colortitration.app.command.debug; +import com.iflytop.colortitration.app.common.annotation.CommandDebugMapping; import com.iflytop.colortitration.app.core.command.BaseCommandHandler; import com.iflytop.colortitration.app.core.command.DeviceCommand; import com.iflytop.colortitration.app.core.command.DeviceCommandGenerator; @@ -20,6 +21,7 @@ import java.util.concurrent.CompletableFuture; @Slf4j @Component @RequiredArgsConstructor +@CommandDebugMapping("heater_start") public class HeatRodGetCommand extends BaseCommandHandler { private final DeviceCommandService deviceCommandService; diff --git a/src/main/java/com/iflytop/colortitration/app/command/debug/HeatRodOpenCommand.java b/src/main/java/com/iflytop/colortitration/app/command/debug/HeatRodOpenCommand.java index d25940c..1f19cd2 100644 --- a/src/main/java/com/iflytop/colortitration/app/command/debug/HeatRodOpenCommand.java +++ b/src/main/java/com/iflytop/colortitration/app/command/debug/HeatRodOpenCommand.java @@ -19,7 +19,7 @@ import java.util.concurrent.CompletableFuture; * 加热棒开启 */ @Slf4j -@Component +@Component("HeatRodOpenDebugCommand") @RequiredArgsConstructor @CommandDebugMapping("heater_start") public class HeatRodOpenCommand extends BaseCommandHandler {