Browse Source

调试指令使用单独的注解

master
白凤吉 2 months ago
parent
commit
f7b8fe60e0
  1. 4
      src/main/java/com/iflytop/sgs/app/cmd/debug/DebugDoorCloseCommand.java
  2. 4
      src/main/java/com/iflytop/sgs/app/cmd/debug/DebugDoorOpenCommand.java
  3. 4
      src/main/java/com/iflytop/sgs/app/cmd/debug/DebugDoorStopCommand.java
  4. 4
      src/main/java/com/iflytop/sgs/app/cmd/debug/DebugFanStartCommand.java
  5. 4
      src/main/java/com/iflytop/sgs/app/cmd/debug/DebugFanStopCommand.java
  6. 4
      src/main/java/com/iflytop/sgs/app/cmd/debug/DebugHeaterStartCommand.java
  7. 4
      src/main/java/com/iflytop/sgs/app/cmd/debug/DebugHeaterStopCommand.java
  8. 4
      src/main/java/com/iflytop/sgs/app/cmd/debug/DebugLiquidMotorMoveByCommand.java
  9. 4
      src/main/java/com/iflytop/sgs/app/cmd/debug/DebugLiquidMotorMoveToCommand.java
  10. 4
      src/main/java/com/iflytop/sgs/app/cmd/debug/DebugLiquidMotorOriginCommand.java
  11. 4
      src/main/java/com/iflytop/sgs/app/cmd/debug/DebugLiquidMotorStopCommand.java
  12. 4
      src/main/java/com/iflytop/sgs/app/cmd/debug/DebugLiquidPumpAddCommand.java
  13. 4
      src/main/java/com/iflytop/sgs/app/cmd/debug/DebugLiquidPumpMoveByCommand.java
  14. 4
      src/main/java/com/iflytop/sgs/app/cmd/debug/DebugLiquidPumpReduceCommand.java
  15. 4
      src/main/java/com/iflytop/sgs/app/cmd/debug/DebugLiquidPumpStartCommand.java
  16. 4
      src/main/java/com/iflytop/sgs/app/cmd/debug/DebugLiquidPumpStopCommand.java
  17. 4
      src/main/java/com/iflytop/sgs/app/cmd/debug/DebugLiquidValveOpenThickCommand.java
  18. 4
      src/main/java/com/iflytop/sgs/app/cmd/debug/DebugLiquidValveOpenThinCommand.java
  19. 4
      src/main/java/com/iflytop/sgs/app/cmd/debug/DebugLiquidValveOpenVacantCommand.java
  20. 4
      src/main/java/com/iflytop/sgs/app/cmd/debug/DebugLiquidValveOpenWasteCommand.java
  21. 4
      src/main/java/com/iflytop/sgs/app/cmd/debug/DebugLiquidValveOpenWaterCommand.java
  22. 4
      src/main/java/com/iflytop/sgs/app/cmd/debug/DebugMotorXMoveByCommand.java
  23. 4
      src/main/java/com/iflytop/sgs/app/cmd/debug/DebugMotorXMoveToCommand.java
  24. 4
      src/main/java/com/iflytop/sgs/app/cmd/debug/DebugMotorXOriginCommand.java
  25. 4
      src/main/java/com/iflytop/sgs/app/cmd/debug/DebugMotorXStopCommand.java
  26. 4
      src/main/java/com/iflytop/sgs/app/cmd/debug/DebugMotorZMoveByCommand.java
  27. 4
      src/main/java/com/iflytop/sgs/app/cmd/debug/DebugMotorZMoveToCommand.java
  28. 4
      src/main/java/com/iflytop/sgs/app/cmd/debug/DebugMotorZOriginCommand.java
  29. 4
      src/main/java/com/iflytop/sgs/app/cmd/debug/DebugMotorZStopCommand.java
  30. 4
      src/main/java/com/iflytop/sgs/app/cmd/debug/step/DebugDisabledAllMotorCommand.java
  31. 4
      src/main/java/com/iflytop/sgs/app/cmd/debug/step/DebugEnableAllMotorCommand.java
  32. 4
      src/main/java/com/iflytop/sgs/app/cmd/debug/step/DebugStopAllMotorCommand.java
  33. 59
      src/main/java/com/iflytop/sgs/app/core/CommandDebugHandlerRegistry.java
  34. 1
      src/main/java/com/iflytop/sgs/app/service/api/SystemConfigService.java
  35. 12
      src/main/java/com/iflytop/sgs/common/annotation/CommandDebugMapping.java

4
src/main/java/com/iflytop/sgs/app/cmd/debug/DebugDoorCloseCommand.java

@ -3,7 +3,7 @@ package com.iflytop.sgs.app.cmd.debug;
import com.iflytop.sgs.app.core.BaseCommandHandler;
import com.iflytop.sgs.app.model.dto.CmdDTO;
import com.iflytop.sgs.app.service.device.DeviceCommandService;
import com.iflytop.sgs.common.annotation.CommandMapping;
import com.iflytop.sgs.common.annotation.CommandDebugMapping;
import com.iflytop.sgs.common.cmd.CommandFuture;
import com.iflytop.sgs.common.cmd.DeviceCommandBundle;
import com.iflytop.sgs.common.cmd.DeviceCommandGenerator;
@ -20,7 +20,7 @@ import java.util.concurrent.CompletableFuture;
@Slf4j
@Component
@RequiredArgsConstructor
@CommandMapping("door_close")
@CommandDebugMapping("door_close")
public class DebugDoorCloseCommand extends BaseCommandHandler {
private final DeviceCommandService deviceCommandService;

4
src/main/java/com/iflytop/sgs/app/cmd/debug/DebugDoorOpenCommand.java

@ -5,7 +5,7 @@ import com.iflytop.sgs.app.model.dto.CmdDTO;
import com.iflytop.sgs.app.model.entity.DevicePosition;
import com.iflytop.sgs.app.service.api.DevicePositionService;
import com.iflytop.sgs.app.service.device.DeviceCommandService;
import com.iflytop.sgs.common.annotation.CommandMapping;
import com.iflytop.sgs.common.annotation.CommandDebugMapping;
import com.iflytop.sgs.common.cmd.CommandFuture;
import com.iflytop.sgs.common.cmd.DeviceCommandBundle;
import com.iflytop.sgs.common.cmd.DeviceCommandGenerator;
@ -23,7 +23,7 @@ import java.util.concurrent.CompletableFuture;
@Slf4j
@Component
@RequiredArgsConstructor
@CommandMapping("door_open")
@CommandDebugMapping("door_open")
public class DebugDoorOpenCommand extends BaseCommandHandler {
private final DeviceCommandService deviceCommandService;
private final DevicePositionService devicePositionService;

4
src/main/java/com/iflytop/sgs/app/cmd/debug/DebugDoorStopCommand.java

@ -3,7 +3,7 @@ package com.iflytop.sgs.app.cmd.debug;
import com.iflytop.sgs.app.core.BaseCommandHandler;
import com.iflytop.sgs.app.model.dto.CmdDTO;
import com.iflytop.sgs.app.service.device.DeviceCommandService;
import com.iflytop.sgs.common.annotation.CommandMapping;
import com.iflytop.sgs.common.annotation.CommandDebugMapping;
import com.iflytop.sgs.common.cmd.CommandFuture;
import com.iflytop.sgs.common.cmd.DeviceCommandBundle;
import com.iflytop.sgs.common.cmd.DeviceCommandGenerator;
@ -20,7 +20,7 @@ import java.util.concurrent.CompletableFuture;
@Slf4j
@Component
@RequiredArgsConstructor
@CommandMapping("door_stop")
@CommandDebugMapping("door_stop")
public class DebugDoorStopCommand extends BaseCommandHandler {
private final DeviceCommandService deviceCommandService;

4
src/main/java/com/iflytop/sgs/app/cmd/debug/DebugFanStartCommand.java

@ -3,7 +3,7 @@ package com.iflytop.sgs.app.cmd.debug;
import com.iflytop.sgs.app.core.BaseCommandHandler;
import com.iflytop.sgs.app.model.dto.CmdDTO;
import com.iflytop.sgs.app.service.device.DeviceCommandService;
import com.iflytop.sgs.common.annotation.CommandMapping;
import com.iflytop.sgs.common.annotation.CommandDebugMapping;
import com.iflytop.sgs.common.cmd.CommandFuture;
import com.iflytop.sgs.common.cmd.DeviceCommandBundle;
import com.iflytop.sgs.common.cmd.DeviceCommandGenerator;
@ -21,7 +21,7 @@ import java.util.concurrent.CompletableFuture;
@Slf4j
@Component
@RequiredArgsConstructor
@CommandMapping("fan_start")
@CommandDebugMapping("fan_start")
public class DebugFanStartCommand extends BaseCommandHandler {
private final DeviceCommandService deviceCommandService;

4
src/main/java/com/iflytop/sgs/app/cmd/debug/DebugFanStopCommand.java

@ -3,7 +3,7 @@ package com.iflytop.sgs.app.cmd.debug;
import com.iflytop.sgs.app.core.BaseCommandHandler;
import com.iflytop.sgs.app.model.dto.CmdDTO;
import com.iflytop.sgs.app.service.device.DeviceCommandService;
import com.iflytop.sgs.common.annotation.CommandMapping;
import com.iflytop.sgs.common.annotation.CommandDebugMapping;
import com.iflytop.sgs.common.cmd.CommandFuture;
import com.iflytop.sgs.common.cmd.DeviceCommandBundle;
import com.iflytop.sgs.common.cmd.DeviceCommandGenerator;
@ -21,7 +21,7 @@ import java.util.concurrent.CompletableFuture;
@Slf4j
@Component
@RequiredArgsConstructor
@CommandMapping("fan_stop")
@CommandDebugMapping("fan_stop")
public class DebugFanStopCommand extends BaseCommandHandler {
private final DeviceCommandService deviceCommandService;

4
src/main/java/com/iflytop/sgs/app/cmd/debug/DebugHeaterStartCommand.java

@ -3,7 +3,7 @@ package com.iflytop.sgs.app.cmd.debug;
import com.iflytop.sgs.app.core.BaseCommandHandler;
import com.iflytop.sgs.app.model.dto.CmdDTO;
import com.iflytop.sgs.app.service.device.DeviceCommandService;
import com.iflytop.sgs.common.annotation.CommandMapping;
import com.iflytop.sgs.common.annotation.CommandDebugMapping;
import com.iflytop.sgs.common.cmd.CommandFuture;
import com.iflytop.sgs.common.cmd.DeviceCommandBundle;
import com.iflytop.sgs.common.cmd.DeviceCommandGenerator;
@ -21,7 +21,7 @@ import java.util.concurrent.CompletableFuture;
@Slf4j
@Component
@RequiredArgsConstructor
@CommandMapping("heater_start")
@CommandDebugMapping("heater_start")
public class DebugHeaterStartCommand extends BaseCommandHandler {
private final DeviceCommandService deviceCommandService;

4
src/main/java/com/iflytop/sgs/app/cmd/debug/DebugHeaterStopCommand.java

@ -3,7 +3,7 @@ package com.iflytop.sgs.app.cmd.debug;
import com.iflytop.sgs.app.core.BaseCommandHandler;
import com.iflytop.sgs.app.model.dto.CmdDTO;
import com.iflytop.sgs.app.service.device.DeviceCommandService;
import com.iflytop.sgs.common.annotation.CommandMapping;
import com.iflytop.sgs.common.annotation.CommandDebugMapping;
import com.iflytop.sgs.common.cmd.CommandFuture;
import com.iflytop.sgs.common.cmd.DeviceCommandBundle;
import com.iflytop.sgs.common.cmd.DeviceCommandGenerator;
@ -21,7 +21,7 @@ import java.util.concurrent.CompletableFuture;
@Slf4j
@Component
@RequiredArgsConstructor
@CommandMapping("heater_stop")
@CommandDebugMapping("heater_stop")
public class DebugHeaterStopCommand extends BaseCommandHandler {
private final DeviceCommandService deviceCommandService;

4
src/main/java/com/iflytop/sgs/app/cmd/debug/DebugLiquidMotorMoveByCommand.java

@ -3,7 +3,7 @@ package com.iflytop.sgs.app.cmd.debug;
import com.iflytop.sgs.app.core.BaseCommandHandler;
import com.iflytop.sgs.app.model.dto.CmdDTO;
import com.iflytop.sgs.app.service.device.DeviceCommandService;
import com.iflytop.sgs.common.annotation.CommandMapping;
import com.iflytop.sgs.common.annotation.CommandDebugMapping;
import com.iflytop.sgs.common.cmd.CommandFuture;
import com.iflytop.sgs.common.cmd.DeviceCommandBundle;
import com.iflytop.sgs.common.cmd.DeviceCommandGenerator;
@ -20,7 +20,7 @@ import java.util.concurrent.CompletableFuture;
@Slf4j
@Component
@RequiredArgsConstructor
@CommandMapping("liquid_motor_move_by")
@CommandDebugMapping("liquid_motor_move_by")
public class DebugLiquidMotorMoveByCommand extends BaseCommandHandler {
private final DeviceCommandService deviceCommandService;
private boolean stop = false;

4
src/main/java/com/iflytop/sgs/app/cmd/debug/DebugLiquidMotorMoveToCommand.java

@ -3,7 +3,7 @@ package com.iflytop.sgs.app.cmd.debug;
import com.iflytop.sgs.app.core.BaseCommandHandler;
import com.iflytop.sgs.app.model.dto.CmdDTO;
import com.iflytop.sgs.app.service.device.DeviceCommandService;
import com.iflytop.sgs.common.annotation.CommandMapping;
import com.iflytop.sgs.common.annotation.CommandDebugMapping;
import com.iflytop.sgs.common.cmd.CommandFuture;
import com.iflytop.sgs.common.cmd.DeviceCommandBundle;
import com.iflytop.sgs.common.cmd.DeviceCommandGenerator;
@ -20,7 +20,7 @@ import java.util.concurrent.CompletableFuture;
@Slf4j
@Component
@RequiredArgsConstructor
@CommandMapping("liquid_motor_move")
@CommandDebugMapping("liquid_motor_move")
public class DebugLiquidMotorMoveToCommand extends BaseCommandHandler {
private final DeviceCommandService deviceCommandService;

4
src/main/java/com/iflytop/sgs/app/cmd/debug/DebugLiquidMotorOriginCommand.java

@ -3,7 +3,7 @@ package com.iflytop.sgs.app.cmd.debug;
import com.iflytop.sgs.app.core.BaseCommandHandler;
import com.iflytop.sgs.app.model.dto.CmdDTO;
import com.iflytop.sgs.app.service.device.DeviceCommandService;
import com.iflytop.sgs.common.annotation.CommandMapping;
import com.iflytop.sgs.common.annotation.CommandDebugMapping;
import com.iflytop.sgs.common.cmd.CommandFuture;
import com.iflytop.sgs.common.cmd.DeviceCommandBundle;
import com.iflytop.sgs.common.cmd.DeviceCommandGenerator;
@ -20,7 +20,7 @@ import java.util.concurrent.CompletableFuture;
@Slf4j
@Component
@RequiredArgsConstructor
@CommandMapping("liquid_motor_origin")
@CommandDebugMapping("liquid_motor_origin")
public class DebugLiquidMotorOriginCommand extends BaseCommandHandler {
private final DeviceCommandService deviceCommandService;

4
src/main/java/com/iflytop/sgs/app/cmd/debug/DebugLiquidMotorStopCommand.java

@ -3,7 +3,7 @@ package com.iflytop.sgs.app.cmd.debug;
import com.iflytop.sgs.app.core.BaseCommandHandler;
import com.iflytop.sgs.app.model.dto.CmdDTO;
import com.iflytop.sgs.app.service.device.DeviceCommandService;
import com.iflytop.sgs.common.annotation.CommandMapping;
import com.iflytop.sgs.common.annotation.CommandDebugMapping;
import com.iflytop.sgs.common.cmd.CommandFuture;
import com.iflytop.sgs.common.cmd.DeviceCommandBundle;
import com.iflytop.sgs.common.cmd.DeviceCommandGenerator;
@ -20,7 +20,7 @@ import java.util.concurrent.CompletableFuture;
@Slf4j
@Component
@RequiredArgsConstructor
@CommandMapping("liquid_motor_stop")
@CommandDebugMapping("liquid_motor_stop")
public class DebugLiquidMotorStopCommand extends BaseCommandHandler {
private final DeviceCommandService deviceCommandService;

4
src/main/java/com/iflytop/sgs/app/cmd/debug/DebugLiquidPumpAddCommand.java

@ -4,7 +4,7 @@ import com.iflytop.sgs.app.core.BaseCommandHandler;
import com.iflytop.sgs.app.model.dto.CmdDTO;
import com.iflytop.sgs.app.service.api.SystemConfigService;
import com.iflytop.sgs.app.service.device.DeviceCommandService;
import com.iflytop.sgs.common.annotation.CommandMapping;
import com.iflytop.sgs.common.annotation.CommandDebugMapping;
import com.iflytop.sgs.common.cmd.CommandFuture;
import com.iflytop.sgs.common.cmd.DeviceCommandBundle;
import com.iflytop.sgs.common.cmd.DeviceCommandGenerator;
@ -23,7 +23,7 @@ import java.util.concurrent.CompletableFuture;
@Slf4j
@Component
@RequiredArgsConstructor
@CommandMapping("liquid_pump_add")
@CommandDebugMapping("liquid_pump_add")
public class DebugLiquidPumpAddCommand extends BaseCommandHandler {
private final DeviceCommandService deviceCommandService;
private final SystemConfigService systemConfigService;

4
src/main/java/com/iflytop/sgs/app/cmd/debug/DebugLiquidPumpMoveByCommand.java

@ -3,7 +3,7 @@ package com.iflytop.sgs.app.cmd.debug;
import com.iflytop.sgs.app.core.BaseCommandHandler;
import com.iflytop.sgs.app.model.dto.CmdDTO;
import com.iflytop.sgs.app.service.device.DeviceCommandService;
import com.iflytop.sgs.common.annotation.CommandMapping;
import com.iflytop.sgs.common.annotation.CommandDebugMapping;
import com.iflytop.sgs.common.cmd.CommandFuture;
import com.iflytop.sgs.common.cmd.DeviceCommandBundle;
import com.iflytop.sgs.common.cmd.DeviceCommandGenerator;
@ -20,7 +20,7 @@ import java.util.concurrent.CompletableFuture;
@Slf4j
@Component
@RequiredArgsConstructor
@CommandMapping("liquid_pump_move_by")
@CommandDebugMapping("liquid_pump_move_by")
public class DebugLiquidPumpMoveByCommand extends BaseCommandHandler {
private final DeviceCommandService deviceCommandService;
private boolean stop = false;

4
src/main/java/com/iflytop/sgs/app/cmd/debug/DebugLiquidPumpReduceCommand.java

@ -3,7 +3,7 @@ package com.iflytop.sgs.app.cmd.debug;
import com.iflytop.sgs.app.core.BaseCommandHandler;
import com.iflytop.sgs.app.model.dto.CmdDTO;
import com.iflytop.sgs.app.service.device.DeviceCommandService;
import com.iflytop.sgs.common.annotation.CommandMapping;
import com.iflytop.sgs.common.annotation.CommandDebugMapping;
import com.iflytop.sgs.common.cmd.CommandFuture;
import com.iflytop.sgs.common.cmd.DeviceCommandBundle;
import com.iflytop.sgs.common.cmd.DeviceCommandGenerator;
@ -21,7 +21,7 @@ import java.util.concurrent.CompletableFuture;
@Slf4j
@Component
@RequiredArgsConstructor
@CommandMapping("liquid_pump_reduce")
@CommandDebugMapping("liquid_pump_reduce")
public class DebugLiquidPumpReduceCommand extends BaseCommandHandler {
private final DeviceCommandService deviceCommandService;

4
src/main/java/com/iflytop/sgs/app/cmd/debug/DebugLiquidPumpStartCommand.java

@ -3,7 +3,7 @@ package com.iflytop.sgs.app.cmd.debug;
import com.iflytop.sgs.app.core.BaseCommandHandler;
import com.iflytop.sgs.app.model.dto.CmdDTO;
import com.iflytop.sgs.app.service.device.DeviceCommandService;
import com.iflytop.sgs.common.annotation.CommandMapping;
import com.iflytop.sgs.common.annotation.CommandDebugMapping;
import com.iflytop.sgs.common.cmd.CommandFuture;
import com.iflytop.sgs.common.cmd.DeviceCommandBundle;
import com.iflytop.sgs.common.cmd.DeviceCommandGenerator;
@ -21,7 +21,7 @@ import java.util.concurrent.CompletableFuture;
@Slf4j
@Component
@RequiredArgsConstructor
@CommandMapping("liquid_pump_start")
@CommandDebugMapping("liquid_pump_start")
public class DebugLiquidPumpStartCommand extends BaseCommandHandler {
private final DeviceCommandService deviceCommandService;

4
src/main/java/com/iflytop/sgs/app/cmd/debug/DebugLiquidPumpStopCommand.java

@ -3,7 +3,7 @@ package com.iflytop.sgs.app.cmd.debug;
import com.iflytop.sgs.app.core.BaseCommandHandler;
import com.iflytop.sgs.app.model.dto.CmdDTO;
import com.iflytop.sgs.app.service.device.DeviceCommandService;
import com.iflytop.sgs.common.annotation.CommandMapping;
import com.iflytop.sgs.common.annotation.CommandDebugMapping;
import com.iflytop.sgs.common.cmd.CommandFuture;
import com.iflytop.sgs.common.cmd.DeviceCommandBundle;
import com.iflytop.sgs.common.cmd.DeviceCommandGenerator;
@ -20,7 +20,7 @@ import java.util.concurrent.CompletableFuture;
@Slf4j
@Component
@RequiredArgsConstructor
@CommandMapping("liquid_pump_stop")
@CommandDebugMapping("liquid_pump_stop")
public class DebugLiquidPumpStopCommand extends BaseCommandHandler {
private final DeviceCommandService deviceCommandService;

4
src/main/java/com/iflytop/sgs/app/cmd/debug/DebugLiquidValveOpenThickCommand.java

@ -3,7 +3,7 @@ package com.iflytop.sgs.app.cmd.debug;
import com.iflytop.sgs.app.core.BaseCommandHandler;
import com.iflytop.sgs.app.model.dto.CmdDTO;
import com.iflytop.sgs.app.service.device.DeviceCommandService;
import com.iflytop.sgs.common.annotation.CommandMapping;
import com.iflytop.sgs.common.annotation.CommandDebugMapping;
import com.iflytop.sgs.common.cmd.CommandFuture;
import com.iflytop.sgs.common.cmd.DeviceCommandBundle;
import com.iflytop.sgs.common.cmd.DeviceCommandGenerator;
@ -20,7 +20,7 @@ import java.util.concurrent.CompletableFuture;
@Slf4j
@Component
@RequiredArgsConstructor
@CommandMapping("liquid_valve_open_thick")
@CommandDebugMapping("liquid_valve_open_thick")
public class DebugLiquidValveOpenThickCommand extends BaseCommandHandler {
private final DeviceCommandService deviceCommandService;

4
src/main/java/com/iflytop/sgs/app/cmd/debug/DebugLiquidValveOpenThinCommand.java

@ -3,7 +3,7 @@ package com.iflytop.sgs.app.cmd.debug;
import com.iflytop.sgs.app.core.BaseCommandHandler;
import com.iflytop.sgs.app.model.dto.CmdDTO;
import com.iflytop.sgs.app.service.device.DeviceCommandService;
import com.iflytop.sgs.common.annotation.CommandMapping;
import com.iflytop.sgs.common.annotation.CommandDebugMapping;
import com.iflytop.sgs.common.cmd.CommandFuture;
import com.iflytop.sgs.common.cmd.DeviceCommandBundle;
import com.iflytop.sgs.common.cmd.DeviceCommandGenerator;
@ -20,7 +20,7 @@ import java.util.concurrent.CompletableFuture;
@Slf4j
@Component
@RequiredArgsConstructor
@CommandMapping("liquid_valve_open_thin")
@CommandDebugMapping("liquid_valve_open_thin")
public class DebugLiquidValveOpenThinCommand extends BaseCommandHandler {
private final DeviceCommandService deviceCommandService;

4
src/main/java/com/iflytop/sgs/app/cmd/debug/DebugLiquidValveOpenVacantCommand.java

@ -3,7 +3,7 @@ package com.iflytop.sgs.app.cmd.debug;
import com.iflytop.sgs.app.core.BaseCommandHandler;
import com.iflytop.sgs.app.model.dto.CmdDTO;
import com.iflytop.sgs.app.service.device.DeviceCommandService;
import com.iflytop.sgs.common.annotation.CommandMapping;
import com.iflytop.sgs.common.annotation.CommandDebugMapping;
import com.iflytop.sgs.common.cmd.CommandFuture;
import com.iflytop.sgs.common.cmd.DeviceCommandBundle;
import com.iflytop.sgs.common.cmd.DeviceCommandGenerator;
@ -20,7 +20,7 @@ import java.util.concurrent.CompletableFuture;
@Slf4j
@Component
@RequiredArgsConstructor
@CommandMapping("liquid_valve_open_vacant")
@CommandDebugMapping("liquid_valve_open_vacant")
public class DebugLiquidValveOpenVacantCommand extends BaseCommandHandler {
private final DeviceCommandService deviceCommandService;

4
src/main/java/com/iflytop/sgs/app/cmd/debug/DebugLiquidValveOpenWasteCommand.java

@ -3,7 +3,7 @@ package com.iflytop.sgs.app.cmd.debug;
import com.iflytop.sgs.app.core.BaseCommandHandler;
import com.iflytop.sgs.app.model.dto.CmdDTO;
import com.iflytop.sgs.app.service.device.DeviceCommandService;
import com.iflytop.sgs.common.annotation.CommandMapping;
import com.iflytop.sgs.common.annotation.CommandDebugMapping;
import com.iflytop.sgs.common.cmd.CommandFuture;
import com.iflytop.sgs.common.cmd.DeviceCommandBundle;
import com.iflytop.sgs.common.cmd.DeviceCommandGenerator;
@ -20,7 +20,7 @@ import java.util.concurrent.CompletableFuture;
@Slf4j
@Component
@RequiredArgsConstructor
@CommandMapping("liquid_valve_open_waste")
@CommandDebugMapping("liquid_valve_open_waste")
public class DebugLiquidValveOpenWasteCommand extends BaseCommandHandler {
private final DeviceCommandService deviceCommandService;

4
src/main/java/com/iflytop/sgs/app/cmd/debug/DebugLiquidValveOpenWaterCommand.java

@ -3,7 +3,7 @@ package com.iflytop.sgs.app.cmd.debug;
import com.iflytop.sgs.app.core.BaseCommandHandler;
import com.iflytop.sgs.app.model.dto.CmdDTO;
import com.iflytop.sgs.app.service.device.DeviceCommandService;
import com.iflytop.sgs.common.annotation.CommandMapping;
import com.iflytop.sgs.common.annotation.CommandDebugMapping;
import com.iflytop.sgs.common.cmd.CommandFuture;
import com.iflytop.sgs.common.cmd.DeviceCommandBundle;
import com.iflytop.sgs.common.cmd.DeviceCommandGenerator;
@ -20,7 +20,7 @@ import java.util.concurrent.CompletableFuture;
@Slf4j
@Component
@RequiredArgsConstructor
@CommandMapping("liquid_valve_open_water")
@CommandDebugMapping("liquid_valve_open_water")
public class DebugLiquidValveOpenWaterCommand extends BaseCommandHandler {
private final DeviceCommandService deviceCommandService;

4
src/main/java/com/iflytop/sgs/app/cmd/debug/DebugMotorXMoveByCommand.java

@ -3,7 +3,7 @@ package com.iflytop.sgs.app.cmd.debug;
import com.iflytop.sgs.app.core.BaseCommandHandler;
import com.iflytop.sgs.app.model.dto.CmdDTO;
import com.iflytop.sgs.app.service.device.DeviceCommandService;
import com.iflytop.sgs.common.annotation.CommandMapping;
import com.iflytop.sgs.common.annotation.CommandDebugMapping;
import com.iflytop.sgs.common.cmd.CommandFuture;
import com.iflytop.sgs.common.cmd.DeviceCommandBundle;
import com.iflytop.sgs.common.cmd.DeviceCommandGenerator;
@ -20,7 +20,7 @@ import java.util.concurrent.CompletableFuture;
@Slf4j
@Component
@RequiredArgsConstructor
@CommandMapping("x_move_by")
@CommandDebugMapping("x_move_by")
public class DebugMotorXMoveByCommand extends BaseCommandHandler {
private final DeviceCommandService deviceCommandService;
private boolean stop = false;

4
src/main/java/com/iflytop/sgs/app/cmd/debug/DebugMotorXMoveToCommand.java

@ -3,7 +3,7 @@ package com.iflytop.sgs.app.cmd.debug;
import com.iflytop.sgs.app.core.BaseCommandHandler;
import com.iflytop.sgs.app.model.dto.CmdDTO;
import com.iflytop.sgs.app.service.device.DeviceCommandService;
import com.iflytop.sgs.common.annotation.CommandMapping;
import com.iflytop.sgs.common.annotation.CommandDebugMapping;
import com.iflytop.sgs.common.cmd.CommandFuture;
import com.iflytop.sgs.common.cmd.DeviceCommandBundle;
import com.iflytop.sgs.common.cmd.DeviceCommandGenerator;
@ -20,7 +20,7 @@ import java.util.concurrent.CompletableFuture;
@Slf4j
@Component
@RequiredArgsConstructor
@CommandMapping("x_move_to")
@CommandDebugMapping("x_move_to")
public class DebugMotorXMoveToCommand extends BaseCommandHandler {
private final DeviceCommandService deviceCommandService;

4
src/main/java/com/iflytop/sgs/app/cmd/debug/DebugMotorXOriginCommand.java

@ -3,7 +3,7 @@ package com.iflytop.sgs.app.cmd.debug;
import com.iflytop.sgs.app.core.BaseCommandHandler;
import com.iflytop.sgs.app.model.dto.CmdDTO;
import com.iflytop.sgs.app.service.device.DeviceCommandService;
import com.iflytop.sgs.common.annotation.CommandMapping;
import com.iflytop.sgs.common.annotation.CommandDebugMapping;
import com.iflytop.sgs.common.cmd.CommandFuture;
import com.iflytop.sgs.common.cmd.DeviceCommandBundle;
import com.iflytop.sgs.common.cmd.DeviceCommandGenerator;
@ -20,7 +20,7 @@ import java.util.concurrent.CompletableFuture;
@Slf4j
@Component
@RequiredArgsConstructor
@CommandMapping("x_origin")
@CommandDebugMapping("x_origin")
public class DebugMotorXOriginCommand extends BaseCommandHandler {
private final DeviceCommandService deviceCommandService;

4
src/main/java/com/iflytop/sgs/app/cmd/debug/DebugMotorXStopCommand.java

@ -3,7 +3,7 @@ package com.iflytop.sgs.app.cmd.debug;
import com.iflytop.sgs.app.core.BaseCommandHandler;
import com.iflytop.sgs.app.model.dto.CmdDTO;
import com.iflytop.sgs.app.service.device.DeviceCommandService;
import com.iflytop.sgs.common.annotation.CommandMapping;
import com.iflytop.sgs.common.annotation.CommandDebugMapping;
import com.iflytop.sgs.common.cmd.CommandFuture;
import com.iflytop.sgs.common.cmd.DeviceCommandBundle;
import com.iflytop.sgs.common.cmd.DeviceCommandGenerator;
@ -20,7 +20,7 @@ import java.util.concurrent.CompletableFuture;
@Slf4j
@Component
@RequiredArgsConstructor
@CommandMapping("x_stop")
@CommandDebugMapping("x_stop")
public class DebugMotorXStopCommand extends BaseCommandHandler {
private final DeviceCommandService deviceCommandService;

4
src/main/java/com/iflytop/sgs/app/cmd/debug/DebugMotorZMoveByCommand.java

@ -3,7 +3,7 @@ package com.iflytop.sgs.app.cmd.debug;
import com.iflytop.sgs.app.core.BaseCommandHandler;
import com.iflytop.sgs.app.model.dto.CmdDTO;
import com.iflytop.sgs.app.service.device.DeviceCommandService;
import com.iflytop.sgs.common.annotation.CommandMapping;
import com.iflytop.sgs.common.annotation.CommandDebugMapping;
import com.iflytop.sgs.common.cmd.CommandFuture;
import com.iflytop.sgs.common.cmd.DeviceCommandBundle;
import com.iflytop.sgs.common.cmd.DeviceCommandGenerator;
@ -20,7 +20,7 @@ import java.util.concurrent.CompletableFuture;
@Slf4j
@Component
@RequiredArgsConstructor
@CommandMapping("z_move_by")
@CommandDebugMapping("z_move_by")
public class DebugMotorZMoveByCommand extends BaseCommandHandler {
private final DeviceCommandService deviceCommandService;
private boolean stop = false;

4
src/main/java/com/iflytop/sgs/app/cmd/debug/DebugMotorZMoveToCommand.java

@ -3,7 +3,7 @@ package com.iflytop.sgs.app.cmd.debug;
import com.iflytop.sgs.app.core.BaseCommandHandler;
import com.iflytop.sgs.app.model.dto.CmdDTO;
import com.iflytop.sgs.app.service.device.DeviceCommandService;
import com.iflytop.sgs.common.annotation.CommandMapping;
import com.iflytop.sgs.common.annotation.CommandDebugMapping;
import com.iflytop.sgs.common.cmd.CommandFuture;
import com.iflytop.sgs.common.cmd.DeviceCommandBundle;
import com.iflytop.sgs.common.cmd.DeviceCommandGenerator;
@ -20,7 +20,7 @@ import java.util.concurrent.CompletableFuture;
@Slf4j
@Component
@RequiredArgsConstructor
@CommandMapping("z_move_to")
@CommandDebugMapping("z_move_to")
public class DebugMotorZMoveToCommand extends BaseCommandHandler {
private final DeviceCommandService deviceCommandService;

4
src/main/java/com/iflytop/sgs/app/cmd/debug/DebugMotorZOriginCommand.java

@ -3,7 +3,7 @@ package com.iflytop.sgs.app.cmd.debug;
import com.iflytop.sgs.app.core.BaseCommandHandler;
import com.iflytop.sgs.app.model.dto.CmdDTO;
import com.iflytop.sgs.app.service.device.DeviceCommandService;
import com.iflytop.sgs.common.annotation.CommandMapping;
import com.iflytop.sgs.common.annotation.CommandDebugMapping;
import com.iflytop.sgs.common.cmd.CommandFuture;
import com.iflytop.sgs.common.cmd.DeviceCommandBundle;
import com.iflytop.sgs.common.cmd.DeviceCommandGenerator;
@ -20,7 +20,7 @@ import java.util.concurrent.CompletableFuture;
@Slf4j
@Component
@RequiredArgsConstructor
@CommandMapping("z_origin")
@CommandDebugMapping("z_origin")
public class DebugMotorZOriginCommand extends BaseCommandHandler {
private final DeviceCommandService deviceCommandService;

4
src/main/java/com/iflytop/sgs/app/cmd/debug/DebugMotorZStopCommand.java

@ -3,7 +3,7 @@ package com.iflytop.sgs.app.cmd.debug;
import com.iflytop.sgs.app.core.BaseCommandHandler;
import com.iflytop.sgs.app.model.dto.CmdDTO;
import com.iflytop.sgs.app.service.device.DeviceCommandService;
import com.iflytop.sgs.common.annotation.CommandMapping;
import com.iflytop.sgs.common.annotation.CommandDebugMapping;
import com.iflytop.sgs.common.cmd.CommandFuture;
import com.iflytop.sgs.common.cmd.DeviceCommandBundle;
import com.iflytop.sgs.common.cmd.DeviceCommandGenerator;
@ -20,7 +20,7 @@ import java.util.concurrent.CompletableFuture;
@Slf4j
@Component
@RequiredArgsConstructor
@CommandMapping("z_stop")
@CommandDebugMapping("z_stop")
public class DebugMotorZStopCommand extends BaseCommandHandler {
private final DeviceCommandService deviceCommandService;

4
src/main/java/com/iflytop/sgs/app/cmd/debug/step/DebugDisabledAllMotorCommand.java

@ -3,7 +3,7 @@ package com.iflytop.sgs.app.cmd.debug.step;
import com.iflytop.sgs.app.core.BaseCommandHandler;
import com.iflytop.sgs.app.model.dto.CmdDTO;
import com.iflytop.sgs.app.service.device.StepCommandService;
import com.iflytop.sgs.common.annotation.CommandMapping;
import com.iflytop.sgs.common.annotation.CommandDebugMapping;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
@ -16,7 +16,7 @@ import java.util.concurrent.CompletableFuture;
@Slf4j
@Component
@RequiredArgsConstructor
@CommandMapping("debug_disabled_all_motor")
@CommandDebugMapping("debug_disabled_all_motor")
public class DebugDisabledAllMotorCommand extends BaseCommandHandler {
private final StepCommandService stepCommandService;

4
src/main/java/com/iflytop/sgs/app/cmd/debug/step/DebugEnableAllMotorCommand.java

@ -3,7 +3,7 @@ package com.iflytop.sgs.app.cmd.debug.step;
import com.iflytop.sgs.app.core.BaseCommandHandler;
import com.iflytop.sgs.app.model.dto.CmdDTO;
import com.iflytop.sgs.app.service.device.StepCommandService;
import com.iflytop.sgs.common.annotation.CommandMapping;
import com.iflytop.sgs.common.annotation.CommandDebugMapping;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
@ -16,7 +16,7 @@ import java.util.concurrent.CompletableFuture;
@Slf4j
@Component
@RequiredArgsConstructor
@CommandMapping("debug_enable_all_motor")
@CommandDebugMapping("debug_enable_all_motor")
public class DebugEnableAllMotorCommand extends BaseCommandHandler {
private final StepCommandService stepCommandService;

4
src/main/java/com/iflytop/sgs/app/cmd/debug/step/DebugStopAllMotorCommand.java

@ -3,7 +3,7 @@ package com.iflytop.sgs.app.cmd.debug.step;
import com.iflytop.sgs.app.core.BaseCommandHandler;
import com.iflytop.sgs.app.model.dto.CmdDTO;
import com.iflytop.sgs.app.service.device.StepCommandService;
import com.iflytop.sgs.common.annotation.CommandMapping;
import com.iflytop.sgs.common.annotation.CommandDebugMapping;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
@ -16,7 +16,7 @@ import java.util.concurrent.CompletableFuture;
@Slf4j
@Component
@RequiredArgsConstructor
@CommandMapping("debug_stop_all_motor")
@CommandDebugMapping("debug_stop_all_motor")
public class DebugStopAllMotorCommand extends BaseCommandHandler {
private final StepCommandService stepCommandService;

59
src/main/java/com/iflytop/sgs/app/core/CommandDebugHandlerRegistry.java

@ -0,0 +1,59 @@
package com.iflytop.sgs.app.core;
import com.iflytop.sgs.common.annotation.CommandDebugMapping;
import com.iflytop.sgs.common.annotation.CommandMapping;
import com.iflytop.sgs.common.cmd.CommandHandler;
import com.iflytop.sgs.common.exception.AppException;
import com.iflytop.sgs.common.exception.UnSupportCommandException;
import com.iflytop.sgs.common.result.ResultCode;
import io.micrometer.common.lang.NonNull;
import jakarta.annotation.PostConstruct;
import jakarta.validation.constraints.NotNull;
import org.springframework.aop.support.AopUtils;
import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
import org.springframework.stereotype.Component;
import java.util.HashMap;
import java.util.Map;
@Component
public class CommandDebugHandlerRegistry implements ApplicationContextAware {
private final Map<String, CommandHandler> handlerMap = new HashMap<>();
private ApplicationContext applicationContext;
@Override
public void setApplicationContext(@NonNull ApplicationContext applicationContext) throws BeansException {
this.applicationContext = applicationContext;
}
@PostConstruct
public void init() {
Map<String, Object> beans = applicationContext.getBeansWithAnnotation(CommandDebugMapping.class);
for (Object bean : beans.values()) {
// 获取实际目标类而不是代理类
Class<?> targetClass = AopUtils.getTargetClass(bean);
CommandDebugMapping mapping = targetClass.getAnnotation(CommandDebugMapping.class);
if (mapping != null && bean instanceof CommandHandler) {
String mappingKey = mapping.value();
handlerMap.put(mappingKey, (CommandHandler) bean);
}
}
}
/**
* 通过模块名称和命令名称获取命令处理器
*
* @param commandName 命令名称
* @return 命令处理器
* @throws UnSupportCommandException
*/
public CommandHandler getCommandHandler(@NotNull String commandName) throws UnSupportCommandException {
if (!handlerMap.containsKey(commandName)) {
throw new AppException(ResultCode.COMMAND_NOT_FOUND);
}
return handlerMap.get(commandName);
}
}

1
src/main/java/com/iflytop/sgs/app/service/api/SystemConfigService.java

@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.iflytop.sgs.app.mapper.SystemConfigMapper;
import com.iflytop.sgs.app.model.entity.SystemConfig;
import com.iflytop.sgs.app.service.device.DeviceStateService;
import com.iflytop.sgs.common.enums.ScaleCode;
import com.iflytop.sgs.common.enums.SystemConfigCode;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;

12
src/main/java/com/iflytop/sgs/common/annotation/CommandDebugMapping.java

@ -0,0 +1,12 @@
package com.iflytop.sgs.common.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.TYPE)
public @interface CommandDebugMapping {
String value();
}
Loading…
Cancel
Save