From f49bfca14d5dda42535b47653e274ff9290a47c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E5=87=A4=E5=90=89?= Date: Tue, 22 Jul 2025 20:26:03 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E5=AE=9A=E4=B9=89=E5=B8=B8=E7=94=A8?= =?UTF-8?q?=E6=8C=87=E4=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/common/command/DeviceCommand.java | 4 +- .../app/common/command/DeviceCommandGenerator.java | 8 ++-- .../common/command/DeviceCommandParams.java | 4 +- .../colortitration/common/enums/Action.java | 36 +++++++++++++++ .../colortitration/common/enums/Device.java | 51 +++++++++++++++++++++ .../common/enums/MotorDirection.java | 5 +++ .../common/enums/TricolorLightColor.java | 5 +++ .../common/enums/command/Action.java | 36 --------------- .../common/enums/command/Device.java | 52 ---------------------- .../common/enums/command/MotorDirection.java | 5 --- .../common/enums/command/TricolorLightColor.java | 5 --- .../common/handler/DeviceTypeHandler.java | 2 +- .../colortitration/common/model/entity/Pump.java | 2 +- 13 files changed, 107 insertions(+), 108 deletions(-) create mode 100644 src/main/java/com/iflytop/colortitration/common/enums/Action.java create mode 100644 src/main/java/com/iflytop/colortitration/common/enums/Device.java create mode 100644 src/main/java/com/iflytop/colortitration/common/enums/MotorDirection.java create mode 100644 src/main/java/com/iflytop/colortitration/common/enums/TricolorLightColor.java delete mode 100644 src/main/java/com/iflytop/colortitration/common/enums/command/Action.java delete mode 100644 src/main/java/com/iflytop/colortitration/common/enums/command/Device.java delete mode 100644 src/main/java/com/iflytop/colortitration/common/enums/command/MotorDirection.java delete mode 100644 src/main/java/com/iflytop/colortitration/common/enums/command/TricolorLightColor.java diff --git a/src/main/java/com/iflytop/colortitration/app/common/command/DeviceCommand.java b/src/main/java/com/iflytop/colortitration/app/common/command/DeviceCommand.java index cdc2201..71cad50 100644 --- a/src/main/java/com/iflytop/colortitration/app/common/command/DeviceCommand.java +++ b/src/main/java/com/iflytop/colortitration/app/common/command/DeviceCommand.java @@ -1,8 +1,8 @@ package com.iflytop.colortitration.app.common.command; import com.iflytop.colortitration.common.command.DeviceCommandParams; -import com.iflytop.colortitration.common.enums.command.Action; -import com.iflytop.colortitration.common.enums.command.Device; +import com.iflytop.colortitration.common.enums.Action; +import com.iflytop.colortitration.common.enums.Device; import lombok.Data; @Data diff --git a/src/main/java/com/iflytop/colortitration/app/common/command/DeviceCommandGenerator.java b/src/main/java/com/iflytop/colortitration/app/common/command/DeviceCommandGenerator.java index dabcc14..cc9992e 100644 --- a/src/main/java/com/iflytop/colortitration/app/common/command/DeviceCommandGenerator.java +++ b/src/main/java/com/iflytop/colortitration/app/common/command/DeviceCommandGenerator.java @@ -1,10 +1,10 @@ package com.iflytop.colortitration.app.common.command; import com.iflytop.colortitration.common.command.DeviceCommandParams; -import com.iflytop.colortitration.common.enums.command.Action; -import com.iflytop.colortitration.common.enums.command.Device; -import com.iflytop.colortitration.common.enums.command.MotorDirection; -import com.iflytop.colortitration.common.enums.command.TricolorLightColor; +import com.iflytop.colortitration.common.enums.Action; +import com.iflytop.colortitration.common.enums.Device; +import com.iflytop.colortitration.common.enums.MotorDirection; +import com.iflytop.colortitration.common.enums.TricolorLightColor; /** * 生成给设备发送的指令 diff --git a/src/main/java/com/iflytop/colortitration/common/command/DeviceCommandParams.java b/src/main/java/com/iflytop/colortitration/common/command/DeviceCommandParams.java index b2cf810..f357b1f 100644 --- a/src/main/java/com/iflytop/colortitration/common/command/DeviceCommandParams.java +++ b/src/main/java/com/iflytop/colortitration/common/command/DeviceCommandParams.java @@ -1,8 +1,8 @@ package com.iflytop.colortitration.common.command; -import com.iflytop.colortitration.common.enums.command.MotorDirection; -import com.iflytop.colortitration.common.enums.command.TricolorLightColor; +import com.iflytop.colortitration.common.enums.MotorDirection; +import com.iflytop.colortitration.common.enums.TricolorLightColor; import lombok.Data; @Data diff --git a/src/main/java/com/iflytop/colortitration/common/enums/Action.java b/src/main/java/com/iflytop/colortitration/common/enums/Action.java new file mode 100644 index 0000000..5a0b2a2 --- /dev/null +++ b/src/main/java/com/iflytop/colortitration/common/enums/Action.java @@ -0,0 +1,36 @@ +package com.iflytop.colortitration.common.enums; + +import lombok.Getter; + +/** + * 通用设备动作枚举 + */ +public enum Action { + MOVE("绝对移动"), + MOVE_BY("相对移动"), + ORIGIN("回原点"), + ROTATE("旋转"), + STOP("停止"), + OPEN("打开"), + CLOSE("关闭"), + SET("设置"), + GET("获取"), + OPEN_CLAMP("打开抱闸"), + CLOSE_CLAMP("关闭抱闸"), + ; + + /** + * 动作的中文描述 + */ + @Getter + private final String description; + + Action(String description) { + this.description = description; + } + + @Override + public String toString() { + return name(); + } +} \ No newline at end of file diff --git a/src/main/java/com/iflytop/colortitration/common/enums/Device.java b/src/main/java/com/iflytop/colortitration/common/enums/Device.java new file mode 100644 index 0000000..3cb88c1 --- /dev/null +++ b/src/main/java/com/iflytop/colortitration/common/enums/Device.java @@ -0,0 +1,51 @@ +package com.iflytop.colortitration.common.enums; + +import lombok.Getter; + +public enum Device { + Z_MOTOR(HardwareType.STEPPER_MOTOR, "Z 轴升降电机"), + CERAMIC_PUMP_1(HardwareType.STEPPER_MOTOR, "陶瓷泵 1"), + CERAMIC_PUMP_2(HardwareType.STEPPER_MOTOR, "陶瓷泵 2"), + BRUSHLESS_PUMP_1(HardwareType.STEPPER_MOTOR, "无刷泵 1"), + BRUSHLESS_PUMP_2(HardwareType.STEPPER_MOTOR, "无刷泵 2"), + BRUSHLESS_PUMP_3(HardwareType.STEPPER_MOTOR, "无刷泵 3"), + BRUSHLESS_PUMP_4(HardwareType.STEPPER_MOTOR, "无刷泵 4"), + BRUSHLESS_PUMP_5(HardwareType.STEPPER_MOTOR, "无刷泵 5"), + BRUSHLESS_PUMP_6(HardwareType.STEPPER_MOTOR, "无刷泵 6"), + BRUSHLESS_PUMP_7(HardwareType.STEPPER_MOTOR, "无刷泵 7"), + BRUSHLESS_PUMP_8(HardwareType.STEPPER_MOTOR, "无刷泵 8"), + BRUSHLESS_PUMP_9(HardwareType.STEPPER_MOTOR, "无刷泵 9"), + BRUSHLESS_PUMP_10(HardwareType.STEPPER_MOTOR, "无刷泵 10"), + STEP_PUMP_1(HardwareType.STEPPER_MOTOR, "步进泵 1"), + STEP_PUMP_2(HardwareType.STEPPER_MOTOR, "步进泵 2"), + STEP_PUMP_3(HardwareType.STEPPER_MOTOR, "步进泵 3"), + STIR_MOTOR_1(HardwareType.STEPPER_MOTOR, "搅拌电机 1"), + STIR_MOTOR_2(HardwareType.STEPPER_MOTOR, "搅拌电机 2"), + CLAW(HardwareType.SERVO_MOTOR, "夹爪"), + DUAL_ROBOT(HardwareType.STEPPER_MOTOR, "双轴机械臂"), + HEAT_ROD_1(HardwareType.IO_DEVICE, "加热棒 1"), + HEAT_ROD_2(HardwareType.IO_DEVICE, "加热棒 2"), + TRICOLOR_LIGHT(HardwareType.IO_DEVICE, "三色灯"), + ; + + /** + * 设备所属硬件类型 + */ + @Getter + private final HardwareType type; + /** + * 设备中文描述或显示名 + */ + @Getter + private final String description; + + Device(HardwareType type, String description) { + this.type = type; + this.description = description; + } + + @Override + public String toString() { + return this.name(); + } +} diff --git a/src/main/java/com/iflytop/colortitration/common/enums/MotorDirection.java b/src/main/java/com/iflytop/colortitration/common/enums/MotorDirection.java new file mode 100644 index 0000000..eb378f9 --- /dev/null +++ b/src/main/java/com/iflytop/colortitration/common/enums/MotorDirection.java @@ -0,0 +1,5 @@ +package com.iflytop.colortitration.common.enums; + +public enum MotorDirection { + forward, backward +} diff --git a/src/main/java/com/iflytop/colortitration/common/enums/TricolorLightColor.java b/src/main/java/com/iflytop/colortitration/common/enums/TricolorLightColor.java new file mode 100644 index 0000000..f1c6994 --- /dev/null +++ b/src/main/java/com/iflytop/colortitration/common/enums/TricolorLightColor.java @@ -0,0 +1,5 @@ +package com.iflytop.colortitration.common.enums; + +public enum TricolorLightColor { + red, green, blue +} diff --git a/src/main/java/com/iflytop/colortitration/common/enums/command/Action.java b/src/main/java/com/iflytop/colortitration/common/enums/command/Action.java deleted file mode 100644 index 95104b1..0000000 --- a/src/main/java/com/iflytop/colortitration/common/enums/command/Action.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.iflytop.colortitration.common.enums.command; - -import lombok.Getter; - -/** - * 通用设备动作枚举 - */ -public enum Action { - MOVE("绝对移动"), - MOVE_BY("相对移动"), - ORIGIN("回原点"), - ROTATE("旋转"), - STOP("停止"), - OPEN("打开"), - CLOSE("关闭"), - SET("设置"), - GET("获取"), - OPEN_CLAMP("打开抱闸"), - CLOSE_CLAMP("关闭抱闸"), - ; - - /** - * 动作的中文描述 - */ - @Getter - private final String description; - - Action(String description) { - this.description = description; - } - - @Override - public String toString() { - return name(); - } -} \ No newline at end of file diff --git a/src/main/java/com/iflytop/colortitration/common/enums/command/Device.java b/src/main/java/com/iflytop/colortitration/common/enums/command/Device.java deleted file mode 100644 index a875479..0000000 --- a/src/main/java/com/iflytop/colortitration/common/enums/command/Device.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.iflytop.colortitration.common.enums.command; - -import com.iflytop.colortitration.common.enums.HardwareType; -import lombok.Getter; - -public enum Device { - Z_MOTOR(HardwareType.STEPPER_MOTOR, "Z 轴升降电机"), - CERAMIC_PUMP_1(HardwareType.STEPPER_MOTOR, "陶瓷泵 1"), - CERAMIC_PUMP_2(HardwareType.STEPPER_MOTOR, "陶瓷泵 2"), - BRUSHLESS_PUMP_1(HardwareType.STEPPER_MOTOR, "无刷泵 1"), - BRUSHLESS_PUMP_2(HardwareType.STEPPER_MOTOR, "无刷泵 2"), - BRUSHLESS_PUMP_3(HardwareType.STEPPER_MOTOR, "无刷泵 3"), - BRUSHLESS_PUMP_4(HardwareType.STEPPER_MOTOR, "无刷泵 4"), - BRUSHLESS_PUMP_5(HardwareType.STEPPER_MOTOR, "无刷泵 5"), - BRUSHLESS_PUMP_6(HardwareType.STEPPER_MOTOR, "无刷泵 6"), - BRUSHLESS_PUMP_7(HardwareType.STEPPER_MOTOR, "无刷泵 7"), - BRUSHLESS_PUMP_8(HardwareType.STEPPER_MOTOR, "无刷泵 8"), - BRUSHLESS_PUMP_9(HardwareType.STEPPER_MOTOR, "无刷泵 9"), - BRUSHLESS_PUMP_10(HardwareType.STEPPER_MOTOR, "无刷泵 10"), - STEP_PUMP_1(HardwareType.STEPPER_MOTOR, "步进泵 1"), - STEP_PUMP_2(HardwareType.STEPPER_MOTOR, "步进泵 2"), - STEP_PUMP_3(HardwareType.STEPPER_MOTOR, "步进泵 3"), - STIR_MOTOR_1(HardwareType.STEPPER_MOTOR, "搅拌电机 1"), - STIR_MOTOR_2(HardwareType.STEPPER_MOTOR, "搅拌电机 2"), - CLAW(HardwareType.SERVO_MOTOR, "夹爪"), - DUAL_ROBOT(HardwareType.STEPPER_MOTOR, "双轴机械臂"), - HEAT_ROD_1(HardwareType.IO_DEVICE, "加热棒 1"), - HEAT_ROD_2(HardwareType.IO_DEVICE, "加热棒 2"), - TRICOLOR_LIGHT(HardwareType.IO_DEVICE, "三色灯"), - ; - - /** - * 设备所属硬件类型 - */ - @Getter - private final HardwareType type; - /** - * 设备中文描述或显示名 - */ - @Getter - private final String description; - - Device(HardwareType type, String description) { - this.type = type; - this.description = description; - } - - @Override - public String toString() { - return this.name(); - } -} diff --git a/src/main/java/com/iflytop/colortitration/common/enums/command/MotorDirection.java b/src/main/java/com/iflytop/colortitration/common/enums/command/MotorDirection.java deleted file mode 100644 index 539b9ab..0000000 --- a/src/main/java/com/iflytop/colortitration/common/enums/command/MotorDirection.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.iflytop.colortitration.common.enums.command; - -public enum MotorDirection { - forward, backward -} diff --git a/src/main/java/com/iflytop/colortitration/common/enums/command/TricolorLightColor.java b/src/main/java/com/iflytop/colortitration/common/enums/command/TricolorLightColor.java deleted file mode 100644 index a28ad8e..0000000 --- a/src/main/java/com/iflytop/colortitration/common/enums/command/TricolorLightColor.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.iflytop.colortitration.common.enums.command; - -public enum TricolorLightColor { - red, green, blue -} diff --git a/src/main/java/com/iflytop/colortitration/common/handler/DeviceTypeHandler.java b/src/main/java/com/iflytop/colortitration/common/handler/DeviceTypeHandler.java index 89f80ef..bc61ca2 100644 --- a/src/main/java/com/iflytop/colortitration/common/handler/DeviceTypeHandler.java +++ b/src/main/java/com/iflytop/colortitration/common/handler/DeviceTypeHandler.java @@ -1,6 +1,6 @@ package com.iflytop.colortitration.common.handler; -import com.iflytop.colortitration.common.enums.command.Device; +import com.iflytop.colortitration.common.enums.Device; import org.apache.ibatis.type.BaseTypeHandler; import org.apache.ibatis.type.JdbcType; import org.apache.ibatis.type.MappedJdbcTypes; diff --git a/src/main/java/com/iflytop/colortitration/common/model/entity/Pump.java b/src/main/java/com/iflytop/colortitration/common/model/entity/Pump.java index 2bc7216..60539f6 100644 --- a/src/main/java/com/iflytop/colortitration/common/model/entity/Pump.java +++ b/src/main/java/com/iflytop/colortitration/common/model/entity/Pump.java @@ -2,7 +2,7 @@ package com.iflytop.colortitration.common.model.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.iflytop.colortitration.common.base.BaseEntity; -import com.iflytop.colortitration.common.enums.command.Device; +import com.iflytop.colortitration.common.enums.Device; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode;