修改注解

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;

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;

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;

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;

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 {

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;
 

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 {