feat:修改命令名称

src/main/java/com/iflytop/gd/app/controller/CmdController.java

@@ -25,10 +25,9 @@ public class CmdController {
     @Operation(summary = "前端统一调用一个接口")
     @PostMapping
     public Result<?> controlMethod(@RequestBody CmdDTO cmdDTO) {
-        String moduleName = cmdDTO.getModuleName();
-        String commandName = cmdDTO.getCommandName();
+        String commandName = cmdDTO.getCommand();
         try {
-            CommandHandler commandHandler = registry.getCommandHandler(moduleName, commandName);
+            CommandHandler commandHandler = registry.getCommandHandler(commandName);
             log.info("业务指令开始执行");
             commandHandler.handle(cmdDTO);
         } catch (UnSupportCommandException exception) {

src/main/java/com/iflytop/gd/app/model/dto/CmdDTO.java

@@ -17,12 +17,8 @@ public class CmdDTO {
     private String commandId;
 
     @NotBlank()
-    @Schema(description = "模块名称")
-    private String moduleName;
-
-    @NotBlank()
     @Schema(description = "命令名称")
-    private String commandName;
+    private String command;
 
     @Schema(description = "参数")
     private Map<String, Object> params;

src/main/java/com/iflytop/gd/app/service/cmd/CommandHandlerRegistry.java

@@ -36,7 +36,7 @@ public class CommandHandlerRegistry implements ApplicationContextAware {
             Class<?> targetClass = AopUtils.getTargetClass(bean);
             CommandMapping mapping = targetClass.getAnnotation(CommandMapping.class);
             if (mapping != null && bean instanceof CommandHandler) {
-                String mappingKey = generateCommandIdentifier(mapping.moduleName(), mapping.commandName());
+                String mappingKey = mapping.value();
                 handlerMap.put(mappingKey, (CommandHandler) bean);
             }
         }
@@ -44,17 +44,15 @@ public class CommandHandlerRegistry implements ApplicationContextAware {
 
     /**
      * 通过模块名称和命令名称获取命令处理器
-     * @param moduleName 模块名称
      * @param commandName 命令名称
      * @return 命令处理器
      * @throws UnSupportCommandException
      */
-    public CommandHandler getCommandHandler(@NotNull String moduleName, @NotNull String commandName) throws UnSupportCommandException {
-        String mappingKey = generateCommandIdentifier(moduleName, commandName);
-        if (!handlerMap.containsKey(mappingKey)) {
-            throw new UnSupportCommandException("moduleName=" + moduleName + "commandName=" + commandName);
+    public CommandHandler getCommandHandler(@NotNull String commandName) throws UnSupportCommandException {
+        if (!handlerMap.containsKey(commandName)) {
+            throw new UnSupportCommandException("commandName=" + commandName);
         }
-        return handlerMap.get(mappingKey);
+        return handlerMap.get(commandName);
     }
 
 

src/main/java/com/iflytop/gd/app/service/cmd/DemoCommand.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Component;
 @Slf4j
 @Component
 @RequiredArgsConstructor
-@CommandMapping(moduleName = "test_module", commandName = "test_command")//业务指令注解
+@CommandMapping("demo_command")//业务指令注解
 public class DemoCommand implements CommandHandler {
 
     @Override

src/main/java/com/iflytop/gd/common/annotation/CommandMapping.java

@@ -8,6 +8,5 @@ import java.lang.annotation.Target;
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
 public @interface CommandMapping {
-    String moduleName();
-    String commandName();
+    String value();
 }

src/main/java/com/iflytop/gd/debug/controller/CmdDebugController.java

@@ -25,15 +25,15 @@ public class CmdDebugController {
     @Operation(summary = "前端调试指令")
     @PostMapping
     public Result<?> controlMethod(@RequestBody CmdDTO cmdDTO) {
-        String moduleName = cmdDTO.getModuleName();
-        String commandName = cmdDTO.getCommandName();
+        String commandName = cmdDTO.getCommand();
         try {
-            CommandHandler commandHandler = registry.getCommandHandler(moduleName, commandName);
+            CommandHandler commandHandler = registry.getCommandHandler(commandName);
             log.info("业务指令开始执行");
             commandHandler.handle(cmdDTO);
         } catch (UnSupportCommandException exception) {
             log.error("未找到对应的业务指令");
-            return Result.failed(exception.getMessage());
+            String errorMsg = "未找到对应的业务指令, commandName=" + commandName;
+            return Result.failed(errorMsg);
         } catch (Exception e) {
             log.error("执行业务指令发生异常: {}", cmdDTO, e);
             return Result.failed(e.getMessage());

src/main/java/com/iflytop/gd/debug/services/cmds/CloseDoorCommandHandler.java

@@ -7,7 +7,7 @@ import com.iflytop.gd.common.cmd.CommandHandler;
 /**
  * 处理关门指令
  */
-@CommandMapping(moduleName = "door", commandName = "close")
+@CommandMapping("debug_door_close")
 public class CloseDoorCommandHandler implements CommandHandler {
     @Override
     public void handle(CmdDTO cmdDTO) {

src/main/java/com/iflytop/gd/debug/services/cmds/CloseHoldingJawCommandHandler.java

@@ -7,7 +7,7 @@ import com.iflytop.gd.common.cmd.CommandHandler;
 /**
  * 处理夹爪闭合指令
  */
-@CommandMapping(moduleName = "holdingJaw", commandName = "close")
+@CommandMapping("debug_holdingJaw_close")
 public class CloseHoldingJawCommandHandler implements CommandHandler {
     @Override
     public void handle(CmdDTO cmdDTO) {

src/main/java/com/iflytop/gd/debug/services/cmds/LiftDownPalletElvatorCommandHandler.java

@@ -6,10 +6,10 @@ import com.iflytop.gd.common.cmd.CommandHandler;
 
 
 /**
- * 处理降下托盘电机指令
+ * 处理降下托盘指令
  */
 
-@CommandMapping(moduleName = "palletElvator", commandName = "lift-down")
+@CommandMapping("debug_palletElvator_lift_down")
 public class LiftDownPalletElvatorCommandHandler implements CommandHandler {
     @Override
     public void handle(CmdDTO cmdDTO) {

src/main/java/com/iflytop/gd/debug/services/cmds/LiftUpPalletElvatorCommandHandler.java

@@ -7,7 +7,7 @@ import com.iflytop.gd.common.cmd.CommandHandler;
 /**
  * 处理托盘电机上升指令
  */
-@CommandMapping(moduleName = "palletElvator", commandName = "lift-up")
+@CommandMapping("debug_palletElvator_lift_up")
 public class LiftUpPalletElvatorCommandHandler implements CommandHandler {
     @Override
     public void handle(CmdDTO cmdDTO) {

src/main/java/com/iflytop/gd/debug/services/cmds/MoveTransportationArmCommandHandler.java

@@ -8,7 +8,7 @@ import com.iflytop.gd.common.cmd.CommandHandler;
  * 处理移动转移机械臂指令
  */
 
-@CommandMapping(moduleName = "transportationArm", commandName = "move")
+@CommandMapping("debug_transportationArm_move")
 public class MoveTransportationArmCommandHandler implements CommandHandler {
     @Override
     public void handle(CmdDTO cmdDTO) {

src/main/java/com/iflytop/gd/debug/services/cmds/OpenDoorCommandHandler.java

@@ -7,7 +7,7 @@ import com.iflytop.gd.common.cmd.CommandHandler;
 /**
  * 处理开门指令
  */
-@CommandMapping(moduleName = "door", commandName = "open")
+@CommandMapping("debug_door_open")
 public class OpenDoorCommandHandler implements CommandHandler {
 
     @Override

src/main/java/com/iflytop/gd/debug/services/cmds/OpenHoldingJawCommandHandler.java

@@ -7,7 +7,7 @@ import com.iflytop.gd.common.cmd.CommandHandler;
 /**
  * 处理打开夹爪指令
  */
-@CommandMapping(moduleName = "holdingJaw", commandName = "open")
+@CommandMapping("debug_holdingJaw_open")
 public class OpenHoldingJawCommandHandler implements CommandHandler {
     @Override
     public void handle(CmdDTO cmdDTO) {

src/main/java/com/iflytop/gd/debug/services/cmds/PauseHoldingJawCommandHandler.java

@@ -7,7 +7,7 @@ import com.iflytop.gd.common.cmd.CommandHandler;
 /**
  * 处理暂停夹爪指令
  */
-@CommandMapping(moduleName = "holdingJaw", commandName = "pause")
+@CommandMapping("debug_holdingJaw_pause")
 public class PauseHoldingJawCommandHandler implements CommandHandler {
     @Override
     public void handle(CmdDTO cmdDTO) {

src/main/java/com/iflytop/gd/debug/services/cmds/PreEvacuateLiquidPumpCommandHandler.java

@@ -8,7 +8,7 @@ import com.iflytop.gd.common.cmd.CommandHandler;
  * 处理排空加液头指令
  */
 
-@CommandMapping(moduleName = "liquidPump", commandName = "pre-evacuation")
+@CommandMapping("debug_liquidPump_pre_evacuation")
 public class PreEvacuateLiquidPumpCommandHandler implements CommandHandler {
     @Override
     public void handle(CmdDTO cmdDTO) {

src/main/java/com/iflytop/gd/debug/services/cmds/PrefillLiquidPumpCommandHandler.java

@@ -7,7 +7,7 @@ import com.iflytop.gd.common.cmd.CommandHandler;
 /**
  * 处理加液头预充指令
  */
-@CommandMapping(moduleName = "liquidPump", commandName = "pre-filling")
+@CommandMapping("debug_liquidPump_pre_filling")
 public class PrefillLiquidPumpCommandHandler implements CommandHandler {
     @Override
     public void handle(CmdDTO cmdDTO) {

src/main/java/com/iflytop/gd/debug/services/cmds/ResetLiquidArmCommandHandler.java

@@ -7,7 +7,7 @@ import com.iflytop.gd.common.cmd.CommandHandler;
 /**
  * 复位加液臂指令处理器
  */
-@CommandMapping(moduleName = "liquidArm", commandName = "reset")
+@CommandMapping("debug_liquidArm_reset")
 public class ResetLiquidArmCommandHandler implements CommandHandler {
     @Override
     public void handle(CmdDTO cmdDTO) {

src/main/java/com/iflytop/gd/debug/services/cmds/ResetTransportationArmCommandHandler.java

@@ -8,7 +8,7 @@ import com.iflytop.gd.common.cmd.CommandHandler;
  * 处理复位转移机械臂指令
  */
 
-@CommandMapping(moduleName = "transportationArm", commandName = "reset")
+@CommandMapping("debug_transportationArm_reset")
 public class ResetTransportationArmCommandHandler implements CommandHandler {
     @Override
     public void handle(CmdDTO cmdDTO) {

src/main/java/com/iflytop/gd/debug/services/cmds/RotateLiquidArmCommandHandler.java

@@ -8,7 +8,7 @@ import com.iflytop.gd.common.cmd.CommandHandler;
  * 处理加液臂旋转指令
  */
 
-@CommandMapping(moduleName = "liquidArm", commandName = "rotation")
+@CommandMapping("debug_liquidArm_rotation")
 public class RotateLiquidArmCommandHandler implements CommandHandler {
     @Override
     public void handle(CmdDTO cmdDTO) {

src/main/java/com/iflytop/gd/debug/services/cmds/StartColdTrapHeatingCommandHandler.java

@@ -4,7 +4,7 @@ import com.iflytop.gd.app.model.dto.CmdDTO;
 import com.iflytop.gd.common.annotation.CommandMapping;
 import com.iflytop.gd.common.cmd.CommandHandler;
 
-@CommandMapping(moduleName = "coldTrap", commandName = "start_heating")
+@CommandMapping("debug_coldTrap_start_heating")
 public class StartColdTrapHeatingCommandHandler implements CommandHandler {
     @Override
     public void handle(CmdDTO cmdDTO) {

src/main/java/com/iflytop/gd/debug/services/cmds/StartColdTrapRecycleCommandHandler.java

@@ -7,7 +7,7 @@ import com.iflytop.gd.common.cmd.CommandHandler;
 /**
  * 处理冷阱开启循环指令
  */
-@CommandMapping(moduleName = "coldTrap", commandName = "start_recycle")
+@CommandMapping("debug_coldTrap_start_recycle")
 public class StartColdTrapRecycleCommandHandler implements CommandHandler {
     @Override
     public void handle(CmdDTO cmdDTO) {

src/main/java/com/iflytop/gd/debug/services/cmds/StartHeatMaintainingCommandHandler.java

@@ -8,7 +8,7 @@ import com.iflytop.gd.common.cmd.CommandHandler;
  * 处理启动加热器恒温指令
  */
 
-@CommandMapping(moduleName = "heater", commandName = "start_heat-maintaining")
+@CommandMapping("debug_heater_start_heat_maintaining")
 public class StartHeatMaintainingCommandHandler implements CommandHandler {
     @Override
     public void handle(CmdDTO cmdDTO) {

src/main/java/com/iflytop/gd/debug/services/cmds/StartHeaterCommandHandler.java

@@ -8,7 +8,7 @@ import com.iflytop.gd.common.cmd.CommandHandler;
  * 处理启动加热器指令
  */
 
-@CommandMapping(moduleName = "heater", commandName = "start")
+@CommandMapping("debug_heater_start")
 public class StartHeaterCommandHandler implements CommandHandler {
     @Override
     public void handle(CmdDTO cmdDTO) {

src/main/java/com/iflytop/gd/debug/services/cmds/StartLiquidPumpCommandHandler.java

@@ -7,7 +7,7 @@ import com.iflytop.gd.common.cmd.CommandHandler;
 /**
  * 处理加液泵启动指令
  */
-@CommandMapping(moduleName = "liquidPump", commandName = "start")
+@CommandMapping("debug_liquidPump_start")
 public class StartLiquidPumpCommandHandler implements CommandHandler {
     @Override
     public void handle(CmdDTO cmdDTO) {

src/main/java/com/iflytop/gd/debug/services/cmds/StartRefrigerationCommandHandler.java

@@ -7,7 +7,7 @@ import com.iflytop.gd.common.cmd.CommandHandler;
 /**
  * 处理启动冷阱制冷指令
  */
-@CommandMapping(moduleName = "coldTrap", commandName = "start_refrigeration")
+@CommandMapping("debug_coldTrap_start_refrigeration")
 public class StartRefrigerationCommandHandler implements CommandHandler {
     @Override
     public void handle(CmdDTO cmdDTO) {

src/main/java/com/iflytop/gd/debug/services/cmds/StartShakerCommandHandler.java

@@ -7,7 +7,7 @@ import com.iflytop.gd.common.cmd.CommandHandler;
 /**
  * 处理启动摇匀器指令
  */
-@CommandMapping(moduleName = "shaker", commandName = "rotation")
+@CommandMapping("debug_shaker_start")
 public class StartShakerCommandHandler implements CommandHandler {
     @Override
     public void handle(CmdDTO cmdDTO) {

src/main/java/com/iflytop/gd/debug/services/cmds/StopColdTrapHeatingCommandHandler.java

@@ -8,7 +8,7 @@ import com.iflytop.gd.common.cmd.CommandHandler;
  * 处理冷阱停止加热指令
  */
 
-@CommandMapping(moduleName = "coldTrap", commandName = "stop_heating")
+@CommandMapping("debug_coldTrap_stop_heating")
 public class StopColdTrapHeatingCommandHandler implements CommandHandler {
     @Override
     public void handle(CmdDTO cmdDTO) {

src/main/java/com/iflytop/gd/debug/services/cmds/StopColdTrapRecycleCommandHandler.java

@@ -8,7 +8,7 @@ import com.iflytop.gd.common.cmd.CommandHandler;
  * 处理停止冷阱循环指令
  */
 
-@CommandMapping(moduleName = "coldTrap", commandName = "stop_recycle")
+@CommandMapping("debug_coldTrap_stop_recycle")
 public class StopColdTrapRecycleCommandHandler implements CommandHandler {
     @Override
     public void handle(CmdDTO cmdDTO) {

src/main/java/com/iflytop/gd/debug/services/cmds/StopDoorMovementCommandHandler.java

@@ -8,7 +8,7 @@ import com.iflytop.gd.common.cmd.CommandHandler;
  * 处理停止门运动指令处理器
  */
 
-@CommandMapping(moduleName = "door", commandName = "stop")
+@CommandMapping("debug_door_stop")
 public class StopDoorMovementCommandHandler implements CommandHandler {
     @Override
     public void handle(CmdDTO cmdDTO) {

src/main/java/com/iflytop/gd/debug/services/cmds/StopHeatMaintainingCommandHandler.java

@@ -7,7 +7,7 @@ import com.iflytop.gd.common.cmd.CommandHandler;
 /**
  * 处理停止恒温加热指令
  */
-@CommandMapping(moduleName = "heater", commandName = "stop_heat-maintaining")
+@CommandMapping("debug_heater_stop_heat_maintaining")
 public class StopHeatMaintainingCommandHandler implements CommandHandler {
     @Override
     public void handle(CmdDTO cmdDTO) {

src/main/java/com/iflytop/gd/debug/services/cmds/StopHeaterCommandHandler.java

@@ -8,7 +8,7 @@ import com.iflytop.gd.common.cmd.CommandHandler;
  * 处理停止加热器指令
  */
 
-@CommandMapping(moduleName = "heater", commandName = "stop")
+@CommandMapping("debug_heater_stop")
 public class StopHeaterCommandHandler implements CommandHandler {
     @Override
     public void handle(CmdDTO cmdDTO) {

src/main/java/com/iflytop/gd/debug/services/cmds/StopLiquidArmMovingCommandHandler.java

@@ -8,7 +8,7 @@ import com.iflytop.gd.common.cmd.CommandHandler;
  * 处理加液臂停止指令
  */
 
-@CommandMapping(moduleName = "liquidArm", commandName = "stop")
+@CommandMapping("debug_liquidArm_stop")
 public class StopLiquidArmMovingCommandHandler implements CommandHandler {
     @Override
     public void handle(CmdDTO cmdDTO) {

src/main/java/com/iflytop/gd/debug/services/cmds/StopLiquidPumpCommandHandler.java

@@ -7,7 +7,7 @@ import com.iflytop.gd.common.cmd.CommandHandler;
 /**
  * 处理加液泵停止指令
  */
-@CommandMapping(moduleName = "liquidPump", commandName = "stop")
+@CommandMapping("debug_liquidPump_stop")
 public class StopLiquidPumpCommandHandler implements CommandHandler {
     @Override
     public void handle(CmdDTO cmdDTO) {

src/main/java/com/iflytop/gd/debug/services/cmds/StopMovingTransportationArmCommandHandler.java

@@ -8,7 +8,7 @@ import com.iflytop.gd.common.cmd.CommandHandler;
  * 处理停止转移机械臂移动指令
  */
 
-@CommandMapping(moduleName = "transportationArm", commandName = "stop")
+@CommandMapping("debug_transportationArm_stop")
 public class StopMovingTransportationArmCommandHandler implements CommandHandler {
     @Override
     public void handle(CmdDTO cmdDTO) {

src/main/java/com/iflytop/gd/debug/services/cmds/StopPalletElvatorCommandHandler.java

@@ -9,7 +9,7 @@ import com.iflytop.gd.common.cmd.CommandHandler;
  * 处理停止托盘抬升器指令
  */
 
-@CommandMapping(moduleName = "palletElvator", commandName = "stop")
+@CommandMapping("debug_palletElvator_stop")
 public class StopPalletElvatorCommandHandler implements CommandHandler {
     @Override
     public void handle(CmdDTO cmdDTO) {

src/main/java/com/iflytop/gd/debug/services/cmds/StopRefrigerationCommandHandler.java

@@ -8,7 +8,7 @@ import com.iflytop.gd.common.cmd.CommandHandler;
  * 处理停止冷阱制冷指令
  */
 
-@CommandMapping(moduleName = "coldTrap", commandName = "stop_refrigeration")
+@CommandMapping("debug_coldTrap_stop_refrigeration")
 public class StopRefrigerationCommandHandler implements CommandHandler {
     @Override
     public void handle(CmdDTO cmdDTO) {

src/main/java/com/iflytop/gd/debug/services/cmds/StopShakerCommandHandler.java

@@ -8,7 +8,7 @@ import com.iflytop.gd.common.cmd.CommandHandler;
  * 处理停止摇匀器指令
  */
 
-@CommandMapping(moduleName = "shaker", commandName = "rotation")
+@CommandMapping("debug_shaker_stop")
 public class StopShakerCommandHandler implements CommandHandler {
     @Override
     public void handle(CmdDTO cmdDTO) {