diff --git a/src/main/java/com/iflytop/gd/app/command/debug/DebugShakerResetCommand.java b/src/main/java/com/iflytop/gd/app/command/debug/DebugShakerResetCommand.java index 4a20fe4..0060e6b 100644 --- a/src/main/java/com/iflytop/gd/app/command/debug/DebugShakerResetCommand.java +++ b/src/main/java/com/iflytop/gd/app/command/debug/DebugShakerResetCommand.java @@ -3,7 +3,7 @@ package com.iflytop.gd.app.command.debug; import com.iflytop.gd.app.core.BaseCommandHandler; import com.iflytop.gd.app.model.dto.CmdDTO; import com.iflytop.gd.app.service.device.DeviceCommandService; -import com.iflytop.gd.app.service.api.SelfTestService; +import com.iflytop.gd.app.service.device.SelfTestService; import com.iflytop.gd.common.annotation.CommandMapping; import com.iflytop.gd.common.command.CommandFuture; import com.iflytop.gd.common.command.DeviceCommandBundle; diff --git a/src/main/java/com/iflytop/gd/app/command/selftest/CapLiftingOriginCommand.java b/src/main/java/com/iflytop/gd/app/command/selftest/CapLiftingOriginCommand.java index e70c28f..fac7029 100644 --- a/src/main/java/com/iflytop/gd/app/command/selftest/CapLiftingOriginCommand.java +++ b/src/main/java/com/iflytop/gd/app/command/selftest/CapLiftingOriginCommand.java @@ -2,7 +2,7 @@ package com.iflytop.gd.app.command.selftest; import com.iflytop.gd.app.core.BaseCommandHandler; import com.iflytop.gd.app.model.dto.CmdDTO; -import com.iflytop.gd.app.service.api.SelfTestService; +import com.iflytop.gd.app.service.device.SelfTestService; import com.iflytop.gd.app.service.device.module.CapModuleService; import com.iflytop.gd.common.annotation.CommandMapping; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/iflytop/gd/app/command/selftest/DoorOriginCommand.java b/src/main/java/com/iflytop/gd/app/command/selftest/DoorOriginCommand.java index f5f391d..1d58099 100644 --- a/src/main/java/com/iflytop/gd/app/command/selftest/DoorOriginCommand.java +++ b/src/main/java/com/iflytop/gd/app/command/selftest/DoorOriginCommand.java @@ -2,7 +2,7 @@ package com.iflytop.gd.app.command.selftest; import com.iflytop.gd.app.core.BaseCommandHandler; import com.iflytop.gd.app.model.dto.CmdDTO; -import com.iflytop.gd.app.service.api.SelfTestService; +import com.iflytop.gd.app.service.device.SelfTestService; import com.iflytop.gd.app.service.device.DeviceStateService; import com.iflytop.gd.app.service.device.module.DoorModuleService; import com.iflytop.gd.common.annotation.CommandMapping; diff --git a/src/main/java/com/iflytop/gd/app/command/selftest/DualRobotJointOriginCommand.java b/src/main/java/com/iflytop/gd/app/command/selftest/DualRobotJointOriginCommand.java index e23419f..1d84695 100644 --- a/src/main/java/com/iflytop/gd/app/command/selftest/DualRobotJointOriginCommand.java +++ b/src/main/java/com/iflytop/gd/app/command/selftest/DualRobotJointOriginCommand.java @@ -3,7 +3,7 @@ package com.iflytop.gd.app.command.selftest; import com.iflytop.gd.app.core.BaseCommandHandler; import com.iflytop.gd.app.model.dto.CmdDTO; import com.iflytop.gd.app.service.device.DeviceStateService; -import com.iflytop.gd.app.service.api.SelfTestService; +import com.iflytop.gd.app.service.device.SelfTestService; import com.iflytop.gd.common.annotation.CommandMapping; import com.iflytop.gd.hardware.drivers.LiquidDistributionArmDriver; import com.iflytop.gd.hardware.type.Servo.LiquidArmMId; diff --git a/src/main/java/com/iflytop/gd/app/command/selftest/GantryXOriginCommand.java b/src/main/java/com/iflytop/gd/app/command/selftest/GantryXOriginCommand.java index 6fcdbce..207e635 100644 --- a/src/main/java/com/iflytop/gd/app/command/selftest/GantryXOriginCommand.java +++ b/src/main/java/com/iflytop/gd/app/command/selftest/GantryXOriginCommand.java @@ -2,7 +2,7 @@ package com.iflytop.gd.app.command.selftest; import com.iflytop.gd.app.core.BaseCommandHandler; import com.iflytop.gd.app.model.dto.CmdDTO; -import com.iflytop.gd.app.service.api.SelfTestService; +import com.iflytop.gd.app.service.device.SelfTestService; import com.iflytop.gd.app.service.device.module.GantryModuleService; import com.iflytop.gd.common.annotation.CommandMapping; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/iflytop/gd/app/command/selftest/GantryYOriginCommand.java b/src/main/java/com/iflytop/gd/app/command/selftest/GantryYOriginCommand.java index dcda406..333d8a1 100644 --- a/src/main/java/com/iflytop/gd/app/command/selftest/GantryYOriginCommand.java +++ b/src/main/java/com/iflytop/gd/app/command/selftest/GantryYOriginCommand.java @@ -2,7 +2,7 @@ package com.iflytop.gd.app.command.selftest; import com.iflytop.gd.app.core.BaseCommandHandler; import com.iflytop.gd.app.model.dto.CmdDTO; -import com.iflytop.gd.app.service.api.SelfTestService; +import com.iflytop.gd.app.service.device.SelfTestService; import com.iflytop.gd.app.service.device.module.GantryModuleService; import com.iflytop.gd.common.annotation.CommandMapping; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/iflytop/gd/app/command/selftest/GantryZOriginCommand.java b/src/main/java/com/iflytop/gd/app/command/selftest/GantryZOriginCommand.java index 916d938..c1a2c35 100644 --- a/src/main/java/com/iflytop/gd/app/command/selftest/GantryZOriginCommand.java +++ b/src/main/java/com/iflytop/gd/app/command/selftest/GantryZOriginCommand.java @@ -2,7 +2,7 @@ package com.iflytop.gd.app.command.selftest; import com.iflytop.gd.app.core.BaseCommandHandler; import com.iflytop.gd.app.model.dto.CmdDTO; -import com.iflytop.gd.app.service.api.SelfTestService; +import com.iflytop.gd.app.service.device.SelfTestService; import com.iflytop.gd.app.service.device.module.GantryModuleService; import com.iflytop.gd.common.annotation.CommandMapping; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/iflytop/gd/app/command/selftest/ShakeOriginCommand.java b/src/main/java/com/iflytop/gd/app/command/selftest/ShakeOriginCommand.java index 0450ed3..c260213 100644 --- a/src/main/java/com/iflytop/gd/app/command/selftest/ShakeOriginCommand.java +++ b/src/main/java/com/iflytop/gd/app/command/selftest/ShakeOriginCommand.java @@ -2,7 +2,7 @@ package com.iflytop.gd.app.command.selftest; import com.iflytop.gd.app.core.BaseCommandHandler; import com.iflytop.gd.app.model.dto.CmdDTO; -import com.iflytop.gd.app.service.api.SelfTestService; +import com.iflytop.gd.app.service.device.SelfTestService; import com.iflytop.gd.app.service.device.module.SolutionModuleService; import com.iflytop.gd.common.annotation.CommandMapping; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/iflytop/gd/app/command/selftest/TrayLiftingOriginCommand.java b/src/main/java/com/iflytop/gd/app/command/selftest/TrayLiftingOriginCommand.java index 11bfec5..e5ad62a 100644 --- a/src/main/java/com/iflytop/gd/app/command/selftest/TrayLiftingOriginCommand.java +++ b/src/main/java/com/iflytop/gd/app/command/selftest/TrayLiftingOriginCommand.java @@ -2,7 +2,7 @@ package com.iflytop.gd.app.command.selftest; import com.iflytop.gd.app.core.BaseCommandHandler; import com.iflytop.gd.app.model.dto.CmdDTO; -import com.iflytop.gd.app.service.api.SelfTestService; +import com.iflytop.gd.app.service.device.SelfTestService; import com.iflytop.gd.app.service.device.module.HeatModuleService; import com.iflytop.gd.common.annotation.CommandMapping; import com.iflytop.gd.common.enums.HeatModuleCode; 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 d448398..15db579 100644 --- a/src/main/java/com/iflytop/gd/app/controller/SelfTestController.java +++ b/src/main/java/com/iflytop/gd/app/controller/SelfTestController.java @@ -1,7 +1,7 @@ package com.iflytop.gd.app.controller; import com.iflytop.gd.app.model.bo.status.device.SelfTestState; -import com.iflytop.gd.app.service.api.SelfTestService; +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; import com.iflytop.gd.common.result.Result; diff --git a/src/main/java/com/iflytop/gd/app/service/api/SelfTestService.java b/src/main/java/com/iflytop/gd/app/service/device/SelfTestService.java similarity index 90% rename from src/main/java/com/iflytop/gd/app/service/api/SelfTestService.java rename to src/main/java/com/iflytop/gd/app/service/device/SelfTestService.java index 7acb4a2..078b689 100644 --- a/src/main/java/com/iflytop/gd/app/service/api/SelfTestService.java +++ b/src/main/java/com/iflytop/gd/app/service/device/SelfTestService.java @@ -1,4 +1,4 @@ -package com.iflytop.gd.app.service.api; +package com.iflytop.gd.app.service.device; import com.iflytop.gd.app.model.bo.status.device.SelfTestState; import lombok.Getter;