From fdd88cfbbe7a3f6fc965459713e5e74695dc318c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E5=87=A4=E5=90=89?= Date: Mon, 26 May 2025 11:10:13 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=80=E4=B8=8B=E7=BB=93?= =?UTF-8?q?=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 2 - .../debug/DebugTransportationArmMoveCommand.java | 1 - .../gd/app/controller/SelfTestController.java | 2 +- .../app/core/aspect/DeviceStateChangeAspect.java | 2 +- .../gd/app/model/bo/status/SelfTestState.java | 49 ++++++++++++++++++++++ .../app/model/bo/status/device/SelfTestState.java | 49 ---------------------- .../gd/app/service/device/SelfTestService.java | 2 +- .../iflytop/gd/common/constant/CommandStatus.java | 2 +- 8 files changed, 53 insertions(+), 56 deletions(-) create mode 100644 src/main/java/com/iflytop/gd/app/model/bo/status/SelfTestState.java delete mode 100644 src/main/java/com/iflytop/gd/app/model/bo/status/device/SelfTestState.java diff --git a/build.gradle b/build.gradle index 3897328..667abe7 100644 --- a/build.gradle +++ b/build.gradle @@ -21,8 +21,6 @@ repositories { } dependencies { - - implementation 'org.springframework.boot:spring-boot-starter' implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-websocket:3.4.2' diff --git a/src/main/java/com/iflytop/gd/app/command/debug/DebugTransportationArmMoveCommand.java b/src/main/java/com/iflytop/gd/app/command/debug/DebugTransportationArmMoveCommand.java index c4b8980..801ca11 100644 --- a/src/main/java/com/iflytop/gd/app/command/debug/DebugTransportationArmMoveCommand.java +++ b/src/main/java/com/iflytop/gd/app/command/debug/DebugTransportationArmMoveCommand.java @@ -39,7 +39,6 @@ public class DebugTransportationArmMoveCommand extends BaseCommandHandler { Double yDimVelocity = cmdDTO.getDoubleParam("yDimVelocity"); Double zDimVelocity = cmdDTO.getDoubleParam("zDimVelocity"); Integer times = cmdDTO.getIntegerParam("times"); - times = null; List futuresList = new ArrayList<>(); if (xDimVelocity != null) { DeviceCommandBundle deviceCommand = DeviceCommandGenerator.gantryXSet(xDimVelocity); diff --git a/src/main/java/com/iflytop/gd/app/controller/SelfTestController.java b/src/main/java/com/iflytop/gd/app/controller/SelfTestController.java index 15db579..29fac07 100644 --- a/src/main/java/com/iflytop/gd/app/controller/SelfTestController.java +++ b/src/main/java/com/iflytop/gd/app/controller/SelfTestController.java @@ -1,6 +1,6 @@ package com.iflytop.gd.app.controller; -import com.iflytop.gd.app.model.bo.status.device.SelfTestState; +import com.iflytop.gd.app.model.bo.status.SelfTestState; import com.iflytop.gd.app.service.device.SelfTestService; import com.iflytop.gd.app.service.device.DeviceStateService; import com.iflytop.gd.app.service.device.module.CapModuleService; diff --git a/src/main/java/com/iflytop/gd/app/core/aspect/DeviceStateChangeAspect.java b/src/main/java/com/iflytop/gd/app/core/aspect/DeviceStateChangeAspect.java index 6cdb32d..f655886 100644 --- a/src/main/java/com/iflytop/gd/app/core/aspect/DeviceStateChangeAspect.java +++ b/src/main/java/com/iflytop/gd/app/core/aspect/DeviceStateChangeAspect.java @@ -38,7 +38,7 @@ public class DeviceStateChangeAspect { } } - @After("execution(* com.iflytop.gd.app.service.command..set*(..))") + @After("execution(* com.iflytop.gd.app.model.bo.status..set*(..))") public void afterSetMethod(JoinPoint joinPoint) { try { String className = joinPoint.getSignature().getDeclaringType().getName(); // 获取类名 diff --git a/src/main/java/com/iflytop/gd/app/model/bo/status/SelfTestState.java b/src/main/java/com/iflytop/gd/app/model/bo/status/SelfTestState.java new file mode 100644 index 0000000..86c0562 --- /dev/null +++ b/src/main/java/com/iflytop/gd/app/model/bo/status/SelfTestState.java @@ -0,0 +1,49 @@ +package com.iflytop.gd.app.model.bo.status; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Schema(description = "自检状态") +@Data +public class SelfTestState { + @Schema(description = "门是否在原点") + private boolean doorOrigin = false; + + @Schema(description = "摇匀是否在原点") + private boolean shakeOrigin = false; + + @Schema(description = "龙门架机械臂x轴是否在原点") + private boolean gantryXOrigin = false; + + @Schema(description = "龙门架机械臂y轴是否在原点") + private boolean gantryYOrigin = false; + + @Schema(description = "龙门架机械臂z轴是否在原点") + private boolean gantryZOrigin = false; + + @Schema(description = "加液机械臂是否在原点") + private boolean dualRobotOrigin = false; + + @Schema(description = "拍子升降是否在原点") + private boolean capLiftingOrigin = false; + + @Schema(description = "加热模块01托盘升降是否在原点") + private boolean trayLifting01Origin = false; + + @Schema(description = "加热模块02托盘升降是否在原点") + private boolean trayLifting02Origin = false; + + @Schema(description = "加热模块03托盘升降是否在原点") + private boolean trayLifting03Origin = false; + + @Schema(description = "加热模块04托盘升降是否在原点") + private boolean trayLifting04Origin = false; + + @Schema(description = "加热模块05托盘升降是否在原点") + private boolean trayLifting05Origin = false; + + @Schema(description = "加热模块06托盘升降是否在原点") + private boolean trayLifting06Origin = false; + + +} diff --git a/src/main/java/com/iflytop/gd/app/model/bo/status/device/SelfTestState.java b/src/main/java/com/iflytop/gd/app/model/bo/status/device/SelfTestState.java deleted file mode 100644 index 78d6a72..0000000 --- a/src/main/java/com/iflytop/gd/app/model/bo/status/device/SelfTestState.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.iflytop.gd.app.model.bo.status.device; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -@Schema(description = "自检状态") -@Data -public class SelfTestState { - @Schema(description = "门是否在原点") - private boolean doorOrigin = false; - - @Schema(description = "摇匀是否在原点") - private boolean shakeOrigin = false; - - @Schema(description = "龙门架机械臂x轴是否在原点") - private boolean gantryXOrigin = false; - - @Schema(description = "龙门架机械臂y轴是否在原点") - private boolean gantryYOrigin = false; - - @Schema(description = "龙门架机械臂z轴是否在原点") - private boolean gantryZOrigin = false; - - @Schema(description = "加液机械臂是否在原点") - private boolean dualRobotOrigin = false; - - @Schema(description = "拍子升降是否在原点") - private boolean capLiftingOrigin = false; - - @Schema(description = "加热模块01托盘升降是否在原点") - private boolean trayLifting01Origin = false; - - @Schema(description = "加热模块02托盘升降是否在原点") - private boolean trayLifting02Origin = false; - - @Schema(description = "加热模块03托盘升降是否在原点") - private boolean trayLifting03Origin = false; - - @Schema(description = "加热模块04托盘升降是否在原点") - private boolean trayLifting04Origin = false; - - @Schema(description = "加热模块05托盘升降是否在原点") - private boolean trayLifting05Origin = false; - - @Schema(description = "加热模块06托盘升降是否在原点") - private boolean trayLifting06Origin = false; - - -} diff --git a/src/main/java/com/iflytop/gd/app/service/device/SelfTestService.java b/src/main/java/com/iflytop/gd/app/service/device/SelfTestService.java index 078b689..c4d9b9d 100644 --- a/src/main/java/com/iflytop/gd/app/service/device/SelfTestService.java +++ b/src/main/java/com/iflytop/gd/app/service/device/SelfTestService.java @@ -1,6 +1,6 @@ package com.iflytop.gd.app.service.device; -import com.iflytop.gd.app.model.bo.status.device.SelfTestState; +import com.iflytop.gd.app.model.bo.status.SelfTestState; import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/iflytop/gd/common/constant/CommandStatus.java b/src/main/java/com/iflytop/gd/common/constant/CommandStatus.java index 8123882..db59c5e 100644 --- a/src/main/java/com/iflytop/gd/common/constant/CommandStatus.java +++ b/src/main/java/com/iflytop/gd/common/constant/CommandStatus.java @@ -15,7 +15,7 @@ public class CommandStatus { */ public static final String START = "start"; /** - * 开始执行指令 + * 等待执行指令 */ public static final String WAIT = "wait"; /**