From a6cd6a9893e19271a232d362166357e97b60941a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E5=87=A4=E5=90=89?= <baifengji@163.com>
Date: Mon, 26 May 2025 09:51:15 +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

---
 .../gd/app/command/debug/DebugShakerResetCommand.java |  2 +-
 .../app/command/selftest/CapLiftingOriginCommand.java |  2 +-
 .../gd/app/command/selftest/DoorOriginCommand.java    |  2 +-
 .../command/selftest/DualRobotJointOriginCommand.java |  2 +-
 .../gd/app/command/selftest/GantryXOriginCommand.java |  2 +-
 .../gd/app/command/selftest/GantryYOriginCommand.java |  2 +-
 .../gd/app/command/selftest/GantryZOriginCommand.java |  2 +-
 .../gd/app/command/selftest/ShakeOriginCommand.java   |  2 +-
 .../command/selftest/TrayLiftingOriginCommand.java    |  2 +-
 .../iflytop/gd/app/controller/SelfTestController.java |  2 +-
 .../iflytop/gd/app/service/api/SelfTestService.java   | 19 -------------------
 .../gd/app/service/device/SelfTestService.java        | 19 +++++++++++++++++++
 12 files changed, 29 insertions(+), 29 deletions(-)
 delete mode 100644 src/main/java/com/iflytop/gd/app/service/api/SelfTestService.java
 create mode 100644 src/main/java/com/iflytop/gd/app/service/device/SelfTestService.java

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/api/SelfTestService.java
deleted file mode 100644
index 7acb4a2..0000000
--- a/src/main/java/com/iflytop/gd/app/service/api/SelfTestService.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.iflytop.gd.app.service.api;
-
-import com.iflytop.gd.app.model.bo.status.device.SelfTestState;
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-/**
- * 自检接口服务
- */
-@Slf4j
-@Service
-@RequiredArgsConstructor
-public class SelfTestService {
-    @Getter
-    private final SelfTestState selfTestState = new SelfTestState();
-
-}
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
new file mode 100644
index 0000000..078b689
--- /dev/null
+++ b/src/main/java/com/iflytop/gd/app/service/device/SelfTestService.java
@@ -0,0 +1,19 @@
+package com.iflytop.gd.app.service.device;
+
+import com.iflytop.gd.app.model.bo.status.device.SelfTestState;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * 自检接口服务
+ */
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class SelfTestService {
+    @Getter
+    private final SelfTestState selfTestState = new SelfTestState();
+
+}