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/device/SelfTestState.java b/src/main/java/com/iflytop/gd/app/model/bo/status/SelfTestState.java similarity index 96% rename from src/main/java/com/iflytop/gd/app/model/bo/status/device/SelfTestState.java rename to src/main/java/com/iflytop/gd/app/model/bo/status/SelfTestState.java index 78d6a72..86c0562 100644 --- 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/SelfTestState.java @@ -1,4 +1,4 @@ -package com.iflytop.gd.app.model.bo.status.device; +package com.iflytop.gd.app.model.bo.status; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; 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"; /**