Browse Source

fix:调整项目结构

master
白凤吉 3 months ago
parent
commit
312e99636e
  1. 21
      src/main/java/com/iflytop/gd/app/cmd/DemoCommand.java
  2. 6
      src/main/java/com/iflytop/gd/app/cmd/debug/ColdTrapStartHeatingCommandHandler.java
  3. 3
      src/main/java/com/iflytop/gd/app/cmd/debug/ColdTrapStartRecycleCommandHandler.java
  4. 3
      src/main/java/com/iflytop/gd/app/cmd/debug/ColdTrapStartRefrigerationCommandHandler.java
  5. 3
      src/main/java/com/iflytop/gd/app/cmd/debug/ColdTrapStopHeatingCommandHandler.java
  6. 3
      src/main/java/com/iflytop/gd/app/cmd/debug/ColdTrapStopRecycleCommandHandler.java
  7. 3
      src/main/java/com/iflytop/gd/app/cmd/debug/ColdTrapStopRefrigerationCommandHandler.java
  8. 7
      src/main/java/com/iflytop/gd/app/cmd/debug/CoverElevatorLiftDownCommandHandler.java
  9. 3
      src/main/java/com/iflytop/gd/app/cmd/debug/CoverElevatorLiftUpCommandHandler.java
  10. 3
      src/main/java/com/iflytop/gd/app/cmd/debug/CoverElevatorResetCommandHandler.java
  11. 3
      src/main/java/com/iflytop/gd/app/cmd/debug/CoverElevatorStopCommandHandler.java
  12. 4
      src/main/java/com/iflytop/gd/app/cmd/debug/DoorCloseCommandHandler.java
  13. 6
      src/main/java/com/iflytop/gd/app/cmd/debug/DoorOpenCommandHandler.java
  14. 4
      src/main/java/com/iflytop/gd/app/cmd/debug/DoorStopCommandHandler.java
  15. 3
      src/main/java/com/iflytop/gd/app/cmd/debug/HeaterStartCommandHandler.java
  16. 3
      src/main/java/com/iflytop/gd/app/cmd/debug/HeaterStartHeatMaintainingCommandHandler.java
  17. 3
      src/main/java/com/iflytop/gd/app/cmd/debug/HeaterStopCommandHandler.java
  18. 3
      src/main/java/com/iflytop/gd/app/cmd/debug/HeaterStopMaintainingCommandHandler.java
  19. 3
      src/main/java/com/iflytop/gd/app/cmd/debug/HoldingJawCloseCommandHandler.java
  20. 3
      src/main/java/com/iflytop/gd/app/cmd/debug/HoldingJawOpenCommandHandler.java
  21. 3
      src/main/java/com/iflytop/gd/app/cmd/debug/HoldingJawPauseCommandHandler.java
  22. 3
      src/main/java/com/iflytop/gd/app/cmd/debug/LiquidArmResetCommandHandler.java
  23. 3
      src/main/java/com/iflytop/gd/app/cmd/debug/LiquidArmRotateCommandHandler.java
  24. 3
      src/main/java/com/iflytop/gd/app/cmd/debug/LiquidArmStopCommandHandler.java
  25. 3
      src/main/java/com/iflytop/gd/app/cmd/debug/LiquidPumpPreEvacuateCommandHandler.java
  26. 3
      src/main/java/com/iflytop/gd/app/cmd/debug/LiquidPumpPrefillCommandHandler.java
  27. 3
      src/main/java/com/iflytop/gd/app/cmd/debug/LiquidPumpStartCommandHandler.java
  28. 3
      src/main/java/com/iflytop/gd/app/cmd/debug/LiquidPumpStopCommandHandler.java
  29. 3
      src/main/java/com/iflytop/gd/app/cmd/debug/PalletElevatorLiftDownCommandHandler.java
  30. 3
      src/main/java/com/iflytop/gd/app/cmd/debug/PalletElevatorLiftUpCommandHandler.java
  31. 3
      src/main/java/com/iflytop/gd/app/cmd/debug/PalletElevatorStopCommandHandler.java
  32. 3
      src/main/java/com/iflytop/gd/app/cmd/debug/ShakerStartCommandHandler.java
  33. 3
      src/main/java/com/iflytop/gd/app/cmd/debug/ShakerStopCommandHandler.java
  34. 3
      src/main/java/com/iflytop/gd/app/cmd/debug/TransportationArmMoveCommandHandler.java
  35. 3
      src/main/java/com/iflytop/gd/app/cmd/debug/TransportationArmResetCommandHandler.java
  36. 3
      src/main/java/com/iflytop/gd/app/cmd/debug/TransportationArmStopCommandHandler.java
  37. 4
      src/main/java/com/iflytop/gd/app/config/CraftsStateMachineConfig.java
  38. 2
      src/main/java/com/iflytop/gd/app/config/MybatisPlusConfig.java
  39. 2
      src/main/java/com/iflytop/gd/app/config/SwaggerConfig.java
  40. 2
      src/main/java/com/iflytop/gd/app/config/WebConfig.java
  41. 2
      src/main/java/com/iflytop/gd/app/config/WebSocketConfig.java
  42. 2
      src/main/java/com/iflytop/gd/app/config/WebSocketServer.java
  43. 4
      src/main/java/com/iflytop/gd/app/controller/AuthController.java
  44. 2
      src/main/java/com/iflytop/gd/app/controller/CmdController.java
  45. 5
      src/main/java/com/iflytop/gd/app/controller/CmdDebugController.java
  46. 2
      src/main/java/com/iflytop/gd/app/controller/OresController.java
  47. 2
      src/main/java/com/iflytop/gd/app/controller/SolutionsController.java
  48. 6
      src/main/java/com/iflytop/gd/app/controller/UserController.java
  49. 2
      src/main/java/com/iflytop/gd/app/core/BaseCommandHandler.java
  50. 2
      src/main/java/com/iflytop/gd/app/core/CommandHandlerRegistry.java
  51. 4
      src/main/java/com/iflytop/gd/app/core/CraftsContext.java
  52. 4
      src/main/java/com/iflytop/gd/app/mapper/UserMapper.java
  53. 2
      src/main/java/com/iflytop/gd/app/model/bo/Notification.java
  54. 2
      src/main/java/com/iflytop/gd/app/model/bo/Point3D.java
  55. 2
      src/main/java/com/iflytop/gd/app/model/entity/Container.java
  56. 2
      src/main/java/com/iflytop/gd/app/model/entity/Crafts.java
  57. 2
      src/main/java/com/iflytop/gd/app/model/entity/DeviceParamConfig.java
  58. 3
      src/main/java/com/iflytop/gd/app/model/entity/Ores.java
  59. 3
      src/main/java/com/iflytop/gd/app/model/entity/Solutions.java
  60. 2
      src/main/java/com/iflytop/gd/app/model/entity/SystemConfig.java
  61. 5
      src/main/java/com/iflytop/gd/app/model/entity/User.java
  62. 2
      src/main/java/com/iflytop/gd/app/model/vo/CraftStatusVO.java
  63. 4
      src/main/java/com/iflytop/gd/app/service/CraftsService.java
  64. 4
      src/main/java/com/iflytop/gd/app/service/DeviceParamConfigService.java
  65. 2
      src/main/java/com/iflytop/gd/app/service/OresService.java
  66. 7
      src/main/java/com/iflytop/gd/app/service/UserService.java
  67. 4
      src/main/java/com/iflytop/gd/app/service/WebSocketService.java
  68. 30
      src/main/java/com/iflytop/gd/app/service/cmd/DemoCommand.java
  69. 2
      src/main/java/com/iflytop/gd/common/base/BaseEntity.java
  70. 2
      src/main/java/com/iflytop/gd/common/base/BasePageQuery.java
  71. 2
      src/main/java/com/iflytop/gd/common/base/IBaseEnum.java
  72. 2
      src/main/java/com/iflytop/gd/common/cmd/CommandFuture.java
  73. 2
      src/main/java/com/iflytop/gd/common/cmd/CyclicNumberGenerator.java
  74. 2
      src/main/java/com/iflytop/gd/common/cmd/DeviceCommand.java
  75. 24
      src/main/java/com/iflytop/gd/common/cmd/DeviceCommandGenerator.java
  76. 4
      src/main/java/com/iflytop/gd/common/controller/BaseCmdController.java
  77. 26
      src/main/java/com/iflytop/gd/common/controller/NotificationWebsocketEndpoint.java
  78. 501
      src/main/java/com/iflytop/gd/common/device/DeviceCommandGenerator.java
  79. 2
      src/main/java/com/iflytop/gd/common/enums/CraftEvents.java
  80. 2
      src/main/java/com/iflytop/gd/common/enums/CraftStates.java
  81. 2
      src/main/java/com/iflytop/gd/common/exception/CommandExecTimeoutException.java
  82. 2
      src/main/java/com/iflytop/gd/common/exception/HardwareErrorException.java
  83. 2
      src/main/java/com/iflytop/gd/common/exception/UnSupportCommandException.java
  84. 2
      src/main/java/com/iflytop/gd/common/utils/ByteArray.java
  85. 0
      src/main/java/com/iflytop/gd/hardware/comm/can/driver/d.txt
  86. 0
      src/main/java/com/iflytop/gd/hardware/comm/can/listener/d.txt
  87. 0
      src/main/java/com/iflytop/gd/hardware/comm/can/protocol/d.txt
  88. 0
      src/main/java/com/iflytop/gd/hardware/comm/rs485/driver/d.txt
  89. 0
      src/main/java/com/iflytop/gd/hardware/comm/rs485/listener/d.txt
  90. 0
      src/main/java/com/iflytop/gd/hardware/comm/rs485/protocol/d.txt
  91. 5
      src/main/java/com/iflytop/gd/hardware/constants/Dim.java
  92. 2
      src/main/java/com/iflytop/gd/hardware/constants/DistanceUnit.java
  93. 2
      src/main/java/com/iflytop/gd/hardware/constants/LiquidFillArmMotorIndex.java
  94. 2
      src/main/java/com/iflytop/gd/hardware/constants/RotationDirection.java
  95. 2
      src/main/java/com/iflytop/gd/hardware/constants/VelocityUnit.java
  96. 13
      src/main/java/com/iflytop/gd/hardware/device/ColdTray.java
  97. 17
      src/main/java/com/iflytop/gd/hardware/device/Door.java
  98. 13
      src/main/java/com/iflytop/gd/hardware/device/Fan.java
  99. 22
      src/main/java/com/iflytop/gd/hardware/device/HoldingJaw.java
  100. 24
      src/main/java/com/iflytop/gd/hardware/device/LiquidFillingArm.java

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

@ -0,0 +1,21 @@
package com.iflytop.gd.app.cmd;
import com.iflytop.gd.app.core.BaseCommandHandler;
import com.iflytop.gd.app.model.dto.CmdDTO;
import com.iflytop.gd.common.annotation.CommandMapping;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
@Slf4j
@Component
@RequiredArgsConstructor
@CommandMapping("demo_command")//业务指令注解
public class DemoCommand extends BaseCommandHandler {
@Override
public void handle(CmdDTO cmdDTO) {
log.info("cmdDTO:{}", cmdDTO);
}
}

6
src/main/java/com/iflytop/gd/debug/services/cmds/ColdTrapStartHeatingCommandHandler.java → src/main/java/com/iflytop/gd/app/cmd/debug/ColdTrapStartHeatingCommandHandler.java

@ -1,12 +1,8 @@
package com.iflytop.gd.debug.services.cmds;
package com.iflytop.gd.app.cmd.debug;
import com.iflytop.gd.app.core.BaseCommandHandler;
import com.iflytop.gd.app.model.dto.CmdDTO;
import com.iflytop.gd.app.service.WebSocketService;
import com.iflytop.gd.common.annotation.CommandMapping;
import com.iflytop.gd.common.cmd.CommandHandler;
import com.iflytop.gd.common.notification.Notification;
import com.iflytop.gd.system.devices.ColdTray;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;

3
src/main/java/com/iflytop/gd/debug/services/cmds/ColdTrapStartRecycleCommandHandler.java → src/main/java/com/iflytop/gd/app/cmd/debug/ColdTrapStartRecycleCommandHandler.java

@ -1,9 +1,8 @@
package com.iflytop.gd.debug.services.cmds;
package com.iflytop.gd.app.cmd.debug;
import com.iflytop.gd.app.core.BaseCommandHandler;
import com.iflytop.gd.app.model.dto.CmdDTO;
import com.iflytop.gd.common.annotation.CommandMapping;
import com.iflytop.gd.common.cmd.CommandHandler;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;

3
src/main/java/com/iflytop/gd/debug/services/cmds/ColdTrapStartRefrigerationCommandHandler.java → src/main/java/com/iflytop/gd/app/cmd/debug/ColdTrapStartRefrigerationCommandHandler.java

@ -1,9 +1,8 @@
package com.iflytop.gd.debug.services.cmds;
package com.iflytop.gd.app.cmd.debug;
import com.iflytop.gd.app.core.BaseCommandHandler;
import com.iflytop.gd.app.model.dto.CmdDTO;
import com.iflytop.gd.common.annotation.CommandMapping;
import com.iflytop.gd.common.cmd.CommandHandler;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;

3
src/main/java/com/iflytop/gd/debug/services/cmds/ColdTrapStopHeatingCommandHandler.java → src/main/java/com/iflytop/gd/app/cmd/debug/ColdTrapStopHeatingCommandHandler.java

@ -1,9 +1,8 @@
package com.iflytop.gd.debug.services.cmds;
package com.iflytop.gd.app.cmd.debug;
import com.iflytop.gd.app.core.BaseCommandHandler;
import com.iflytop.gd.app.model.dto.CmdDTO;
import com.iflytop.gd.common.annotation.CommandMapping;
import com.iflytop.gd.common.cmd.CommandHandler;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;

3
src/main/java/com/iflytop/gd/debug/services/cmds/ColdTrapStopRecycleCommandHandler.java → src/main/java/com/iflytop/gd/app/cmd/debug/ColdTrapStopRecycleCommandHandler.java

@ -1,9 +1,8 @@
package com.iflytop.gd.debug.services.cmds;
package com.iflytop.gd.app.cmd.debug;
import com.iflytop.gd.app.core.BaseCommandHandler;
import com.iflytop.gd.app.model.dto.CmdDTO;
import com.iflytop.gd.common.annotation.CommandMapping;
import com.iflytop.gd.common.cmd.CommandHandler;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;

3
src/main/java/com/iflytop/gd/debug/services/cmds/ColdTrapStopRefrigerationCommandHandler.java → src/main/java/com/iflytop/gd/app/cmd/debug/ColdTrapStopRefrigerationCommandHandler.java

@ -1,9 +1,8 @@
package com.iflytop.gd.debug.services.cmds;
package com.iflytop.gd.app.cmd.debug;
import com.iflytop.gd.app.core.BaseCommandHandler;
import com.iflytop.gd.app.model.dto.CmdDTO;
import com.iflytop.gd.common.annotation.CommandMapping;
import com.iflytop.gd.common.cmd.CommandHandler;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;

7
src/main/java/com/iflytop/gd/debug/services/cmds/CoverElevatorLiftDownCommandHandler.java → src/main/java/com/iflytop/gd/app/cmd/debug/CoverElevatorLiftDownCommandHandler.java

@ -1,13 +1,8 @@
package com.iflytop.gd.debug.services.cmds;
package com.iflytop.gd.app.cmd.debug;
import com.iflytop.gd.app.core.BaseCommandHandler;
import com.iflytop.gd.app.model.dto.CmdDTO;
import com.iflytop.gd.app.service.WebSocketService;
import com.iflytop.gd.common.annotation.CommandMapping;
import com.iflytop.gd.common.cmd.CommandHandler;
import com.iflytop.gd.common.notification.Notification;
import com.iflytop.gd.system.constants.VelocityUnit;
import com.iflytop.gd.system.devices.StepMotor;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;

3
src/main/java/com/iflytop/gd/debug/services/cmds/CoverElevatorLiftUpCommandHandler.java → src/main/java/com/iflytop/gd/app/cmd/debug/CoverElevatorLiftUpCommandHandler.java

@ -1,9 +1,8 @@
package com.iflytop.gd.debug.services.cmds;
package com.iflytop.gd.app.cmd.debug;
import com.iflytop.gd.app.core.BaseCommandHandler;
import com.iflytop.gd.app.model.dto.CmdDTO;
import com.iflytop.gd.common.annotation.CommandMapping;
import com.iflytop.gd.common.cmd.CommandHandler;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;

3
src/main/java/com/iflytop/gd/debug/services/cmds/CoverElevatorResetCommandHandler.java → src/main/java/com/iflytop/gd/app/cmd/debug/CoverElevatorResetCommandHandler.java

@ -1,9 +1,8 @@
package com.iflytop.gd.debug.services.cmds;
package com.iflytop.gd.app.cmd.debug;
import com.iflytop.gd.app.core.BaseCommandHandler;
import com.iflytop.gd.app.model.dto.CmdDTO;
import com.iflytop.gd.common.annotation.CommandMapping;
import com.iflytop.gd.common.cmd.CommandHandler;
/**
* 处理拍子抬升电机复位指令

3
src/main/java/com/iflytop/gd/debug/services/cmds/CoverElevatorStopCommandHandler.java → src/main/java/com/iflytop/gd/app/cmd/debug/CoverElevatorStopCommandHandler.java

@ -1,9 +1,8 @@
package com.iflytop.gd.debug.services.cmds;
package com.iflytop.gd.app.cmd.debug;
import com.iflytop.gd.app.core.BaseCommandHandler;
import com.iflytop.gd.app.model.dto.CmdDTO;
import com.iflytop.gd.common.annotation.CommandMapping;
import com.iflytop.gd.common.cmd.CommandHandler;
/**
* 处理拍子抬升电机停止指令

4
src/main/java/com/iflytop/gd/debug/services/cmds/DoorCloseCommandHandler.java → src/main/java/com/iflytop/gd/app/cmd/debug/DoorCloseCommandHandler.java

@ -1,10 +1,8 @@
package com.iflytop.gd.debug.services.cmds;
package com.iflytop.gd.app.cmd.debug;
import com.iflytop.gd.app.core.BaseCommandHandler;
import com.iflytop.gd.app.model.dto.CmdDTO;
import com.iflytop.gd.common.annotation.CommandMapping;
import com.iflytop.gd.common.cmd.CommandHandler;
import com.iflytop.gd.system.devices.Door;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;

6
src/main/java/com/iflytop/gd/debug/services/cmds/DoorOpenCommandHandler.java → src/main/java/com/iflytop/gd/app/cmd/debug/DoorOpenCommandHandler.java

@ -1,12 +1,8 @@
package com.iflytop.gd.debug.services.cmds;
package com.iflytop.gd.app.cmd.debug;
import com.iflytop.gd.app.core.BaseCommandHandler;
import com.iflytop.gd.app.model.dto.CmdDTO;
import com.iflytop.gd.app.service.WebSocketService;
import com.iflytop.gd.common.annotation.CommandMapping;
import com.iflytop.gd.common.cmd.CommandHandler;
import com.iflytop.gd.common.notification.Notification;
import com.iflytop.gd.system.devices.Door;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;

4
src/main/java/com/iflytop/gd/debug/services/cmds/DoorStopCommandHandler.java → src/main/java/com/iflytop/gd/app/cmd/debug/DoorStopCommandHandler.java

@ -1,10 +1,8 @@
package com.iflytop.gd.debug.services.cmds;
package com.iflytop.gd.app.cmd.debug;
import com.iflytop.gd.app.core.BaseCommandHandler;
import com.iflytop.gd.app.model.dto.CmdDTO;
import com.iflytop.gd.common.annotation.CommandMapping;
import com.iflytop.gd.common.cmd.CommandHandler;
import com.iflytop.gd.system.devices.Door;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;

3
src/main/java/com/iflytop/gd/debug/services/cmds/HeaterStartCommandHandler.java → src/main/java/com/iflytop/gd/app/cmd/debug/HeaterStartCommandHandler.java

@ -1,9 +1,8 @@
package com.iflytop.gd.debug.services.cmds;
package com.iflytop.gd.app.cmd.debug;
import com.iflytop.gd.app.core.BaseCommandHandler;
import com.iflytop.gd.app.model.dto.CmdDTO;
import com.iflytop.gd.common.annotation.CommandMapping;
import com.iflytop.gd.common.cmd.CommandHandler;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;

3
src/main/java/com/iflytop/gd/debug/services/cmds/HeaterStartHeatMaintainingCommandHandler.java → src/main/java/com/iflytop/gd/app/cmd/debug/HeaterStartHeatMaintainingCommandHandler.java

@ -1,9 +1,8 @@
package com.iflytop.gd.debug.services.cmds;
package com.iflytop.gd.app.cmd.debug;
import com.iflytop.gd.app.core.BaseCommandHandler;
import com.iflytop.gd.app.model.dto.CmdDTO;
import com.iflytop.gd.common.annotation.CommandMapping;
import com.iflytop.gd.common.cmd.CommandHandler;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;

3
src/main/java/com/iflytop/gd/debug/services/cmds/HeaterStopCommandHandler.java → src/main/java/com/iflytop/gd/app/cmd/debug/HeaterStopCommandHandler.java

@ -1,9 +1,8 @@
package com.iflytop.gd.debug.services.cmds;
package com.iflytop.gd.app.cmd.debug;
import com.iflytop.gd.app.core.BaseCommandHandler;
import com.iflytop.gd.app.model.dto.CmdDTO;
import com.iflytop.gd.common.annotation.CommandMapping;
import com.iflytop.gd.common.cmd.CommandHandler;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;

3
src/main/java/com/iflytop/gd/debug/services/cmds/HeaterStopMaintainingCommandHandler.java → src/main/java/com/iflytop/gd/app/cmd/debug/HeaterStopMaintainingCommandHandler.java

@ -1,9 +1,8 @@
package com.iflytop.gd.debug.services.cmds;
package com.iflytop.gd.app.cmd.debug;
import com.iflytop.gd.app.core.BaseCommandHandler;
import com.iflytop.gd.app.model.dto.CmdDTO;
import com.iflytop.gd.common.annotation.CommandMapping;
import com.iflytop.gd.common.cmd.CommandHandler;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;

3
src/main/java/com/iflytop/gd/debug/services/cmds/HoldingJawCloseCommandHandler.java → src/main/java/com/iflytop/gd/app/cmd/debug/HoldingJawCloseCommandHandler.java

@ -1,9 +1,8 @@
package com.iflytop.gd.debug.services.cmds;
package com.iflytop.gd.app.cmd.debug;
import com.iflytop.gd.app.core.BaseCommandHandler;
import com.iflytop.gd.app.model.dto.CmdDTO;
import com.iflytop.gd.common.annotation.CommandMapping;
import com.iflytop.gd.common.cmd.CommandHandler;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;

3
src/main/java/com/iflytop/gd/debug/services/cmds/HoldingJawOpenCommandHandler.java → src/main/java/com/iflytop/gd/app/cmd/debug/HoldingJawOpenCommandHandler.java

@ -1,9 +1,8 @@
package com.iflytop.gd.debug.services.cmds;
package com.iflytop.gd.app.cmd.debug;
import com.iflytop.gd.app.core.BaseCommandHandler;
import com.iflytop.gd.app.model.dto.CmdDTO;
import com.iflytop.gd.common.annotation.CommandMapping;
import com.iflytop.gd.common.cmd.CommandHandler;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;

3
src/main/java/com/iflytop/gd/debug/services/cmds/HoldingJawPauseCommandHandler.java → src/main/java/com/iflytop/gd/app/cmd/debug/HoldingJawPauseCommandHandler.java

@ -1,9 +1,8 @@
package com.iflytop.gd.debug.services.cmds;
package com.iflytop.gd.app.cmd.debug;
import com.iflytop.gd.app.core.BaseCommandHandler;
import com.iflytop.gd.app.model.dto.CmdDTO;
import com.iflytop.gd.common.annotation.CommandMapping;
import com.iflytop.gd.common.cmd.CommandHandler;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;

3
src/main/java/com/iflytop/gd/debug/services/cmds/LiquidArmResetCommandHandler.java → src/main/java/com/iflytop/gd/app/cmd/debug/LiquidArmResetCommandHandler.java

@ -1,9 +1,8 @@
package com.iflytop.gd.debug.services.cmds;
package com.iflytop.gd.app.cmd.debug;
import com.iflytop.gd.app.core.BaseCommandHandler;
import com.iflytop.gd.app.model.dto.CmdDTO;
import com.iflytop.gd.common.annotation.CommandMapping;
import com.iflytop.gd.common.cmd.CommandHandler;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;

3
src/main/java/com/iflytop/gd/debug/services/cmds/LiquidArmRotateCommandHandler.java → src/main/java/com/iflytop/gd/app/cmd/debug/LiquidArmRotateCommandHandler.java

@ -1,9 +1,8 @@
package com.iflytop.gd.debug.services.cmds;
package com.iflytop.gd.app.cmd.debug;
import com.iflytop.gd.app.core.BaseCommandHandler;
import com.iflytop.gd.app.model.dto.CmdDTO;
import com.iflytop.gd.common.annotation.CommandMapping;
import com.iflytop.gd.common.cmd.CommandHandler;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;

3
src/main/java/com/iflytop/gd/debug/services/cmds/LiquidArmStopCommandHandler.java → src/main/java/com/iflytop/gd/app/cmd/debug/LiquidArmStopCommandHandler.java

@ -1,9 +1,8 @@
package com.iflytop.gd.debug.services.cmds;
package com.iflytop.gd.app.cmd.debug;
import com.iflytop.gd.app.core.BaseCommandHandler;
import com.iflytop.gd.app.model.dto.CmdDTO;
import com.iflytop.gd.common.annotation.CommandMapping;
import com.iflytop.gd.common.cmd.CommandHandler;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;

3
src/main/java/com/iflytop/gd/debug/services/cmds/LiquidPumpPreEvacuateCommandHandler.java → src/main/java/com/iflytop/gd/app/cmd/debug/LiquidPumpPreEvacuateCommandHandler.java

@ -1,9 +1,8 @@
package com.iflytop.gd.debug.services.cmds;
package com.iflytop.gd.app.cmd.debug;
import com.iflytop.gd.app.core.BaseCommandHandler;
import com.iflytop.gd.app.model.dto.CmdDTO;
import com.iflytop.gd.common.annotation.CommandMapping;
import com.iflytop.gd.common.cmd.CommandHandler;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;

3
src/main/java/com/iflytop/gd/debug/services/cmds/LiquidPumpPrefillCommandHandler.java → src/main/java/com/iflytop/gd/app/cmd/debug/LiquidPumpPrefillCommandHandler.java

@ -1,9 +1,8 @@
package com.iflytop.gd.debug.services.cmds;
package com.iflytop.gd.app.cmd.debug;
import com.iflytop.gd.app.core.BaseCommandHandler;
import com.iflytop.gd.app.model.dto.CmdDTO;
import com.iflytop.gd.common.annotation.CommandMapping;
import com.iflytop.gd.common.cmd.CommandHandler;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;

3
src/main/java/com/iflytop/gd/debug/services/cmds/LiquidPumpStartCommandHandler.java → src/main/java/com/iflytop/gd/app/cmd/debug/LiquidPumpStartCommandHandler.java

@ -1,9 +1,8 @@
package com.iflytop.gd.debug.services.cmds;
package com.iflytop.gd.app.cmd.debug;
import com.iflytop.gd.app.core.BaseCommandHandler;
import com.iflytop.gd.app.model.dto.CmdDTO;
import com.iflytop.gd.common.annotation.CommandMapping;
import com.iflytop.gd.common.cmd.CommandHandler;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;

3
src/main/java/com/iflytop/gd/debug/services/cmds/LiquidPumpStopCommandHandler.java → src/main/java/com/iflytop/gd/app/cmd/debug/LiquidPumpStopCommandHandler.java

@ -1,9 +1,8 @@
package com.iflytop.gd.debug.services.cmds;
package com.iflytop.gd.app.cmd.debug;
import com.iflytop.gd.app.core.BaseCommandHandler;
import com.iflytop.gd.app.model.dto.CmdDTO;
import com.iflytop.gd.common.annotation.CommandMapping;
import com.iflytop.gd.common.cmd.CommandHandler;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;

3
src/main/java/com/iflytop/gd/debug/services/cmds/PalletElevatorLiftDownCommandHandler.java → src/main/java/com/iflytop/gd/app/cmd/debug/PalletElevatorLiftDownCommandHandler.java

@ -1,9 +1,8 @@
package com.iflytop.gd.debug.services.cmds;
package com.iflytop.gd.app.cmd.debug;
import com.iflytop.gd.app.core.BaseCommandHandler;
import com.iflytop.gd.app.model.dto.CmdDTO;
import com.iflytop.gd.common.annotation.CommandMapping;
import com.iflytop.gd.common.cmd.CommandHandler;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;

3
src/main/java/com/iflytop/gd/debug/services/cmds/PalletElevatorLiftUpCommandHandler.java → src/main/java/com/iflytop/gd/app/cmd/debug/PalletElevatorLiftUpCommandHandler.java

@ -1,9 +1,8 @@
package com.iflytop.gd.debug.services.cmds;
package com.iflytop.gd.app.cmd.debug;
import com.iflytop.gd.app.core.BaseCommandHandler;
import com.iflytop.gd.app.model.dto.CmdDTO;
import com.iflytop.gd.common.annotation.CommandMapping;
import com.iflytop.gd.common.cmd.CommandHandler;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;

3
src/main/java/com/iflytop/gd/debug/services/cmds/PalletElevatorStopCommandHandler.java → src/main/java/com/iflytop/gd/app/cmd/debug/PalletElevatorStopCommandHandler.java

@ -1,9 +1,8 @@
package com.iflytop.gd.debug.services.cmds;
package com.iflytop.gd.app.cmd.debug;
import com.iflytop.gd.app.core.BaseCommandHandler;
import com.iflytop.gd.app.model.dto.CmdDTO;
import com.iflytop.gd.common.annotation.CommandMapping;
import com.iflytop.gd.common.cmd.CommandHandler;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;

3
src/main/java/com/iflytop/gd/debug/services/cmds/ShakerStartCommandHandler.java → src/main/java/com/iflytop/gd/app/cmd/debug/ShakerStartCommandHandler.java

@ -1,9 +1,8 @@
package com.iflytop.gd.debug.services.cmds;
package com.iflytop.gd.app.cmd.debug;
import com.iflytop.gd.app.core.BaseCommandHandler;
import com.iflytop.gd.app.model.dto.CmdDTO;
import com.iflytop.gd.common.annotation.CommandMapping;
import com.iflytop.gd.common.cmd.CommandHandler;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;

3
src/main/java/com/iflytop/gd/debug/services/cmds/ShakerStopCommandHandler.java → src/main/java/com/iflytop/gd/app/cmd/debug/ShakerStopCommandHandler.java

@ -1,9 +1,8 @@
package com.iflytop.gd.debug.services.cmds;
package com.iflytop.gd.app.cmd.debug;
import com.iflytop.gd.app.core.BaseCommandHandler;
import com.iflytop.gd.app.model.dto.CmdDTO;
import com.iflytop.gd.common.annotation.CommandMapping;
import com.iflytop.gd.common.cmd.CommandHandler;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;

3
src/main/java/com/iflytop/gd/debug/services/cmds/TransportationArmMoveCommandHandler.java → src/main/java/com/iflytop/gd/app/cmd/debug/TransportationArmMoveCommandHandler.java

@ -1,9 +1,8 @@
package com.iflytop.gd.debug.services.cmds;
package com.iflytop.gd.app.cmd.debug;
import com.iflytop.gd.app.core.BaseCommandHandler;
import com.iflytop.gd.app.model.dto.CmdDTO;
import com.iflytop.gd.common.annotation.CommandMapping;
import com.iflytop.gd.common.cmd.CommandHandler;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;

3
src/main/java/com/iflytop/gd/debug/services/cmds/TransportationArmResetCommandHandler.java → src/main/java/com/iflytop/gd/app/cmd/debug/TransportationArmResetCommandHandler.java

@ -1,9 +1,8 @@
package com.iflytop.gd.debug.services.cmds;
package com.iflytop.gd.app.cmd.debug;
import com.iflytop.gd.app.core.BaseCommandHandler;
import com.iflytop.gd.app.model.dto.CmdDTO;
import com.iflytop.gd.common.annotation.CommandMapping;
import com.iflytop.gd.common.cmd.CommandHandler;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;

3
src/main/java/com/iflytop/gd/debug/services/cmds/TransportationArmStopCommandHandler.java → src/main/java/com/iflytop/gd/app/cmd/debug/TransportationArmStopCommandHandler.java

@ -1,9 +1,8 @@
package com.iflytop.gd.debug.services.cmds;
package com.iflytop.gd.app.cmd.debug;
import com.iflytop.gd.app.core.BaseCommandHandler;
import com.iflytop.gd.app.model.dto.CmdDTO;
import com.iflytop.gd.common.annotation.CommandMapping;
import com.iflytop.gd.common.cmd.CommandHandler;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;

4
src/main/java/com/iflytop/gd/app/config/CraftsStateMachineConfig.java

@ -1,7 +1,7 @@
package com.iflytop.gd.app.config;
import com.iflytop.gd.app.common.enums.CraftEvents;
import com.iflytop.gd.app.common.enums.CraftStates;
import com.iflytop.gd.common.enums.CraftEvents;
import com.iflytop.gd.common.enums.CraftStates;
import org.springframework.context.annotation.Configuration;
import org.springframework.statemachine.config.EnableStateMachineFactory;
import org.springframework.statemachine.config.StateMachineConfigurerAdapter;

2
src/main/java/com/iflytop/gd/infrastructure/config/MybatisPlusConfig.java → src/main/java/com/iflytop/gd/app/config/MybatisPlusConfig.java

@ -1,4 +1,4 @@
package com.iflytop.gd.infrastructure.config;
package com.iflytop.gd.app.config;
import com.baomidou.mybatisplus.annotation.DbType;
import com.baomidou.mybatisplus.core.config.GlobalConfig;

2
src/main/java/com/iflytop/gd/infrastructure/config/SwaggerConfig.java → src/main/java/com/iflytop/gd/app/config/SwaggerConfig.java

@ -1,4 +1,4 @@
package com.iflytop.gd.infrastructure.config;
package com.iflytop.gd.app.config;
import cn.hutool.core.util.ArrayUtil;
import io.swagger.v3.oas.models.Components;

2
src/main/java/com/iflytop/gd/infrastructure/config/WebConfig.java → src/main/java/com/iflytop/gd/app/config/WebConfig.java

@ -1,4 +1,4 @@
package com.iflytop.gd.infrastructure.config;
package com.iflytop.gd.app.config;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.config.annotation.CorsRegistry;

2
src/main/java/com/iflytop/gd/infrastructure/config/WebSocketConfig.java → src/main/java/com/iflytop/gd/app/config/WebSocketConfig.java

@ -1,4 +1,4 @@
package com.iflytop.gd.infrastructure.config;
package com.iflytop.gd.app.config;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

2
src/main/java/com/iflytop/gd/infrastructure/config/WebSocketServer.java → src/main/java/com/iflytop/gd/app/config/WebSocketServer.java

@ -1,4 +1,4 @@
package com.iflytop.gd.infrastructure.config;
package com.iflytop.gd.app.config;
import jakarta.websocket.*;
import jakarta.websocket.server.ServerEndpoint;

4
src/main/java/com/iflytop/gd/app/controller/AuthController.java

@ -2,11 +2,11 @@ package com.iflytop.gd.app.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.iflytop.gd.app.model.dto.LoginDTO;
import com.iflytop.gd.app.model.entity.User;
import com.iflytop.gd.app.service.UserService;
import com.iflytop.gd.common.enums.Deleted;
import com.iflytop.gd.common.result.Result;
import com.iflytop.gd.common.result.ResultCode;
import com.iflytop.gd.infrastructure.repository.entity.User;
import com.iflytop.gd.infrastructure.repository.service.UserService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;

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

@ -3,7 +3,7 @@ package com.iflytop.gd.app.controller;
import com.iflytop.gd.common.cmd.CommandHandler;
import com.iflytop.gd.app.core.CommandHandlerRegistry;
import com.iflytop.gd.app.model.dto.CmdDTO;
import com.iflytop.gd.app.service.exceptions.UnSupportCommandException;
import com.iflytop.gd.common.exception.UnSupportCommandException;
import com.iflytop.gd.common.result.Result;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;

5
src/main/java/com/iflytop/gd/debug/controller/CmdDebugController.java → src/main/java/com/iflytop/gd/app/controller/CmdDebugController.java

@ -1,8 +1,7 @@
package com.iflytop.gd.debug.controller;
package com.iflytop.gd.app.controller;
import com.iflytop.gd.app.model.dto.CmdDTO;
import com.iflytop.gd.app.service.WebSocketService;
import com.iflytop.gd.app.service.exceptions.UnSupportCommandException;
import com.iflytop.gd.common.exception.UnSupportCommandException;
import com.iflytop.gd.common.result.Result;
import com.iflytop.gd.common.cmd.CommandHandler;
import com.iflytop.gd.app.core.CommandHandlerRegistry;

2
src/main/java/com/iflytop/gd/app/controller/OresController.java

@ -3,7 +3,7 @@ package com.iflytop.gd.app.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.iflytop.gd.app.model.entity.Ores;
import com.iflytop.gd.app.model.vo.OresCraftsListVO;
import com.iflytop.gd.infrastructure.repository.base.BasePageQuery;
import com.iflytop.gd.common.base.BasePageQuery;
import com.iflytop.gd.common.result.PageResult;
import com.iflytop.gd.app.service.OresService;
import com.iflytop.gd.common.result.Result;

2
src/main/java/com/iflytop/gd/app/controller/SolutionsController.java

@ -7,7 +7,7 @@ import com.iflytop.gd.app.service.SolutionsService;
import com.iflytop.gd.common.result.PageResult;
import com.iflytop.gd.common.result.Result;
import com.iflytop.gd.common.result.ResultCode;
import com.iflytop.gd.infrastructure.repository.base.BasePageQuery;
import com.iflytop.gd.common.base.BasePageQuery;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;

6
src/main/java/com/iflytop/gd/app/controller/UserController.java

@ -3,12 +3,12 @@ package com.iflytop.gd.app.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.iflytop.gd.infrastructure.repository.base.BasePageQuery;
import com.iflytop.gd.common.base.BasePageQuery;
import com.iflytop.gd.common.result.PageResult;
import com.iflytop.gd.common.result.Result;
import com.iflytop.gd.common.result.ResultCode;
import com.iflytop.gd.infrastructure.repository.entity.User;
import com.iflytop.gd.infrastructure.repository.service.UserService;
import com.iflytop.gd.app.model.entity.User;
import com.iflytop.gd.app.service.UserService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;

2
src/main/java/com/iflytop/gd/app/core/BaseCommandHandler.java

@ -4,7 +4,7 @@ package com.iflytop.gd.app.core;
import com.iflytop.gd.common.annotation.CheckedRunnable;
import com.iflytop.gd.common.cmd.CommandHandler;
import com.iflytop.gd.common.device.CommandFuture;
import com.iflytop.gd.common.cmd.CommandFuture;
import com.iflytop.gd.common.utils.LambdaUtil;
import java.util.Arrays;

2
src/main/java/com/iflytop/gd/app/core/CommandHandlerRegistry.java

@ -1,6 +1,6 @@
package com.iflytop.gd.app.core;
import com.iflytop.gd.app.service.exceptions.UnSupportCommandException;
import com.iflytop.gd.common.exception.UnSupportCommandException;
import com.iflytop.gd.common.annotation.CommandMapping;
import com.iflytop.gd.common.cmd.CommandHandler;
import io.micrometer.common.lang.NonNull;

4
src/main/java/com/iflytop/gd/app/core/CraftsContext.java

@ -1,8 +1,8 @@
package com.iflytop.gd.app.core;
import cn.hutool.json.JSONUtil;
import com.iflytop.gd.app.common.enums.CraftEvents;
import com.iflytop.gd.app.common.enums.CraftStates;
import com.iflytop.gd.common.enums.CraftEvents;
import com.iflytop.gd.common.enums.CraftStates;
import com.iflytop.gd.app.model.bo.CraftsStep;
import com.iflytop.gd.app.model.entity.Crafts;
import com.iflytop.gd.app.model.entity.Ores;

4
src/main/java/com/iflytop/gd/infrastructure/repository/mapper/UserMapper.java → src/main/java/com/iflytop/gd/app/mapper/UserMapper.java

@ -1,7 +1,7 @@
package com.iflytop.gd.infrastructure.repository.mapper;
package com.iflytop.gd.app.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.iflytop.gd.infrastructure.repository.entity.User;
import com.iflytop.gd.app.model.entity.User;
import org.apache.ibatis.annotations.Mapper;
/**

2
src/main/java/com/iflytop/gd/common/notification/Notification.java → src/main/java/com/iflytop/gd/app/model/bo/Notification.java

@ -1,4 +1,4 @@
package com.iflytop.gd.common.notification;
package com.iflytop.gd.app.model.bo;
import cn.hutool.core.date.DateTime;
import com.iflytop.gd.app.model.dto.CmdDTO;

2
src/main/java/com/iflytop/gd/system/models/Point3D.java → src/main/java/com/iflytop/gd/app/model/bo/Point3D.java

@ -1,4 +1,4 @@
package com.iflytop.gd.system.models;
package com.iflytop.gd.app.model.bo;
import lombok.Getter;

2
src/main/java/com/iflytop/gd/app/model/entity/Container.java

@ -1,7 +1,7 @@
package com.iflytop.gd.app.model.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.iflytop.gd.infrastructure.repository.base.BaseEntity;
import com.iflytop.gd.common.base.BaseEntity;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.*;
import lombok.Data;

2
src/main/java/com/iflytop/gd/app/model/entity/Crafts.java

@ -1,7 +1,7 @@
package com.iflytop.gd.app.model.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.iflytop.gd.infrastructure.repository.base.BaseEntity;
import com.iflytop.gd.common.base.BaseEntity;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;

2
src/main/java/com/iflytop/gd/app/model/entity/DeviceParamConfig.java

@ -1,7 +1,7 @@
package com.iflytop.gd.app.model.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.iflytop.gd.infrastructure.repository.base.BaseEntity;
import com.iflytop.gd.common.base.BaseEntity;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;

3
src/main/java/com/iflytop/gd/app/model/entity/Ores.java

@ -1,9 +1,8 @@
package com.iflytop.gd.app.model.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.iflytop.gd.infrastructure.repository.base.BaseEntity;
import com.iflytop.gd.common.base.BaseEntity;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import lombok.EqualsAndHashCode;

3
src/main/java/com/iflytop/gd/app/model/entity/Solutions.java

@ -1,9 +1,8 @@
package com.iflytop.gd.app.model.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.iflytop.gd.infrastructure.repository.base.BaseEntity;
import com.iflytop.gd.common.base.BaseEntity;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import lombok.EqualsAndHashCode;

2
src/main/java/com/iflytop/gd/app/model/entity/SystemConfig.java

@ -1,7 +1,7 @@
package com.iflytop.gd.app.model.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.iflytop.gd.infrastructure.repository.base.BaseEntity;
import com.iflytop.gd.common.base.BaseEntity;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
import lombok.Data;

5
src/main/java/com/iflytop/gd/infrastructure/repository/entity/User.java → src/main/java/com/iflytop/gd/app/model/entity/User.java

@ -1,12 +1,11 @@
package com.iflytop.gd.infrastructure.repository.entity;
package com.iflytop.gd.app.model.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.iflytop.gd.infrastructure.repository.base.BaseEntity;
import com.iflytop.gd.common.base.BaseEntity;
import com.iflytop.gd.common.enums.Deleted;
import com.iflytop.gd.common.enums.FixedUser;
import com.iflytop.gd.common.enums.UsrRole;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import lombok.EqualsAndHashCode;

2
src/main/java/com/iflytop/gd/app/model/vo/CraftStatusVO.java

@ -1,6 +1,6 @@
package com.iflytop.gd.app.model.vo;
import com.iflytop.gd.app.common.enums.CraftStates;
import com.iflytop.gd.common.enums.CraftStates;
import com.iflytop.gd.app.model.bo.CraftsStep;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

4
src/main/java/com/iflytop/gd/app/service/CraftsService.java

@ -2,8 +2,8 @@ package com.iflytop.gd.app.service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.iflytop.gd.app.common.enums.CraftEvents;
import com.iflytop.gd.app.common.enums.CraftStates;
import com.iflytop.gd.common.enums.CraftEvents;
import com.iflytop.gd.common.enums.CraftStates;
import com.iflytop.gd.app.core.CraftsContext;
import com.iflytop.gd.app.mapper.CraftsMapper;
import com.iflytop.gd.app.model.entity.Crafts;

4
src/main/java/com/iflytop/gd/app/service/DeviceParamConfigService.java

@ -7,8 +7,8 @@ import com.iflytop.gd.app.model.entity.DeviceParamConfig;
import com.iflytop.gd.app.model.vo.DeviceParamGroupVO;
import com.iflytop.gd.app.model.vo.ModuleIdVO;
import com.iflytop.gd.app.model.vo.RegIndexVO;
import com.iflytop.gd.infrastructure.drivers.ModuleId;
import com.iflytop.gd.infrastructure.drivers.RegIndex;
import com.iflytop.gd.hardware.drivers.ModuleId;
import com.iflytop.gd.hardware.drivers.RegIndex;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;

2
src/main/java/com/iflytop/gd/app/service/OresService.java

@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.iflytop.gd.app.model.vo.OresCraftsListVO;
import com.iflytop.gd.infrastructure.repository.base.BasePageQuery;
import com.iflytop.gd.common.base.BasePageQuery;
import com.iflytop.gd.app.mapper.CraftsMapper;
import com.iflytop.gd.app.mapper.OresMapper;
import com.iflytop.gd.app.model.entity.Crafts;

7
src/main/java/com/iflytop/gd/infrastructure/repository/service/UserService.java → src/main/java/com/iflytop/gd/app/service/UserService.java

@ -1,9 +1,9 @@
package com.iflytop.gd.infrastructure.repository.service;
package com.iflytop.gd.app.service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.iflytop.gd.common.enums.FixedUser;
import com.iflytop.gd.infrastructure.repository.mapper.UserMapper;
import com.iflytop.gd.infrastructure.repository.entity.User;
import com.iflytop.gd.app.mapper.UserMapper;
import com.iflytop.gd.app.model.entity.User;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import lombok.Setter;
@ -11,7 +11,6 @@ import org.springframework.stereotype.Service;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
/**
* 用户业务实现类

4
src/main/java/com/iflytop/gd/app/service/WebSocketService.java

@ -1,8 +1,8 @@
package com.iflytop.gd.app.service;
import cn.hutool.json.JSONUtil;
import com.iflytop.gd.common.notification.Notification;
import com.iflytop.gd.infrastructure.config.WebSocketServer;
import com.iflytop.gd.app.model.bo.Notification;
import com.iflytop.gd.app.config.WebSocketServer;
import com.iflytop.gd.app.model.dto.WebsocketResult;
import org.springframework.stereotype.Service;

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

@ -1,30 +0,0 @@
package com.iflytop.gd.app.service.cmd;
import com.iflytop.gd.app.core.BaseCommandHandler;
import com.iflytop.gd.app.model.dto.CmdDTO;
import com.iflytop.gd.common.annotation.CommandMapping;
import com.iflytop.gd.common.cmd.CommandHandler;
import com.iflytop.gd.common.device.CommandFuture;
import com.iflytop.gd.common.device.DeviceCommand;
import com.iflytop.gd.common.device.DeviceCommandGenerator;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
@Slf4j
@Component
@RequiredArgsConstructor
@CommandMapping("demo_command")//业务指令注解
public class DemoCommand extends BaseCommandHandler {
@Override
public void handle(CmdDTO cmdDTO) {
log.info("cmdDTO:{}", cmdDTO);
//XYZ回原点
DeviceCommand motorXOriginCommand = DeviceCommandGenerator.motorXOrigin();
DeviceCommand motorYOriginCommand = DeviceCommandGenerator.motorYOrigin();
DeviceCommand motorZOriginCommand = DeviceCommandGenerator.motorZOrigin();
}
}

2
src/main/java/com/iflytop/gd/infrastructure/repository/base/BaseEntity.java → src/main/java/com/iflytop/gd/common/base/BaseEntity.java

@ -1,4 +1,4 @@
package com.iflytop.gd.infrastructure.repository.base;
package com.iflytop.gd.common.base;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;

2
src/main/java/com/iflytop/gd/infrastructure/repository/base/BasePageQuery.java → src/main/java/com/iflytop/gd/common/base/BasePageQuery.java

@ -1,4 +1,4 @@
package com.iflytop.gd.infrastructure.repository.base;
package com.iflytop.gd.common.base;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

2
src/main/java/com/iflytop/gd/infrastructure/repository/base/IBaseEnum.java → src/main/java/com/iflytop/gd/common/base/IBaseEnum.java

@ -1,4 +1,4 @@
package com.iflytop.gd.infrastructure.repository.base;
package com.iflytop.gd.common.base;
import cn.hutool.core.util.ObjectUtil;

2
src/main/java/com/iflytop/gd/common/device/CommandFuture.java → src/main/java/com/iflytop/gd/common/cmd/CommandFuture.java

@ -1,4 +1,4 @@
package com.iflytop.gd.common.device;
package com.iflytop.gd.common.cmd;
import cn.hutool.json.JSONObject;
import lombok.Getter;

2
src/main/java/com/iflytop/gd/common/device/CyclicNumberGenerator.java → src/main/java/com/iflytop/gd/common/cmd/CyclicNumberGenerator.java

@ -1,4 +1,4 @@
package com.iflytop.gd.common.device;
package com.iflytop.gd.common.cmd;
public class CyclicNumberGenerator {
// 饿汉式单例在类加载时就创建实例

2
src/main/java/com/iflytop/gd/common/device/DeviceCommand.java → src/main/java/com/iflytop/gd/common/cmd/DeviceCommand.java

@ -1,4 +1,4 @@
package com.iflytop.gd.common.device;
package com.iflytop.gd.common.cmd;
import lombok.Data;

24
src/main/java/com/iflytop/gd/common/cmd/DeviceCommandGenerator.java

@ -0,0 +1,24 @@
package com.iflytop.gd.common.cmd;
import java.util.Map;
/**
* 生成给设备发送的指令
*/
public class DeviceCommandGenerator {
/**
* 设备指令包装
*/
private static DeviceCommand deviceCmd(String code, String device, String action, Map<String, Object> params, String commandName) {
DeviceCommand cmdToDevice = new DeviceCommand();
cmdToDevice.setCmdCode(code);
cmdToDevice.setDevice(device);
cmdToDevice.setAction(action);
cmdToDevice.setParam(params);
cmdToDevice.setCmdName(commandName);
return cmdToDevice;
}
}

4
src/main/java/com/iflytop/gd/common/controller/BaseCmdController.java

@ -1,4 +0,0 @@
package com.iflytop.gd.common.controller;
public class BaseCmdController {
}

26
src/main/java/com/iflytop/gd/common/controller/NotificationWebsocketEndpoint.java

@ -1,26 +0,0 @@
package com.iflytop.gd.common.controller;
import com.iflytop.gd.infrastructure.modules.WebSocketNotificationPushMgrImpl;
import jakarta.annotation.Resource;
import jakarta.websocket.EndpointConfig;
import jakarta.websocket.OnOpen;
import jakarta.websocket.Session;
import jakarta.websocket.server.ServerEndpoint;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
@ServerEndpoint(value = "/api/v1/ws/notifications")
@Slf4j
@Component
public class NotificationWebsocketEndpoint {
@Resource
private WebSocketNotificationPushMgrImpl notificationMgr;
@OnOpen
public void onOpen(Session session, EndpointConfig endpointConfig) {
// 保存 session 到对象
this.notificationMgr.addSession(session);
log.info("[websocket] 新的连接:id={}", session.getId());
}
}

501
src/main/java/com/iflytop/gd/common/device/DeviceCommandGenerator.java

@ -1,501 +0,0 @@
package com.iflytop.gd.common.device;
import java.util.HashMap;
import java.util.Map;
/**
* 生成给设备发送的指令
*/
public class DeviceCommandGenerator {
/**
* 全部关闭三通阀
*/
public static DeviceCommand threeWayValveCloseAll() {
// 上层方法直接取方法注释全部关闭三通阀
return threeWayValveControl("close_all", "全部关闭三通阀");
}
/**
* 打开三通阀喷嘴管路
*/
public static DeviceCommand threeWayValveOpenSyringePipeline() {
return threeWayValveControl("open_syringe", "打开三通阀喷嘴管路");
}
/**
* 打开三通阀注射器管路
*/
public static DeviceCommand threeWayValveOpenNozzlePipeline() {
return threeWayValveControl("open_nozzle", "打开三通阀注射器管路");
}
/**
* 控制三通阀
*/
public static DeviceCommand threeWayValveControl(String action, String commandName) {
// 调用中层 controlCmd 直接用方法注释固定描述"控制三通阀"
return controlCmd("three_way_valve", action, null, commandName != null ? commandName : "控制三通阀");
}
/**
* 关闭清洗阀
*/
public static DeviceCommand washValveClose() {
return washValveControl("close", "关闭清洗阀");
}
/**
* 开启清洗阀
*/
public static DeviceCommand washValveOpen() {
return washValveControl("open", "开启清洗阀");
}
/**
* 控制清洗阀
*/
public static DeviceCommand washValveControl(String action, String commandName) {
return controlCmd("wash_valve", action, null, commandName != null ? commandName : "控制清洗阀");
}
/**
* 关闭喷嘴阀
*/
public static DeviceCommand nozzleValveClose() {
return nozzleValveControl("close", "关闭喷嘴阀");
}
/**
* 开启喷嘴阀
*/
public static DeviceCommand nozzleValveOpen() {
return nozzleValveControl("open", "开启喷嘴阀");
}
/**
* 控制喷嘴阀
*/
public static DeviceCommand nozzleValveControl(String action, String commandName) {
return controlCmd("nozzle_valve", action, null, commandName != null ? commandName : "控制喷嘴阀");
}
/**
* 关闭除湿阀
*/
public static DeviceCommand dehumidifierValveClose() {
return dehumidifierValveControl("close", "关闭除湿阀");
}
/**
* 开启除湿阀
*/
public static DeviceCommand dehumidifierValveOpen() {
return dehumidifierValveControl("open", "开启除湿阀");
}
/**
* 控制除湿阀
*/
public static DeviceCommand dehumidifierValveControl(String action, String commandName) {
return controlCmd("dehumidifier_valve", action, null, commandName != null ? commandName : "控制除湿阀");
}
/**
* 关闭照明灯板
*/
public static DeviceCommand lightingPanelClose() {
return controlCmd("lighting_panel", "close", null, "关闭照明灯板");
}
/**
* 打开照明灯板
*/
public static DeviceCommand lightingPanelOpen() {
return controlCmd("lighting_panel", "open", null, "打开照明灯板");
}
/**
* 控制照明灯板
*/
public static DeviceCommand lightingPanelControl(String action, String commandName) {
return controlCmd("lighting_panel", action, null, commandName != null ? commandName : "控制照明灯板");
}
/**
* 关闭激光
*/
public static DeviceCommand laserControlClose() {
return laserControl("close", null);
}
/**
* 打开激光
*
* @param power 功率[0-100]
*/
public static DeviceCommand laserControlOpen(Double power) {
return laserControl("open", power);
}
/**
* 控制激光
*
* @param power 功率[0-100]
*/
public static DeviceCommand laserControl(String action, Double power) {
Map<String, Object> params = new HashMap<>();
params.put("power", power);
return controlCmd("laser", action, params, "控制激光");
}
/**
* 关闭高压
*/
public static DeviceCommand highVoltageClose() {
return highVoltageControl("close", null);
}
/**
* 开启高压
*/
public static DeviceCommand highVoltageOpen(Double voltage) {
return highVoltageControl("open", voltage);
}
/**
* 控制高压
*/
public static DeviceCommand highVoltageControl(String action, Double voltage) {
Map<String, Object> params = new HashMap<>();
params.put("voltage", voltage);
return controlCmd("high_voltage", action, params, "控制高压");
}
/**
* 停止推动注射泵
*/
public static DeviceCommand syringePumpStop() {
return controlCmd("syringe_pump", "stop", null, "停止推动注射泵");
}
/**
* 推动移动注射泵
*
* @param speed 是指注射泵每分钟注射多少微升(volume 最低0.1)
*/
public static DeviceCommand syringePumpStart(String direction, Double speed) {
Map<String, Object> params = new HashMap<>();
params.put("direction", direction);
params.put("speed", speed);
return controlCmd("syringe_pump", "move", params, "推动移动注射泵");
}
/**
* 推动移动注射泵
*
* @param speed 是指注射泵每分钟注射多少微升(volume 最低0.1)
*/
public static DeviceCommand syringePumpForward(Double speed) {
Map<String, Object> params = new HashMap<>();
params.put("direction", "forward");
params.put("speed", speed);
return controlCmd("syringe_pump", "move", params, "推动移动注射泵");
}
/**
* 注射泵流速设置
*/
public static DeviceCommand syringePumpVolumeSet(Double speed) {
Map<String, Object> params = new HashMap<>();
params.put("speed", speed);
return controlCmd("syringe_pump", "set", params, "注射泵流速设置");
}
/**
* 控制注射泵
*/
public static DeviceCommand syringePumpControl(String action, String forward, Double volume) {
Map<String, Object> params = new HashMap<>();
params.put("current", forward);
params.put("volume", volume);
return controlCmd("syringe_pump", action, params, "控制注射泵");
}
/**
* 获取设备当前湿度
*/
public static DeviceCommand humidityGet() {
return getInfoCmd("humidity", "获取设备当前湿度");
}
/**
* 获取设备当前温度
*/
public static DeviceCommand temperatureGet() {
return getInfoCmd("temperature", "获取设备当前温度");
}
/**
* 推入玻片托盘
*/
public static DeviceCommand slideTrayIn(Double position, Double speed) {
return motorYPositionSet(position, speed, "推入玻片托盘");
}
/**
* 推出玻片托盘
*/
public static DeviceCommand slideTrayOut(Double position, Double speed) {
return motorYPositionSet(position, speed, "推出玻片托盘");
}
/**
* 获得电机XYZ相对原点坐标
*/
public static DeviceCommand motorXyzPositionGet() {
return getInfoCmd("xyz", "获得电机XYZ相对原点坐标");
}
/**
* x轴停止移动
*/
public static DeviceCommand motorXStop() {
return controlMotorCmd("x", "stop", null, null, null, null, "x轴停止移动");
}
/**
* y轴停止移动
*/
public static DeviceCommand motorYStop() {
return controlMotorCmd("y", "stop", null, null, null, null, "y轴停止移动");
}
/**
* z轴停止移动
*/
public static DeviceCommand motorZStop() {
return controlMotorCmd("z", "stop", null, null, null, null, "z轴停止移动");
}
/**
* x轴回原点
*/
public static DeviceCommand motorXOrigin() {
return controlMotorCmd("x", "origin", null, null, null, null, "x轴回原点");
}
/**
* y轴回原点
*/
public static DeviceCommand motorYOrigin() {
return controlMotorCmd("y", "origin", null, null, null, null, "y轴回原点");
}
/**
* z轴回原点
*/
public static DeviceCommand motorZOrigin() {
return controlMotorCmd("z", "origin", null, null, null, null, "z轴回原点");
}
/**
* 移动x轴到指定位置
*/
public static DeviceCommand motorXPositionSet(Double position) {
return motorXPositionSet(position, null, "移动x轴到指定位置");
}
/**
* 移动y轴到指定位置
*/
public static DeviceCommand motorYPositionSet(Double position) {
return motorYPositionSet(position, null, "移动y轴到指定位置");
}
/**
* 移动z轴到指定位置
*/
public static DeviceCommand motorZPositionSet(Double position) {
return motorZPositionSet(position, null, "移动z轴到指定位置");
}
/**
* 移动x轴到指定位置
*/
public static DeviceCommand motorXPositionSet(Double position, Double speed) {
return motorXPositionSet(position, speed, "移动x轴到指定位置");
}
/**
* 移动y轴到指定位置
*/
public static DeviceCommand motorYPositionSet(Double position, Double speed) {
return motorYPositionSet(position, speed, "移动y轴到指定位置");
}
/**
* 移动z轴到指定位置
*/
public static DeviceCommand motorZPositionSet(Double position, Double speed) {
return motorZPositionSet(position, speed, "移动z轴到指定位置");
}
/**
* 移动x轴到指定位置
*/
private static DeviceCommand motorXPositionSet(Double position, Double speed, String commandName) {
return controlMotorCmd("x", "move", null, "forward", position, speed, commandName);
}
/**
* 移动y轴到指定位置
*/
private static DeviceCommand motorYPositionSet(Double position, Double speed, String commandName) {
return controlMotorCmd("y", "move", null, "forward", position, speed, commandName);
}
/**
* 移动z轴到指定位置
*/
private static DeviceCommand motorZPositionSet(Double position, Double speed, String commandName) {
return controlMotorCmd("z", "move", null, "forward", position, speed, commandName);
}
/**
* x电机方向设置
*/
public static DeviceCommand motorXDirectionSet(String direction) {
return controlMotorCmd("x", "set", null, direction, null, null, "x电机方向设置");
}
/**
* y电机方向设置
*/
public static DeviceCommand motorYDirectionSet(String direction) {
return controlMotorCmd("y", "set", null, direction, null, null, "y电机方向设置");
}
/**
* z电机方向设置
*/
public static DeviceCommand motorZDirectionSet(String direction) {
return controlMotorCmd("z", "set", null, direction, null, null, "z电机方向设置");
}
/**
* x轴电机电流设置
*/
public static DeviceCommand motorXCurrentSet(Double current) {
return controlMotorCmd("x", "set", current, null, null, null, "x轴电机电流设置");
}
/**
* y轴电机电流设置
*/
public static DeviceCommand motorYCurrentSet(Double current) {
return controlMotorCmd("y", "set", current, null, null, null, "y轴电机电流设置");
}
/**
* z轴电机电流设置
*/
public static DeviceCommand motorZCurrentSet(Double current) {
return controlMotorCmd("z", "set", current, null, null, null, "z轴电机电流设置");
}
/**
* x轴电机速度设置
*/
public static DeviceCommand motorXSpeedSet(Double speed) {
return controlMotorCmd("x", "set", null, null, null, speed, "x轴电机速度设置");
}
/**
* y轴电机速度设置
*/
public static DeviceCommand motorYSpeedSet(Double speed) {
return controlMotorCmd("y", "set", null, null, null, speed, "y轴电机速度设置");
}
/**
* z轴电机速度设置
*/
public static DeviceCommand motorZSpeedSet(Double speed) {
return controlMotorCmd("z", "set", null, null, null, speed, "z轴电机速度设置");
}
/**
* x轴电机控制
*/
public static DeviceCommand motorX(String action, Double current, String direction, Double position, Double speed) {
return controlMotorCmd("x", action, current, direction, position, speed, "x轴电机控制");
}
/**
* y轴电机控制
*/
public static DeviceCommand motorY(String action, Double current, String direction, Double position, Double speed) {
return controlMotorCmd("y", action, current, direction, position, speed, "y轴电机控制");
}
/**
* z轴电机控制
*/
public static DeviceCommand motorZ(String action, Double current, String direction, Double position, Double speed) {
return controlMotorCmd("z", action, current, direction, position, speed, "z轴电机控制");
}
/**
* 控制设备电机
*/
public static DeviceCommand controlMotorCmd(String device, String action, Double current, String direction, Double position, Double speed, String commandName) {
if (commandName == null) {
commandName = "控制设备电机";
}
Map<String, Object> params = new HashMap<>();
params.put("current", current);
params.put("direction", direction);
params.put("position", position);
params.put("speed", speed);
return deviceCmd("controlMotorCmd", device, action, params, commandName);
}
/**
* 获取设备整体状态
*/
public static DeviceCommand overallDeviceStatusGet() {
return getInfoCmd("device", "获取设备整体状态");
}
/**
* 设备控制指令包装
*/
private static DeviceCommand controlCmd(String device, String action, Map<String, Object> params, String commandName) {
return deviceCmd("controlCmd", device, action, params, commandName);
}
/**
* 获取设备信息指令包装
*/
private static DeviceCommand getInfoCmd(String device, String commandName) {
return deviceCmd("getInfoCmd", device, "get", null, commandName);
}
/**
* 设备指令包装
*/
private static DeviceCommand deviceCmd(String code, String device, String action, Map<String, Object> params, String commandName) {
// int cmdId = CyclicNumberGenerator.getInstance().generateNumber();
DeviceCommand cmdToDevice = new DeviceCommand();
// cmdToDevice.setCmdId(cmdId);
cmdToDevice.setCmdCode(code);
cmdToDevice.setDevice(device);
cmdToDevice.setAction(action);
cmdToDevice.setParam(params);
cmdToDevice.setCmdName(commandName);
return cmdToDevice;
}
}

2
src/main/java/com/iflytop/gd/app/common/enums/CraftEvents.java → src/main/java/com/iflytop/gd/common/enums/CraftEvents.java

@ -1,4 +1,4 @@
package com.iflytop.gd.app.common.enums;
package com.iflytop.gd.common.enums;
/**
* 工艺状态机事件枚举

2
src/main/java/com/iflytop/gd/app/common/enums/CraftStates.java → src/main/java/com/iflytop/gd/common/enums/CraftStates.java

@ -1,4 +1,4 @@
package com.iflytop.gd.app.common.enums;
package com.iflytop.gd.common.enums;
/**
* 工艺状态机状态枚举

2
src/main/java/com/iflytop/gd/system/exceptions/CommandExecTimeoutException.java → src/main/java/com/iflytop/gd/common/exception/CommandExecTimeoutException.java

@ -1,4 +1,4 @@
package com.iflytop.gd.system.exceptions;
package com.iflytop.gd.common.exception;
public class CommandExecTimeoutException extends Exception{
public CommandExecTimeoutException() {

2
src/main/java/com/iflytop/gd/system/exceptions/HardwareErrorException.java → src/main/java/com/iflytop/gd/common/exception/HardwareErrorException.java

@ -1,4 +1,4 @@
package com.iflytop.gd.system.exceptions;
package com.iflytop.gd.common.exception;
public class HardwareErrorException extends Exception{
public HardwareErrorException() {

2
src/main/java/com/iflytop/gd/app/service/exceptions/UnSupportCommandException.java → src/main/java/com/iflytop/gd/common/exception/UnSupportCommandException.java

@ -1,4 +1,4 @@
package com.iflytop.gd.app.service.exceptions;
package com.iflytop.gd.common.exception;
/**
* 不支持的命令异常

2
src/main/java/com/iflytop/gd/system/utils/ByteArray.java → src/main/java/com/iflytop/gd/common/utils/ByteArray.java

@ -1,5 +1,5 @@
// Source code is decompiled from a .class file using FernFlower decompiler.
package com.iflytop.gd.system.utils;
package com.iflytop.gd.common.utils;
import org.springframework.lang.NonNull;

0
src/main/java/com/iflytop/gd/infrastructure/comm/rs485/driver/d.txt → src/main/java/com/iflytop/gd/hardware/comm/can/driver/d.txt

0
src/main/java/com/iflytop/gd/infrastructure/comm/rs485/listener/d.txt → src/main/java/com/iflytop/gd/hardware/comm/can/listener/d.txt

0
src/main/java/com/iflytop/gd/infrastructure/comm/rs485/protocol/d.txt → src/main/java/com/iflytop/gd/hardware/comm/can/protocol/d.txt

0
src/main/java/com/iflytop/gd/infrastructure/comm/can/driver/d.txt → src/main/java/com/iflytop/gd/hardware/comm/rs485/driver/d.txt

0
src/main/java/com/iflytop/gd/infrastructure/comm/can/listener/d.txt → src/main/java/com/iflytop/gd/hardware/comm/rs485/listener/d.txt

0
src/main/java/com/iflytop/gd/infrastructure/comm/can/protocol/d.txt → src/main/java/com/iflytop/gd/hardware/comm/rs485/protocol/d.txt

5
src/main/java/com/iflytop/gd/hardware/constants/Dim.java

@ -0,0 +1,5 @@
package com.iflytop.gd.hardware.constants;
public enum Dim {
X, Y, Z
}

2
src/main/java/com/iflytop/gd/system/constants/DistanceUnit.java → src/main/java/com/iflytop/gd/hardware/constants/DistanceUnit.java

@ -1,4 +1,4 @@
package com.iflytop.gd.system.constants;
package com.iflytop.gd.hardware.constants;
public enum DistanceUnit {
MM, CM;

2
src/main/java/com/iflytop/gd/system/constants/LiquidFillArmMotorIndex.java → src/main/java/com/iflytop/gd/hardware/constants/LiquidFillArmMotorIndex.java

@ -1,4 +1,4 @@
package com.iflytop.gd.system.constants;
package com.iflytop.gd.hardware.constants;
public enum LiquidFillArmMotorIndex {
LargeArm, SmallArm

2
src/main/java/com/iflytop/gd/system/constants/RotationDirection.java → src/main/java/com/iflytop/gd/hardware/constants/RotationDirection.java

@ -1,4 +1,4 @@
package com.iflytop.gd.system.constants;
package com.iflytop.gd.hardware.constants;
import lombok.Getter;

2
src/main/java/com/iflytop/gd/system/constants/VelocityUnit.java → src/main/java/com/iflytop/gd/hardware/constants/VelocityUnit.java

@ -1,4 +1,4 @@
package com.iflytop.gd.system.constants;
package com.iflytop.gd.hardware.constants;
/**
* 移动速度单位

13
src/main/java/com/iflytop/gd/infrastructure/devices/physical/PhysicalColdTray.java → src/main/java/com/iflytop/gd/hardware/device/ColdTray.java

@ -1,42 +1,33 @@
package com.iflytop.gd.infrastructure.devices.physical;
import com.iflytop.gd.system.devices.ColdTray;
package com.iflytop.gd.hardware.device;
/**
* 物理冷阱
*/
public class PhysicalColdTray implements ColdTray {
@Override
public class ColdTray {
public boolean setTemperature(Double temperature) {
return false;
}
@Override
public boolean startRecycle() {
return false;
}
@Override
public boolean stopRecycle() {
return false;
}
@Override
public boolean startHeating() {
return false;
}
@Override
public boolean stopHeating() {
return false;
}
@Override
public boolean startRefrigeration() {
return false;
}
@Override
public boolean stopRefrigeration() {
return false;
}

17
src/main/java/com/iflytop/gd/hardware/device/Door.java

@ -0,0 +1,17 @@
package com.iflytop.gd.hardware.device;
/**
* 物理门
*/
public class Door {
public void open() {
}
public void close() {
}
public void stop() {
}
}

13
src/main/java/com/iflytop/gd/hardware/device/Fan.java

@ -0,0 +1,13 @@
package com.iflytop.gd.hardware.device;
/**
* 物理风扇
*/
public class Fan {
public boolean open() {
return false;
}
public boolean close() {
return false;
}
}

22
src/main/java/com/iflytop/gd/hardware/device/HoldingJaw.java

@ -0,0 +1,22 @@
package com.iflytop.gd.hardware.device;
/**
* 物理夹爪
*/
public class HoldingJaw{
public void open() {
}
public void close() {
}
public void pause() {
}
public void resume() {
}
public void setSpeed(int speed) {
}
}

24
src/main/java/com/iflytop/gd/hardware/device/LiquidFillingArm.java

@ -0,0 +1,24 @@
package com.iflytop.gd.hardware.device;
import com.iflytop.gd.hardware.constants.LiquidFillArmMotorIndex;
import com.iflytop.gd.hardware.constants.RotationDirection;
import com.iflytop.gd.hardware.constants.VelocityUnit;
import com.iflytop.gd.app.model.bo.Point3D;
/**
* 物理液体加注机械臂
*/
public class LiquidFillingArm {
public void moveTo(Point3D point) {
}
public void rotateTo(LiquidFillArmMotorIndex liquidFillArmMotorIndex, Integer angle, RotationDirection direction) {
}
public void setRotationSpeed(Integer speed, VelocityUnit speedUnit) {
}
}

Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save