From 018fb47799f0b97e2df513b1ace56e38b10386b9 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:29:53 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=9E=9A=E4=B8=BE=E9=87=87=E7=94=A8?= =?UTF-8?q?=E5=A4=A7=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/common/command/DeviceCommandGenerator.java | 68 +++++++++++----------- .../colortitration/common/enums/EnableStatus.java | 3 +- .../common/enums/MotorDirection.java | 2 +- .../common/enums/TricolorLightColor.java | 2 +- 4 files changed, 37 insertions(+), 38 deletions(-) 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 cc9992e..a3e3967 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 @@ -98,7 +98,7 @@ public class DeviceCommandGenerator { */ public static DeviceCommand stirMotor01ForwardRotate() { DeviceCommandParams params = new DeviceCommandParams(); - params.setDirection(MotorDirection.forward); + params.setDirection(MotorDirection.FORWARD); return controlMotorCmd(Device.STIR_MOTOR_1, Action.ROTATE, params); } @@ -107,7 +107,7 @@ public class DeviceCommandGenerator { */ public static DeviceCommand stirMotor01BackwardRotate() { DeviceCommandParams params = new DeviceCommandParams(); - params.setDirection(MotorDirection.backward); + params.setDirection(MotorDirection.BACKWARD); return controlMotorCmd(Device.STIR_MOTOR_1, Action.ROTATE, params); } @@ -124,7 +124,7 @@ public class DeviceCommandGenerator { */ public static DeviceCommand stirMotor02ForwardRotate() { DeviceCommandParams params = new DeviceCommandParams(); - params.setDirection(MotorDirection.forward); + params.setDirection(MotorDirection.FORWARD); return controlMotorCmd(Device.STIR_MOTOR_2, Action.ROTATE, params); } @@ -133,7 +133,7 @@ public class DeviceCommandGenerator { */ public static DeviceCommand stirMotor02BackwardRotate() { DeviceCommandParams params = new DeviceCommandParams(); - params.setDirection(MotorDirection.backward); + params.setDirection(MotorDirection.BACKWARD); return controlMotorCmd(Device.STIR_MOTOR_2, Action.ROTATE, params); } @@ -152,7 +152,7 @@ public class DeviceCommandGenerator { */ public static DeviceCommand stepPump01ForwardRotate() { DeviceCommandParams params = new DeviceCommandParams(); - params.setDirection(MotorDirection.forward); + params.setDirection(MotorDirection.FORWARD); return setInfoCmd(Device.STEP_PUMP_1, Action.ROTATE, params); } @@ -161,7 +161,7 @@ public class DeviceCommandGenerator { */ public static DeviceCommand stepPump01BackwardRotate() { DeviceCommandParams params = new DeviceCommandParams(); - params.setDirection(MotorDirection.backward); + params.setDirection(MotorDirection.BACKWARD); return setInfoCmd(Device.STEP_PUMP_1, Action.ROTATE, params); } @@ -185,7 +185,7 @@ public class DeviceCommandGenerator { */ public static DeviceCommand stepPump02ForwardRotate() { DeviceCommandParams params = new DeviceCommandParams(); - params.setDirection(MotorDirection.forward); + params.setDirection(MotorDirection.FORWARD); return setInfoCmd(Device.STEP_PUMP_2, Action.ROTATE, params); } @@ -194,7 +194,7 @@ public class DeviceCommandGenerator { */ public static DeviceCommand stepPump02BackwardRotate() { DeviceCommandParams params = new DeviceCommandParams(); - params.setDirection(MotorDirection.backward); + params.setDirection(MotorDirection.BACKWARD); return setInfoCmd(Device.STEP_PUMP_2, Action.ROTATE, params); } @@ -217,7 +217,7 @@ public class DeviceCommandGenerator { */ public static DeviceCommand stepPump03ForwardRotate() { DeviceCommandParams params = new DeviceCommandParams(); - params.setDirection(MotorDirection.forward); + params.setDirection(MotorDirection.FORWARD); return setInfoCmd(Device.STEP_PUMP_3, Action.ROTATE, params); } @@ -226,7 +226,7 @@ public class DeviceCommandGenerator { */ public static DeviceCommand stepPump03BackwardRotate() { DeviceCommandParams params = new DeviceCommandParams(); - params.setDirection(MotorDirection.backward); + params.setDirection(MotorDirection.BACKWARD); return setInfoCmd(Device.STEP_PUMP_3, Action.ROTATE, params); } @@ -250,7 +250,7 @@ public class DeviceCommandGenerator { */ public static DeviceCommand brushlessPump01ForwardRotate() { DeviceCommandParams params = new DeviceCommandParams(); - params.setDirection(MotorDirection.forward); + params.setDirection(MotorDirection.FORWARD); return setInfoCmd(Device.BRUSHLESS_PUMP_1, Action.ROTATE, params); } @@ -259,7 +259,7 @@ public class DeviceCommandGenerator { */ public static DeviceCommand brushlessPump01BackwardRotate() { DeviceCommandParams params = new DeviceCommandParams(); - params.setDirection(MotorDirection.backward); + params.setDirection(MotorDirection.BACKWARD); return setInfoCmd(Device.BRUSHLESS_PUMP_1, Action.ROTATE, params); } @@ -282,7 +282,7 @@ public class DeviceCommandGenerator { */ public static DeviceCommand brushlessPump02ForwardRotate() { DeviceCommandParams params = new DeviceCommandParams(); - params.setDirection(MotorDirection.forward); + params.setDirection(MotorDirection.FORWARD); return setInfoCmd(Device.BRUSHLESS_PUMP_2, Action.ROTATE, params); } @@ -291,7 +291,7 @@ public class DeviceCommandGenerator { */ public static DeviceCommand brushlessPump02BackwardRotate() { DeviceCommandParams params = new DeviceCommandParams(); - params.setDirection(MotorDirection.backward); + params.setDirection(MotorDirection.BACKWARD); return setInfoCmd(Device.BRUSHLESS_PUMP_2, Action.ROTATE, params); } @@ -314,7 +314,7 @@ public class DeviceCommandGenerator { */ public static DeviceCommand brushlessPump03ForwardRotate() { DeviceCommandParams params = new DeviceCommandParams(); - params.setDirection(MotorDirection.forward); + params.setDirection(MotorDirection.FORWARD); return setInfoCmd(Device.BRUSHLESS_PUMP_3, Action.ROTATE, params); } @@ -323,7 +323,7 @@ public class DeviceCommandGenerator { */ public static DeviceCommand brushlessPump03BackwardRotate() { DeviceCommandParams params = new DeviceCommandParams(); - params.setDirection(MotorDirection.backward); + params.setDirection(MotorDirection.BACKWARD); return setInfoCmd(Device.BRUSHLESS_PUMP_3, Action.ROTATE, params); } @@ -346,7 +346,7 @@ public class DeviceCommandGenerator { */ public static DeviceCommand brushlessPump04ForwardRotate() { DeviceCommandParams params = new DeviceCommandParams(); - params.setDirection(MotorDirection.forward); + params.setDirection(MotorDirection.FORWARD); return setInfoCmd(Device.BRUSHLESS_PUMP_4, Action.ROTATE, params); } @@ -355,7 +355,7 @@ public class DeviceCommandGenerator { */ public static DeviceCommand brushlessPump04BackwardRotate() { DeviceCommandParams params = new DeviceCommandParams(); - params.setDirection(MotorDirection.backward); + params.setDirection(MotorDirection.BACKWARD); return setInfoCmd(Device.BRUSHLESS_PUMP_4, Action.ROTATE, params); } @@ -378,7 +378,7 @@ public class DeviceCommandGenerator { */ public static DeviceCommand brushlessPump05ForwardRotate() { DeviceCommandParams params = new DeviceCommandParams(); - params.setDirection(MotorDirection.forward); + params.setDirection(MotorDirection.FORWARD); return setInfoCmd(Device.BRUSHLESS_PUMP_5, Action.ROTATE, params); } @@ -387,7 +387,7 @@ public class DeviceCommandGenerator { */ public static DeviceCommand brushlessPump05BackwardRotate() { DeviceCommandParams params = new DeviceCommandParams(); - params.setDirection(MotorDirection.backward); + params.setDirection(MotorDirection.BACKWARD); return setInfoCmd(Device.BRUSHLESS_PUMP_5, Action.ROTATE, params); } @@ -410,7 +410,7 @@ public class DeviceCommandGenerator { */ public static DeviceCommand brushlessPump06ForwardRotate() { DeviceCommandParams params = new DeviceCommandParams(); - params.setDirection(MotorDirection.forward); + params.setDirection(MotorDirection.FORWARD); return setInfoCmd(Device.BRUSHLESS_PUMP_6, Action.ROTATE, params); } @@ -419,7 +419,7 @@ public class DeviceCommandGenerator { */ public static DeviceCommand brushlessPump06BackwardRotate() { DeviceCommandParams params = new DeviceCommandParams(); - params.setDirection(MotorDirection.backward); + params.setDirection(MotorDirection.BACKWARD); return setInfoCmd(Device.BRUSHLESS_PUMP_6, Action.ROTATE, params); } @@ -442,7 +442,7 @@ public class DeviceCommandGenerator { */ public static DeviceCommand brushlessPump07ForwardRotate() { DeviceCommandParams params = new DeviceCommandParams(); - params.setDirection(MotorDirection.forward); + params.setDirection(MotorDirection.FORWARD); return setInfoCmd(Device.BRUSHLESS_PUMP_7, Action.ROTATE, params); } @@ -451,7 +451,7 @@ public class DeviceCommandGenerator { */ public static DeviceCommand brushlessPump07BackwardRotate() { DeviceCommandParams params = new DeviceCommandParams(); - params.setDirection(MotorDirection.backward); + params.setDirection(MotorDirection.BACKWARD); return setInfoCmd(Device.BRUSHLESS_PUMP_7, Action.ROTATE, params); } @@ -474,7 +474,7 @@ public class DeviceCommandGenerator { */ public static DeviceCommand brushlessPump08ForwardRotate() { DeviceCommandParams params = new DeviceCommandParams(); - params.setDirection(MotorDirection.forward); + params.setDirection(MotorDirection.FORWARD); return setInfoCmd(Device.BRUSHLESS_PUMP_8, Action.ROTATE, params); } @@ -483,7 +483,7 @@ public class DeviceCommandGenerator { */ public static DeviceCommand brushlessPump08BackwardRotate() { DeviceCommandParams params = new DeviceCommandParams(); - params.setDirection(MotorDirection.backward); + params.setDirection(MotorDirection.BACKWARD); return setInfoCmd(Device.BRUSHLESS_PUMP_8, Action.ROTATE, params); } @@ -506,7 +506,7 @@ public class DeviceCommandGenerator { */ public static DeviceCommand brushlessPump09ForwardRotate() { DeviceCommandParams params = new DeviceCommandParams(); - params.setDirection(MotorDirection.forward); + params.setDirection(MotorDirection.FORWARD); return setInfoCmd(Device.BRUSHLESS_PUMP_9, Action.ROTATE, params); } @@ -515,7 +515,7 @@ public class DeviceCommandGenerator { */ public static DeviceCommand brushlessPump09BackwardRotate() { DeviceCommandParams params = new DeviceCommandParams(); - params.setDirection(MotorDirection.backward); + params.setDirection(MotorDirection.BACKWARD); return setInfoCmd(Device.BRUSHLESS_PUMP_9, Action.ROTATE, params); } @@ -538,7 +538,7 @@ public class DeviceCommandGenerator { */ public static DeviceCommand brushlessPump10ForwardRotate() { DeviceCommandParams params = new DeviceCommandParams(); - params.setDirection(MotorDirection.forward); + params.setDirection(MotorDirection.FORWARD); return setInfoCmd(Device.BRUSHLESS_PUMP_10, Action.ROTATE, params); } @@ -547,7 +547,7 @@ public class DeviceCommandGenerator { */ public static DeviceCommand brushlessPump10BackwardRotate() { DeviceCommandParams params = new DeviceCommandParams(); - params.setDirection(MotorDirection.backward); + params.setDirection(MotorDirection.BACKWARD); return setInfoCmd(Device.BRUSHLESS_PUMP_10, Action.ROTATE, params); } @@ -571,7 +571,7 @@ public class DeviceCommandGenerator { */ public static DeviceCommand ceramicPump01ForwardRotate() { DeviceCommandParams params = new DeviceCommandParams(); - params.setDirection(MotorDirection.forward); + params.setDirection(MotorDirection.FORWARD); return setInfoCmd(Device.CERAMIC_PUMP_1, Action.ROTATE, params); } @@ -580,7 +580,7 @@ public class DeviceCommandGenerator { */ public static DeviceCommand ceramicPump01BackwardRotate() { DeviceCommandParams params = new DeviceCommandParams(); - params.setDirection(MotorDirection.backward); + params.setDirection(MotorDirection.BACKWARD); return setInfoCmd(Device.CERAMIC_PUMP_1, Action.ROTATE, params); } @@ -603,7 +603,7 @@ public class DeviceCommandGenerator { */ public static DeviceCommand ceramicPump02ForwardRotate() { DeviceCommandParams params = new DeviceCommandParams(); - params.setDirection(MotorDirection.forward); + params.setDirection(MotorDirection.FORWARD); return setInfoCmd(Device.CERAMIC_PUMP_2, Action.ROTATE, params); } @@ -612,7 +612,7 @@ public class DeviceCommandGenerator { */ public static DeviceCommand ceramicPump02BackwardRotate() { DeviceCommandParams params = new DeviceCommandParams(); - params.setDirection(MotorDirection.backward); + params.setDirection(MotorDirection.BACKWARD); return setInfoCmd(Device.CERAMIC_PUMP_2, Action.ROTATE, params); } diff --git a/src/main/java/com/iflytop/colortitration/common/enums/EnableStatus.java b/src/main/java/com/iflytop/colortitration/common/enums/EnableStatus.java index 92bb195..2ed39cc 100644 --- a/src/main/java/com/iflytop/colortitration/common/enums/EnableStatus.java +++ b/src/main/java/com/iflytop/colortitration/common/enums/EnableStatus.java @@ -1,6 +1,5 @@ package com.iflytop.colortitration.common.enums; public enum EnableStatus { - ENABLE, - DISABLE + ENABLE, DISABLE } diff --git a/src/main/java/com/iflytop/colortitration/common/enums/MotorDirection.java b/src/main/java/com/iflytop/colortitration/common/enums/MotorDirection.java index eb378f9..54fdae5 100644 --- a/src/main/java/com/iflytop/colortitration/common/enums/MotorDirection.java +++ b/src/main/java/com/iflytop/colortitration/common/enums/MotorDirection.java @@ -1,5 +1,5 @@ package com.iflytop.colortitration.common.enums; public enum MotorDirection { - forward, backward + 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 index f1c6994..791070f 100644 --- a/src/main/java/com/iflytop/colortitration/common/enums/TricolorLightColor.java +++ b/src/main/java/com/iflytop/colortitration/common/enums/TricolorLightColor.java @@ -1,5 +1,5 @@ package com.iflytop.colortitration.common.enums; public enum TricolorLightColor { - red, green, blue + RED, GREEN, BLUE }