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/command/Action.java b/src/main/java/com/iflytop/colortitration/common/enums/Action.java similarity index 91% rename from src/main/java/com/iflytop/colortitration/common/enums/command/Action.java rename to src/main/java/com/iflytop/colortitration/common/enums/Action.java index 95104b1..5a0b2a2 100644 --- a/src/main/java/com/iflytop/colortitration/common/enums/command/Action.java +++ b/src/main/java/com/iflytop/colortitration/common/enums/Action.java @@ -1,4 +1,4 @@ -package com.iflytop.colortitration.common.enums.command; +package com.iflytop.colortitration.common.enums; import lombok.Getter; diff --git a/src/main/java/com/iflytop/colortitration/common/enums/command/Device.java b/src/main/java/com/iflytop/colortitration/common/enums/Device.java similarity index 94% rename from src/main/java/com/iflytop/colortitration/common/enums/command/Device.java rename to src/main/java/com/iflytop/colortitration/common/enums/Device.java index a875479..3cb88c1 100644 --- a/src/main/java/com/iflytop/colortitration/common/enums/command/Device.java +++ b/src/main/java/com/iflytop/colortitration/common/enums/Device.java @@ -1,6 +1,5 @@ -package com.iflytop.colortitration.common.enums.command; +package com.iflytop.colortitration.common.enums; -import com.iflytop.colortitration.common.enums.HardwareType; import lombok.Getter; public enum Device { 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/command/TricolorLightColor.java b/src/main/java/com/iflytop/colortitration/common/enums/TricolorLightColor.java similarity index 50% rename from src/main/java/com/iflytop/colortitration/common/enums/command/TricolorLightColor.java rename to src/main/java/com/iflytop/colortitration/common/enums/TricolorLightColor.java index a28ad8e..f1c6994 100644 --- a/src/main/java/com/iflytop/colortitration/common/enums/command/TricolorLightColor.java +++ b/src/main/java/com/iflytop/colortitration/common/enums/TricolorLightColor.java @@ -1,4 +1,4 @@ -package com.iflytop.colortitration.common.enums.command; +package com.iflytop.colortitration.common.enums; public enum TricolorLightColor { red, green, blue 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/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;