From 092043895c34e75eab8ef5ec50a056c6daf2de78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Tue, 16 Dec 2025 16:00:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81=E7=BB=93?= =?UTF-8?q?=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../machine/demo/MultiPlatformDemo.java | 4 +- .../impl/dji/DjiAirportPlatformStrategy.java | 9 +- .../impl/dji/DjiAirportSystemManager.java | 6 +- .../impl/dji/DjiCoverPlatformStrategy.java | 15 +- .../impl/dji/DjiDrcPlatformStrategy.java | 16 +- .../impl/dji/DjiDronePlatformStrategy.java | 9 +- .../airport/DjiCloseDebugModeAction.java | 2 +- .../dji/action/airport/DjiOfflineAction.java | 2 +- .../dji/action/airport/DjiOnlineAction.java | 2 +- .../airport/DjiOpenDebugModeAction.java | 2 +- .../dji/action/airport/DjiRebootAction.java | 2 +- .../airport/DjiRebootCompletedAction.java | 2 +- .../dji/action/cover/DjiCloseCoverAction.java | 2 +- .../action/cover/DjiCoverClosedAction.java | 2 +- .../dji/action/cover/DjiCoverErrorAction.java | 2 +- .../action/cover/DjiCoverOpenedAction.java | 2 +- .../dji/action/cover/DjiCoverResetAction.java | 2 +- .../dji/action/cover/DjiOpenCoverAction.java | 2 +- .../impl/dji/action/drc/DjiEnterAction.java | 2 +- .../impl/dji/action/drc/DjiEnteredAction.java | 2 +- .../impl/dji/action/drc/DjiExitAction.java | 2 +- .../impl/dji/action/drc/DjiExitedAction.java | 2 +- .../dji/action/drone/DjiArriveAction.java | 2 +- .../action/drone/DjiCancelPointAction.java | 2 +- .../action/drone/DjiDroneOfflineAction.java | 2 +- .../action/drone/DjiEmergencyStopAction.java | 2 +- .../drone/DjiPointFlyingCompletedAction.java | 2 +- .../drone/DjiPointPrepareCompletedAction.java | 2 +- .../action/drone/DjiPointToFlyingAction.java | 2 +- .../action/drone/DjiPointToReturnAction.java | 2 +- .../drone/DjiPrepareCompletedAction.java | 2 +- .../action/drone/DjiResumeFlyingAction.java | 2 +- .../action/drone/DjiResumeReturnAction.java | 2 +- .../drone/DjiReturnCompletedAction.java | 2 +- .../drone/DjiReturnEmergencyStopAction.java | 2 +- .../action/drone/DjiStartFlyingAction.java | 2 +- .../action/drone/DjiStartPointingAction.java | 2 +- .../action/drone/DjiStartPrepareAction.java | 2 +- .../action/drone/DjiStartReturnAction.java | 2 +- .../airport/DjiCanCloseDebugModeGuard.java | 2 +- .../dji/guard/airport/DjiCanOfflineGuard.java | 2 +- .../dji/guard/airport/DjiCanOnlineGuard.java | 2 +- .../guard/airport/DjiIsDebugModeGuard.java | 2 +- .../guard/airport/DjiIsNotDebugModeGuard.java | 2 +- .../airport/DjiIsRebootCompletedGuard.java | 2 +- .../guard/cover/DjiCanCloseCoverGuard.java | 2 +- .../dji/guard/cover/DjiCanOpenCoverGuard.java | 2 +- .../guard/cover/DjiIsCoverClosedGuard.java | 2 +- .../guard/cover/DjiIsCoverOpenedGuard.java | 2 +- .../impl/dji/guard/drc/DjiCanEnterGuard.java | 2 +- .../impl/dji/guard/drc/DjiCanExitGuard.java | 2 +- .../dji/guard/drone/DjiCanPointGuard.java | 2 +- .../impl/dji/listener/DjiAirportListener.java | 2 +- .../impl/dji/listener/DjiCoverListener.java | 2 +- .../impl/dji/listener/DjiDrcListener.java | 2 +- .../impl/dji/listener/DjiDroneListener.java | 2 +- ...stemManager.java => AbsSystemManager.java} | 2 +- ...SystemManager.java => ISystemManager.java} | 4 +- .../factory/AirportSystemManagerFactory.java | 20 +- .../factory/PlatformStrategyFactory.java | 14 +- ...ry.java => MachinePlatTypeRepository.java} | 4 +- .../tuoheng/machine/DrcStateMachineTest.java | 342 +----------------- 62 files changed, 107 insertions(+), 438 deletions(-) rename src/main/java/com/tuoheng/machine/{platform => }/impl/dji/DjiAirportPlatformStrategy.java (93%) rename src/main/java/com/tuoheng/machine/{platform => }/impl/dji/DjiAirportSystemManager.java (95%) rename src/main/java/com/tuoheng/machine/{platform => }/impl/dji/DjiCoverPlatformStrategy.java (85%) rename src/main/java/com/tuoheng/machine/{platform => }/impl/dji/DjiDrcPlatformStrategy.java (77%) rename src/main/java/com/tuoheng/machine/{platform => }/impl/dji/DjiDronePlatformStrategy.java (94%) rename src/main/java/com/tuoheng/machine/{platform => }/impl/dji/action/airport/DjiCloseDebugModeAction.java (92%) rename src/main/java/com/tuoheng/machine/{platform => }/impl/dji/action/airport/DjiOfflineAction.java (91%) rename src/main/java/com/tuoheng/machine/{platform => }/impl/dji/action/airport/DjiOnlineAction.java (92%) rename src/main/java/com/tuoheng/machine/{platform => }/impl/dji/action/airport/DjiOpenDebugModeAction.java (92%) rename src/main/java/com/tuoheng/machine/{platform => }/impl/dji/action/airport/DjiRebootAction.java (91%) rename src/main/java/com/tuoheng/machine/{platform => }/impl/dji/action/airport/DjiRebootCompletedAction.java (92%) rename src/main/java/com/tuoheng/machine/{platform => }/impl/dji/action/cover/DjiCloseCoverAction.java (92%) rename src/main/java/com/tuoheng/machine/{platform => }/impl/dji/action/cover/DjiCoverClosedAction.java (92%) rename src/main/java/com/tuoheng/machine/{platform => }/impl/dji/action/cover/DjiCoverErrorAction.java (92%) rename src/main/java/com/tuoheng/machine/{platform => }/impl/dji/action/cover/DjiCoverOpenedAction.java (92%) rename src/main/java/com/tuoheng/machine/{platform => }/impl/dji/action/cover/DjiCoverResetAction.java (92%) rename src/main/java/com/tuoheng/machine/{platform => }/impl/dji/action/cover/DjiOpenCoverAction.java (92%) rename src/main/java/com/tuoheng/machine/{platform => }/impl/dji/action/drc/DjiEnterAction.java (92%) rename src/main/java/com/tuoheng/machine/{platform => }/impl/dji/action/drc/DjiEnteredAction.java (92%) rename src/main/java/com/tuoheng/machine/{platform => }/impl/dji/action/drc/DjiExitAction.java (92%) rename src/main/java/com/tuoheng/machine/{platform => }/impl/dji/action/drc/DjiExitedAction.java (92%) rename src/main/java/com/tuoheng/machine/{platform => }/impl/dji/action/drone/DjiArriveAction.java (92%) rename src/main/java/com/tuoheng/machine/{platform => }/impl/dji/action/drone/DjiCancelPointAction.java (92%) rename src/main/java/com/tuoheng/machine/{platform => }/impl/dji/action/drone/DjiDroneOfflineAction.java (92%) rename src/main/java/com/tuoheng/machine/{platform => }/impl/dji/action/drone/DjiEmergencyStopAction.java (92%) rename src/main/java/com/tuoheng/machine/{platform => }/impl/dji/action/drone/DjiPointFlyingCompletedAction.java (92%) rename src/main/java/com/tuoheng/machine/{platform => }/impl/dji/action/drone/DjiPointPrepareCompletedAction.java (92%) rename src/main/java/com/tuoheng/machine/{platform => }/impl/dji/action/drone/DjiPointToFlyingAction.java (92%) rename src/main/java/com/tuoheng/machine/{platform => }/impl/dji/action/drone/DjiPointToReturnAction.java (92%) rename src/main/java/com/tuoheng/machine/{platform => }/impl/dji/action/drone/DjiPrepareCompletedAction.java (92%) rename src/main/java/com/tuoheng/machine/{platform => }/impl/dji/action/drone/DjiResumeFlyingAction.java (92%) rename src/main/java/com/tuoheng/machine/{platform => }/impl/dji/action/drone/DjiResumeReturnAction.java (92%) rename src/main/java/com/tuoheng/machine/{platform => }/impl/dji/action/drone/DjiReturnCompletedAction.java (92%) rename src/main/java/com/tuoheng/machine/{platform => }/impl/dji/action/drone/DjiReturnEmergencyStopAction.java (92%) rename src/main/java/com/tuoheng/machine/{platform => }/impl/dji/action/drone/DjiStartFlyingAction.java (92%) rename src/main/java/com/tuoheng/machine/{platform => }/impl/dji/action/drone/DjiStartPointingAction.java (92%) rename src/main/java/com/tuoheng/machine/{platform => }/impl/dji/action/drone/DjiStartPrepareAction.java (92%) rename src/main/java/com/tuoheng/machine/{platform => }/impl/dji/action/drone/DjiStartReturnAction.java (92%) rename src/main/java/com/tuoheng/machine/{platform => }/impl/dji/guard/airport/DjiCanCloseDebugModeGuard.java (91%) rename src/main/java/com/tuoheng/machine/{platform => }/impl/dji/guard/airport/DjiCanOfflineGuard.java (91%) rename src/main/java/com/tuoheng/machine/{platform => }/impl/dji/guard/airport/DjiCanOnlineGuard.java (93%) rename src/main/java/com/tuoheng/machine/{platform => }/impl/dji/guard/airport/DjiIsDebugModeGuard.java (91%) rename src/main/java/com/tuoheng/machine/{platform => }/impl/dji/guard/airport/DjiIsNotDebugModeGuard.java (91%) rename src/main/java/com/tuoheng/machine/{platform => }/impl/dji/guard/airport/DjiIsRebootCompletedGuard.java (91%) rename src/main/java/com/tuoheng/machine/{platform => }/impl/dji/guard/cover/DjiCanCloseCoverGuard.java (91%) rename src/main/java/com/tuoheng/machine/{platform => }/impl/dji/guard/cover/DjiCanOpenCoverGuard.java (91%) rename src/main/java/com/tuoheng/machine/{platform => }/impl/dji/guard/cover/DjiIsCoverClosedGuard.java (91%) rename src/main/java/com/tuoheng/machine/{platform => }/impl/dji/guard/cover/DjiIsCoverOpenedGuard.java (91%) rename src/main/java/com/tuoheng/machine/{platform => }/impl/dji/guard/drc/DjiCanEnterGuard.java (92%) rename src/main/java/com/tuoheng/machine/{platform => }/impl/dji/guard/drc/DjiCanExitGuard.java (92%) rename src/main/java/com/tuoheng/machine/{platform => }/impl/dji/guard/drone/DjiCanPointGuard.java (94%) rename src/main/java/com/tuoheng/machine/{platform => }/impl/dji/listener/DjiAirportListener.java (82%) rename src/main/java/com/tuoheng/machine/{platform => }/impl/dji/listener/DjiCoverListener.java (82%) rename src/main/java/com/tuoheng/machine/{platform => }/impl/dji/listener/DjiDrcListener.java (83%) rename src/main/java/com/tuoheng/machine/{platform => }/impl/dji/listener/DjiDroneListener.java (84%) rename src/main/java/com/tuoheng/machine/manager/{AbstractAirportSystemManager.java => AbsSystemManager.java} (99%) rename src/main/java/com/tuoheng/machine/manager/{AirportSystemManager.java => ISystemManager.java} (96%) rename src/main/java/com/tuoheng/machine/repository/{AirportPlatformRepository.java => MachinePlatTypeRepository.java} (96%) diff --git a/src/main/java/com/tuoheng/machine/demo/MultiPlatformDemo.java b/src/main/java/com/tuoheng/machine/demo/MultiPlatformDemo.java index f2f8306..19ba90a 100644 --- a/src/main/java/com/tuoheng/machine/demo/MultiPlatformDemo.java +++ b/src/main/java/com/tuoheng/machine/demo/MultiPlatformDemo.java @@ -1,6 +1,6 @@ package com.tuoheng.machine.demo; -import com.tuoheng.machine.manager.AirportSystemManager; +import com.tuoheng.machine.manager.ISystemManager; import com.tuoheng.machine.manager.factory.AirportSystemManagerFactory; import com.tuoheng.machine.platform.factory.PlatformStrategyFactory; import org.springframework.context.annotation.AnnotationConfigApplicationContext; @@ -34,7 +34,7 @@ public class MultiPlatformDemo { System.out.println("1. DJI机巢上线: " + djiAirport); System.out.println(" 平台类型: " + strategyFactory.getPlatformType(djiAirport).getName()); - AirportSystemManager djiManager = managerFactory.getManager(djiAirport); + ISystemManager djiManager = managerFactory.getManager(djiAirport); djiManager.airportOnline(djiAirport); System.out.println(" " + djiManager.getFullStatus(djiAirport)); System.out.println(); diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/DjiAirportPlatformStrategy.java b/src/main/java/com/tuoheng/machine/impl/dji/DjiAirportPlatformStrategy.java similarity index 93% rename from src/main/java/com/tuoheng/machine/platform/impl/dji/DjiAirportPlatformStrategy.java rename to src/main/java/com/tuoheng/machine/impl/dji/DjiAirportPlatformStrategy.java index dd01962..a1745b1 100644 --- a/src/main/java/com/tuoheng/machine/platform/impl/dji/DjiAirportPlatformStrategy.java +++ b/src/main/java/com/tuoheng/machine/impl/dji/DjiAirportPlatformStrategy.java @@ -1,9 +1,10 @@ -package com.tuoheng.machine.platform.impl.dji; +package com.tuoheng.machine.impl.dji; + import com.tuoheng.machine.events.AirportEvent; -import com.tuoheng.machine.platform.impl.dji.action.airport.*; -import com.tuoheng.machine.platform.impl.dji.guard.airport.*; -import com.tuoheng.machine.platform.impl.dji.listener.DjiAirportListener; +import com.tuoheng.machine.impl.dji.action.airport.*; +import com.tuoheng.machine.impl.dji.guard.airport.*; +import com.tuoheng.machine.impl.dji.listener.DjiAirportListener; import com.tuoheng.machine.platform.PlatformType; import com.tuoheng.machine.platform.strategy.AirportPlatformStrategy; import com.tuoheng.machine.platform.strategy.PlatformAction; diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/DjiAirportSystemManager.java b/src/main/java/com/tuoheng/machine/impl/dji/DjiAirportSystemManager.java similarity index 95% rename from src/main/java/com/tuoheng/machine/platform/impl/dji/DjiAirportSystemManager.java rename to src/main/java/com/tuoheng/machine/impl/dji/DjiAirportSystemManager.java index a984a03..f7ace75 100644 --- a/src/main/java/com/tuoheng/machine/platform/impl/dji/DjiAirportSystemManager.java +++ b/src/main/java/com/tuoheng/machine/impl/dji/DjiAirportSystemManager.java @@ -1,9 +1,9 @@ -package com.tuoheng.machine.platform.impl.dji; +package com.tuoheng.machine.impl.dji; import com.tuoheng.machine.events.AirportEvent; import com.tuoheng.machine.events.CoverEvent; -import com.tuoheng.machine.manager.AbstractAirportSystemManager; +import com.tuoheng.machine.manager.AbsSystemManager; import com.tuoheng.machine.platform.PlatformType; import com.tuoheng.machine.status.AirportState; import com.tuoheng.machine.status.CoverState; @@ -15,7 +15,7 @@ import org.springframework.stereotype.Component; */ @Component @Slf4j -public class DjiAirportSystemManager extends AbstractAirportSystemManager { +public class DjiAirportSystemManager extends AbsSystemManager { @Override public PlatformType getPlatformType() { diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/DjiCoverPlatformStrategy.java b/src/main/java/com/tuoheng/machine/impl/dji/DjiCoverPlatformStrategy.java similarity index 85% rename from src/main/java/com/tuoheng/machine/platform/impl/dji/DjiCoverPlatformStrategy.java rename to src/main/java/com/tuoheng/machine/impl/dji/DjiCoverPlatformStrategy.java index 7921014..6b2eed5 100644 --- a/src/main/java/com/tuoheng/machine/platform/impl/dji/DjiCoverPlatformStrategy.java +++ b/src/main/java/com/tuoheng/machine/impl/dji/DjiCoverPlatformStrategy.java @@ -1,12 +1,13 @@ -package com.tuoheng.machine.platform.impl.dji; +package com.tuoheng.machine.impl.dji; + import com.tuoheng.machine.events.CoverEvent; -import com.tuoheng.machine.platform.impl.dji.action.cover.*; -import com.tuoheng.machine.platform.impl.dji.guard.cover.DjiCanCloseCoverGuard; -import com.tuoheng.machine.platform.impl.dji.guard.cover.DjiCanOpenCoverGuard; -import com.tuoheng.machine.platform.impl.dji.guard.cover.DjiIsCoverClosedGuard; -import com.tuoheng.machine.platform.impl.dji.guard.cover.DjiIsCoverOpenedGuard; -import com.tuoheng.machine.platform.impl.dji.listener.DjiCoverListener; +import com.tuoheng.machine.impl.dji.action.cover.*; +import com.tuoheng.machine.impl.dji.guard.cover.DjiCanCloseCoverGuard; +import com.tuoheng.machine.impl.dji.guard.cover.DjiCanOpenCoverGuard; +import com.tuoheng.machine.impl.dji.guard.cover.DjiIsCoverClosedGuard; +import com.tuoheng.machine.impl.dji.guard.cover.DjiIsCoverOpenedGuard; +import com.tuoheng.machine.impl.dji.listener.DjiCoverListener; import com.tuoheng.machine.platform.PlatformType; import com.tuoheng.machine.platform.strategy.CoverPlatformStrategy; import com.tuoheng.machine.platform.strategy.PlatformAction; diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/DjiDrcPlatformStrategy.java b/src/main/java/com/tuoheng/machine/impl/dji/DjiDrcPlatformStrategy.java similarity index 77% rename from src/main/java/com/tuoheng/machine/platform/impl/dji/DjiDrcPlatformStrategy.java rename to src/main/java/com/tuoheng/machine/impl/dji/DjiDrcPlatformStrategy.java index 2a3ab13..4b86fb7 100644 --- a/src/main/java/com/tuoheng/machine/platform/impl/dji/DjiDrcPlatformStrategy.java +++ b/src/main/java/com/tuoheng/machine/impl/dji/DjiDrcPlatformStrategy.java @@ -1,14 +1,14 @@ -package com.tuoheng.machine.platform.impl.dji; +package com.tuoheng.machine.impl.dji; import com.tuoheng.machine.events.DrcEvent; import com.tuoheng.machine.platform.PlatformType; -import com.tuoheng.machine.platform.impl.dji.action.drc.DjiEnterAction; -import com.tuoheng.machine.platform.impl.dji.action.drc.DjiEnteredAction; -import com.tuoheng.machine.platform.impl.dji.action.drc.DjiExitAction; -import com.tuoheng.machine.platform.impl.dji.action.drc.DjiExitedAction; -import com.tuoheng.machine.platform.impl.dji.guard.drc.DjiCanEnterGuard; -import com.tuoheng.machine.platform.impl.dji.guard.drc.DjiCanExitGuard; -import com.tuoheng.machine.platform.impl.dji.listener.DjiDrcListener; +import com.tuoheng.machine.impl.dji.action.drc.DjiEnterAction; +import com.tuoheng.machine.impl.dji.action.drc.DjiEnteredAction; +import com.tuoheng.machine.impl.dji.action.drc.DjiExitAction; +import com.tuoheng.machine.impl.dji.action.drc.DjiExitedAction; +import com.tuoheng.machine.impl.dji.guard.drc.DjiCanEnterGuard; +import com.tuoheng.machine.impl.dji.guard.drc.DjiCanExitGuard; +import com.tuoheng.machine.impl.dji.listener.DjiDrcListener; import com.tuoheng.machine.platform.strategy.DrcPlatformStrategy; import com.tuoheng.machine.platform.strategy.PlatformAction; import com.tuoheng.machine.platform.strategy.PlatformGuard; diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/DjiDronePlatformStrategy.java b/src/main/java/com/tuoheng/machine/impl/dji/DjiDronePlatformStrategy.java similarity index 94% rename from src/main/java/com/tuoheng/machine/platform/impl/dji/DjiDronePlatformStrategy.java rename to src/main/java/com/tuoheng/machine/impl/dji/DjiDronePlatformStrategy.java index a677d1d..194f899 100644 --- a/src/main/java/com/tuoheng/machine/platform/impl/dji/DjiDronePlatformStrategy.java +++ b/src/main/java/com/tuoheng/machine/impl/dji/DjiDronePlatformStrategy.java @@ -1,10 +1,11 @@ -package com.tuoheng.machine.platform.impl.dji; +package com.tuoheng.machine.impl.dji; + import com.tuoheng.machine.events.DroneEvent; +import com.tuoheng.machine.impl.dji.action.drone.*; import com.tuoheng.machine.platform.PlatformType; -import com.tuoheng.machine.platform.impl.dji.action.drone.*; -import com.tuoheng.machine.platform.impl.dji.guard.drone.DjiCanPointGuard; -import com.tuoheng.machine.platform.impl.dji.listener.DjiDroneListener; +import com.tuoheng.machine.impl.dji.guard.drone.DjiCanPointGuard; +import com.tuoheng.machine.impl.dji.listener.DjiDroneListener; import com.tuoheng.machine.platform.strategy.DronePlatformStrategy; import com.tuoheng.machine.platform.strategy.PlatformAction; import com.tuoheng.machine.platform.strategy.PlatformGuard; diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/airport/DjiCloseDebugModeAction.java b/src/main/java/com/tuoheng/machine/impl/dji/action/airport/DjiCloseDebugModeAction.java similarity index 92% rename from src/main/java/com/tuoheng/machine/platform/impl/dji/action/airport/DjiCloseDebugModeAction.java rename to src/main/java/com/tuoheng/machine/impl/dji/action/airport/DjiCloseDebugModeAction.java index d083f70..f971e78 100644 --- a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/airport/DjiCloseDebugModeAction.java +++ b/src/main/java/com/tuoheng/machine/impl/dji/action/airport/DjiCloseDebugModeAction.java @@ -1,4 +1,4 @@ -package com.tuoheng.machine.platform.impl.dji.action.airport; +package com.tuoheng.machine.impl.dji.action.airport; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/airport/DjiOfflineAction.java b/src/main/java/com/tuoheng/machine/impl/dji/action/airport/DjiOfflineAction.java similarity index 91% rename from src/main/java/com/tuoheng/machine/platform/impl/dji/action/airport/DjiOfflineAction.java rename to src/main/java/com/tuoheng/machine/impl/dji/action/airport/DjiOfflineAction.java index 6f597f3..2a9f3c0 100644 --- a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/airport/DjiOfflineAction.java +++ b/src/main/java/com/tuoheng/machine/impl/dji/action/airport/DjiOfflineAction.java @@ -1,4 +1,4 @@ -package com.tuoheng.machine.platform.impl.dji.action.airport; +package com.tuoheng.machine.impl.dji.action.airport; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/airport/DjiOnlineAction.java b/src/main/java/com/tuoheng/machine/impl/dji/action/airport/DjiOnlineAction.java similarity index 92% rename from src/main/java/com/tuoheng/machine/platform/impl/dji/action/airport/DjiOnlineAction.java rename to src/main/java/com/tuoheng/machine/impl/dji/action/airport/DjiOnlineAction.java index 2377d77..0f32c0e 100644 --- a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/airport/DjiOnlineAction.java +++ b/src/main/java/com/tuoheng/machine/impl/dji/action/airport/DjiOnlineAction.java @@ -1,4 +1,4 @@ -package com.tuoheng.machine.platform.impl.dji.action.airport; +package com.tuoheng.machine.impl.dji.action.airport; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/airport/DjiOpenDebugModeAction.java b/src/main/java/com/tuoheng/machine/impl/dji/action/airport/DjiOpenDebugModeAction.java similarity index 92% rename from src/main/java/com/tuoheng/machine/platform/impl/dji/action/airport/DjiOpenDebugModeAction.java rename to src/main/java/com/tuoheng/machine/impl/dji/action/airport/DjiOpenDebugModeAction.java index 8a76f69..7afc01b 100644 --- a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/airport/DjiOpenDebugModeAction.java +++ b/src/main/java/com/tuoheng/machine/impl/dji/action/airport/DjiOpenDebugModeAction.java @@ -1,4 +1,4 @@ -package com.tuoheng.machine.platform.impl.dji.action.airport; +package com.tuoheng.machine.impl.dji.action.airport; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/airport/DjiRebootAction.java b/src/main/java/com/tuoheng/machine/impl/dji/action/airport/DjiRebootAction.java similarity index 91% rename from src/main/java/com/tuoheng/machine/platform/impl/dji/action/airport/DjiRebootAction.java rename to src/main/java/com/tuoheng/machine/impl/dji/action/airport/DjiRebootAction.java index 800bf64..6b94672 100644 --- a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/airport/DjiRebootAction.java +++ b/src/main/java/com/tuoheng/machine/impl/dji/action/airport/DjiRebootAction.java @@ -1,4 +1,4 @@ -package com.tuoheng.machine.platform.impl.dji.action.airport; +package com.tuoheng.machine.impl.dji.action.airport; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/airport/DjiRebootCompletedAction.java b/src/main/java/com/tuoheng/machine/impl/dji/action/airport/DjiRebootCompletedAction.java similarity index 92% rename from src/main/java/com/tuoheng/machine/platform/impl/dji/action/airport/DjiRebootCompletedAction.java rename to src/main/java/com/tuoheng/machine/impl/dji/action/airport/DjiRebootCompletedAction.java index b6ae3de..25efc77 100644 --- a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/airport/DjiRebootCompletedAction.java +++ b/src/main/java/com/tuoheng/machine/impl/dji/action/airport/DjiRebootCompletedAction.java @@ -1,4 +1,4 @@ -package com.tuoheng.machine.platform.impl.dji.action.airport; +package com.tuoheng.machine.impl.dji.action.airport; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/cover/DjiCloseCoverAction.java b/src/main/java/com/tuoheng/machine/impl/dji/action/cover/DjiCloseCoverAction.java similarity index 92% rename from src/main/java/com/tuoheng/machine/platform/impl/dji/action/cover/DjiCloseCoverAction.java rename to src/main/java/com/tuoheng/machine/impl/dji/action/cover/DjiCloseCoverAction.java index 6fc5dd7..e507bd4 100644 --- a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/cover/DjiCloseCoverAction.java +++ b/src/main/java/com/tuoheng/machine/impl/dji/action/cover/DjiCloseCoverAction.java @@ -1,4 +1,4 @@ -package com.tuoheng.machine.platform.impl.dji.action.cover; +package com.tuoheng.machine.impl.dji.action.cover; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/cover/DjiCoverClosedAction.java b/src/main/java/com/tuoheng/machine/impl/dji/action/cover/DjiCoverClosedAction.java similarity index 92% rename from src/main/java/com/tuoheng/machine/platform/impl/dji/action/cover/DjiCoverClosedAction.java rename to src/main/java/com/tuoheng/machine/impl/dji/action/cover/DjiCoverClosedAction.java index f6c8394..0b32b35 100644 --- a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/cover/DjiCoverClosedAction.java +++ b/src/main/java/com/tuoheng/machine/impl/dji/action/cover/DjiCoverClosedAction.java @@ -1,4 +1,4 @@ -package com.tuoheng.machine.platform.impl.dji.action.cover; +package com.tuoheng.machine.impl.dji.action.cover; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/cover/DjiCoverErrorAction.java b/src/main/java/com/tuoheng/machine/impl/dji/action/cover/DjiCoverErrorAction.java similarity index 92% rename from src/main/java/com/tuoheng/machine/platform/impl/dji/action/cover/DjiCoverErrorAction.java rename to src/main/java/com/tuoheng/machine/impl/dji/action/cover/DjiCoverErrorAction.java index 1a27b6d..65d5ff8 100644 --- a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/cover/DjiCoverErrorAction.java +++ b/src/main/java/com/tuoheng/machine/impl/dji/action/cover/DjiCoverErrorAction.java @@ -1,4 +1,4 @@ -package com.tuoheng.machine.platform.impl.dji.action.cover; +package com.tuoheng.machine.impl.dji.action.cover; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/cover/DjiCoverOpenedAction.java b/src/main/java/com/tuoheng/machine/impl/dji/action/cover/DjiCoverOpenedAction.java similarity index 92% rename from src/main/java/com/tuoheng/machine/platform/impl/dji/action/cover/DjiCoverOpenedAction.java rename to src/main/java/com/tuoheng/machine/impl/dji/action/cover/DjiCoverOpenedAction.java index 5d3a796..df6a1b7 100644 --- a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/cover/DjiCoverOpenedAction.java +++ b/src/main/java/com/tuoheng/machine/impl/dji/action/cover/DjiCoverOpenedAction.java @@ -1,4 +1,4 @@ -package com.tuoheng.machine.platform.impl.dji.action.cover; +package com.tuoheng.machine.impl.dji.action.cover; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/cover/DjiCoverResetAction.java b/src/main/java/com/tuoheng/machine/impl/dji/action/cover/DjiCoverResetAction.java similarity index 92% rename from src/main/java/com/tuoheng/machine/platform/impl/dji/action/cover/DjiCoverResetAction.java rename to src/main/java/com/tuoheng/machine/impl/dji/action/cover/DjiCoverResetAction.java index 48b3049..aae0664 100644 --- a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/cover/DjiCoverResetAction.java +++ b/src/main/java/com/tuoheng/machine/impl/dji/action/cover/DjiCoverResetAction.java @@ -1,4 +1,4 @@ -package com.tuoheng.machine.platform.impl.dji.action.cover; +package com.tuoheng.machine.impl.dji.action.cover; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/cover/DjiOpenCoverAction.java b/src/main/java/com/tuoheng/machine/impl/dji/action/cover/DjiOpenCoverAction.java similarity index 92% rename from src/main/java/com/tuoheng/machine/platform/impl/dji/action/cover/DjiOpenCoverAction.java rename to src/main/java/com/tuoheng/machine/impl/dji/action/cover/DjiOpenCoverAction.java index 0c7a373..fbb0ef0 100644 --- a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/cover/DjiOpenCoverAction.java +++ b/src/main/java/com/tuoheng/machine/impl/dji/action/cover/DjiOpenCoverAction.java @@ -1,4 +1,4 @@ -package com.tuoheng.machine.platform.impl.dji.action.cover; +package com.tuoheng.machine.impl.dji.action.cover; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drc/DjiEnterAction.java b/src/main/java/com/tuoheng/machine/impl/dji/action/drc/DjiEnterAction.java similarity index 92% rename from src/main/java/com/tuoheng/machine/platform/impl/dji/action/drc/DjiEnterAction.java rename to src/main/java/com/tuoheng/machine/impl/dji/action/drc/DjiEnterAction.java index dc933a1..7837ab5 100644 --- a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drc/DjiEnterAction.java +++ b/src/main/java/com/tuoheng/machine/impl/dji/action/drc/DjiEnterAction.java @@ -1,4 +1,4 @@ -package com.tuoheng.machine.platform.impl.dji.action.drc; +package com.tuoheng.machine.impl.dji.action.drc; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drc/DjiEnteredAction.java b/src/main/java/com/tuoheng/machine/impl/dji/action/drc/DjiEnteredAction.java similarity index 92% rename from src/main/java/com/tuoheng/machine/platform/impl/dji/action/drc/DjiEnteredAction.java rename to src/main/java/com/tuoheng/machine/impl/dji/action/drc/DjiEnteredAction.java index 44856cd..e193646 100644 --- a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drc/DjiEnteredAction.java +++ b/src/main/java/com/tuoheng/machine/impl/dji/action/drc/DjiEnteredAction.java @@ -1,4 +1,4 @@ -package com.tuoheng.machine.platform.impl.dji.action.drc; +package com.tuoheng.machine.impl.dji.action.drc; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drc/DjiExitAction.java b/src/main/java/com/tuoheng/machine/impl/dji/action/drc/DjiExitAction.java similarity index 92% rename from src/main/java/com/tuoheng/machine/platform/impl/dji/action/drc/DjiExitAction.java rename to src/main/java/com/tuoheng/machine/impl/dji/action/drc/DjiExitAction.java index 6100bbd..994c23e 100644 --- a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drc/DjiExitAction.java +++ b/src/main/java/com/tuoheng/machine/impl/dji/action/drc/DjiExitAction.java @@ -1,4 +1,4 @@ -package com.tuoheng.machine.platform.impl.dji.action.drc; +package com.tuoheng.machine.impl.dji.action.drc; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drc/DjiExitedAction.java b/src/main/java/com/tuoheng/machine/impl/dji/action/drc/DjiExitedAction.java similarity index 92% rename from src/main/java/com/tuoheng/machine/platform/impl/dji/action/drc/DjiExitedAction.java rename to src/main/java/com/tuoheng/machine/impl/dji/action/drc/DjiExitedAction.java index 77c31b8..4b98116 100644 --- a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drc/DjiExitedAction.java +++ b/src/main/java/com/tuoheng/machine/impl/dji/action/drc/DjiExitedAction.java @@ -1,4 +1,4 @@ -package com.tuoheng.machine.platform.impl.dji.action.drc; +package com.tuoheng.machine.impl.dji.action.drc; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiArriveAction.java b/src/main/java/com/tuoheng/machine/impl/dji/action/drone/DjiArriveAction.java similarity index 92% rename from src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiArriveAction.java rename to src/main/java/com/tuoheng/machine/impl/dji/action/drone/DjiArriveAction.java index be611a0..99606e2 100644 --- a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiArriveAction.java +++ b/src/main/java/com/tuoheng/machine/impl/dji/action/drone/DjiArriveAction.java @@ -1,4 +1,4 @@ -package com.tuoheng.machine.platform.impl.dji.action.drone; +package com.tuoheng.machine.impl.dji.action.drone; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiCancelPointAction.java b/src/main/java/com/tuoheng/machine/impl/dji/action/drone/DjiCancelPointAction.java similarity index 92% rename from src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiCancelPointAction.java rename to src/main/java/com/tuoheng/machine/impl/dji/action/drone/DjiCancelPointAction.java index 6b3be09..a2f1aad 100644 --- a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiCancelPointAction.java +++ b/src/main/java/com/tuoheng/machine/impl/dji/action/drone/DjiCancelPointAction.java @@ -1,4 +1,4 @@ -package com.tuoheng.machine.platform.impl.dji.action.drone; +package com.tuoheng.machine.impl.dji.action.drone; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiDroneOfflineAction.java b/src/main/java/com/tuoheng/machine/impl/dji/action/drone/DjiDroneOfflineAction.java similarity index 92% rename from src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiDroneOfflineAction.java rename to src/main/java/com/tuoheng/machine/impl/dji/action/drone/DjiDroneOfflineAction.java index 4326ef0..accf0c4 100644 --- a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiDroneOfflineAction.java +++ b/src/main/java/com/tuoheng/machine/impl/dji/action/drone/DjiDroneOfflineAction.java @@ -1,4 +1,4 @@ -package com.tuoheng.machine.platform.impl.dji.action.drone; +package com.tuoheng.machine.impl.dji.action.drone; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiEmergencyStopAction.java b/src/main/java/com/tuoheng/machine/impl/dji/action/drone/DjiEmergencyStopAction.java similarity index 92% rename from src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiEmergencyStopAction.java rename to src/main/java/com/tuoheng/machine/impl/dji/action/drone/DjiEmergencyStopAction.java index 61774c1..4f35c1f 100644 --- a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiEmergencyStopAction.java +++ b/src/main/java/com/tuoheng/machine/impl/dji/action/drone/DjiEmergencyStopAction.java @@ -1,4 +1,4 @@ -package com.tuoheng.machine.platform.impl.dji.action.drone; +package com.tuoheng.machine.impl.dji.action.drone; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiPointFlyingCompletedAction.java b/src/main/java/com/tuoheng/machine/impl/dji/action/drone/DjiPointFlyingCompletedAction.java similarity index 92% rename from src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiPointFlyingCompletedAction.java rename to src/main/java/com/tuoheng/machine/impl/dji/action/drone/DjiPointFlyingCompletedAction.java index c47594c..4d46703 100644 --- a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiPointFlyingCompletedAction.java +++ b/src/main/java/com/tuoheng/machine/impl/dji/action/drone/DjiPointFlyingCompletedAction.java @@ -1,4 +1,4 @@ -package com.tuoheng.machine.platform.impl.dji.action.drone; +package com.tuoheng.machine.impl.dji.action.drone; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiPointPrepareCompletedAction.java b/src/main/java/com/tuoheng/machine/impl/dji/action/drone/DjiPointPrepareCompletedAction.java similarity index 92% rename from src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiPointPrepareCompletedAction.java rename to src/main/java/com/tuoheng/machine/impl/dji/action/drone/DjiPointPrepareCompletedAction.java index 5798800..945007e 100644 --- a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiPointPrepareCompletedAction.java +++ b/src/main/java/com/tuoheng/machine/impl/dji/action/drone/DjiPointPrepareCompletedAction.java @@ -1,4 +1,4 @@ -package com.tuoheng.machine.platform.impl.dji.action.drone; +package com.tuoheng.machine.impl.dji.action.drone; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiPointToFlyingAction.java b/src/main/java/com/tuoheng/machine/impl/dji/action/drone/DjiPointToFlyingAction.java similarity index 92% rename from src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiPointToFlyingAction.java rename to src/main/java/com/tuoheng/machine/impl/dji/action/drone/DjiPointToFlyingAction.java index f44bf6e..b77f21e 100644 --- a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiPointToFlyingAction.java +++ b/src/main/java/com/tuoheng/machine/impl/dji/action/drone/DjiPointToFlyingAction.java @@ -1,4 +1,4 @@ -package com.tuoheng.machine.platform.impl.dji.action.drone; +package com.tuoheng.machine.impl.dji.action.drone; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiPointToReturnAction.java b/src/main/java/com/tuoheng/machine/impl/dji/action/drone/DjiPointToReturnAction.java similarity index 92% rename from src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiPointToReturnAction.java rename to src/main/java/com/tuoheng/machine/impl/dji/action/drone/DjiPointToReturnAction.java index d51aabd..2e4f30c 100644 --- a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiPointToReturnAction.java +++ b/src/main/java/com/tuoheng/machine/impl/dji/action/drone/DjiPointToReturnAction.java @@ -1,4 +1,4 @@ -package com.tuoheng.machine.platform.impl.dji.action.drone; +package com.tuoheng.machine.impl.dji.action.drone; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiPrepareCompletedAction.java b/src/main/java/com/tuoheng/machine/impl/dji/action/drone/DjiPrepareCompletedAction.java similarity index 92% rename from src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiPrepareCompletedAction.java rename to src/main/java/com/tuoheng/machine/impl/dji/action/drone/DjiPrepareCompletedAction.java index 9c20175..a4ce8f4 100644 --- a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiPrepareCompletedAction.java +++ b/src/main/java/com/tuoheng/machine/impl/dji/action/drone/DjiPrepareCompletedAction.java @@ -1,4 +1,4 @@ -package com.tuoheng.machine.platform.impl.dji.action.drone; +package com.tuoheng.machine.impl.dji.action.drone; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiResumeFlyingAction.java b/src/main/java/com/tuoheng/machine/impl/dji/action/drone/DjiResumeFlyingAction.java similarity index 92% rename from src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiResumeFlyingAction.java rename to src/main/java/com/tuoheng/machine/impl/dji/action/drone/DjiResumeFlyingAction.java index 6efe0c9..414e8a5 100644 --- a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiResumeFlyingAction.java +++ b/src/main/java/com/tuoheng/machine/impl/dji/action/drone/DjiResumeFlyingAction.java @@ -1,4 +1,4 @@ -package com.tuoheng.machine.platform.impl.dji.action.drone; +package com.tuoheng.machine.impl.dji.action.drone; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiResumeReturnAction.java b/src/main/java/com/tuoheng/machine/impl/dji/action/drone/DjiResumeReturnAction.java similarity index 92% rename from src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiResumeReturnAction.java rename to src/main/java/com/tuoheng/machine/impl/dji/action/drone/DjiResumeReturnAction.java index d5267ee..7272eca 100644 --- a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiResumeReturnAction.java +++ b/src/main/java/com/tuoheng/machine/impl/dji/action/drone/DjiResumeReturnAction.java @@ -1,4 +1,4 @@ -package com.tuoheng.machine.platform.impl.dji.action.drone; +package com.tuoheng.machine.impl.dji.action.drone; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiReturnCompletedAction.java b/src/main/java/com/tuoheng/machine/impl/dji/action/drone/DjiReturnCompletedAction.java similarity index 92% rename from src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiReturnCompletedAction.java rename to src/main/java/com/tuoheng/machine/impl/dji/action/drone/DjiReturnCompletedAction.java index ee9b148..b1e153a 100644 --- a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiReturnCompletedAction.java +++ b/src/main/java/com/tuoheng/machine/impl/dji/action/drone/DjiReturnCompletedAction.java @@ -1,4 +1,4 @@ -package com.tuoheng.machine.platform.impl.dji.action.drone; +package com.tuoheng.machine.impl.dji.action.drone; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiReturnEmergencyStopAction.java b/src/main/java/com/tuoheng/machine/impl/dji/action/drone/DjiReturnEmergencyStopAction.java similarity index 92% rename from src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiReturnEmergencyStopAction.java rename to src/main/java/com/tuoheng/machine/impl/dji/action/drone/DjiReturnEmergencyStopAction.java index 0004a9e..a4dbb51 100644 --- a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiReturnEmergencyStopAction.java +++ b/src/main/java/com/tuoheng/machine/impl/dji/action/drone/DjiReturnEmergencyStopAction.java @@ -1,4 +1,4 @@ -package com.tuoheng.machine.platform.impl.dji.action.drone; +package com.tuoheng.machine.impl.dji.action.drone; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiStartFlyingAction.java b/src/main/java/com/tuoheng/machine/impl/dji/action/drone/DjiStartFlyingAction.java similarity index 92% rename from src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiStartFlyingAction.java rename to src/main/java/com/tuoheng/machine/impl/dji/action/drone/DjiStartFlyingAction.java index 3562939..c66dfad 100644 --- a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiStartFlyingAction.java +++ b/src/main/java/com/tuoheng/machine/impl/dji/action/drone/DjiStartFlyingAction.java @@ -1,4 +1,4 @@ -package com.tuoheng.machine.platform.impl.dji.action.drone; +package com.tuoheng.machine.impl.dji.action.drone; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiStartPointingAction.java b/src/main/java/com/tuoheng/machine/impl/dji/action/drone/DjiStartPointingAction.java similarity index 92% rename from src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiStartPointingAction.java rename to src/main/java/com/tuoheng/machine/impl/dji/action/drone/DjiStartPointingAction.java index 96d69f1..a58d986 100644 --- a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiStartPointingAction.java +++ b/src/main/java/com/tuoheng/machine/impl/dji/action/drone/DjiStartPointingAction.java @@ -1,4 +1,4 @@ -package com.tuoheng.machine.platform.impl.dji.action.drone; +package com.tuoheng.machine.impl.dji.action.drone; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiStartPrepareAction.java b/src/main/java/com/tuoheng/machine/impl/dji/action/drone/DjiStartPrepareAction.java similarity index 92% rename from src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiStartPrepareAction.java rename to src/main/java/com/tuoheng/machine/impl/dji/action/drone/DjiStartPrepareAction.java index 6647737..12be18a 100644 --- a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiStartPrepareAction.java +++ b/src/main/java/com/tuoheng/machine/impl/dji/action/drone/DjiStartPrepareAction.java @@ -1,4 +1,4 @@ -package com.tuoheng.machine.platform.impl.dji.action.drone; +package com.tuoheng.machine.impl.dji.action.drone; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiStartReturnAction.java b/src/main/java/com/tuoheng/machine/impl/dji/action/drone/DjiStartReturnAction.java similarity index 92% rename from src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiStartReturnAction.java rename to src/main/java/com/tuoheng/machine/impl/dji/action/drone/DjiStartReturnAction.java index 9e1083e..7fd75c2 100644 --- a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiStartReturnAction.java +++ b/src/main/java/com/tuoheng/machine/impl/dji/action/drone/DjiStartReturnAction.java @@ -1,4 +1,4 @@ -package com.tuoheng.machine.platform.impl.dji.action.drone; +package com.tuoheng.machine.impl.dji.action.drone; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/guard/airport/DjiCanCloseDebugModeGuard.java b/src/main/java/com/tuoheng/machine/impl/dji/guard/airport/DjiCanCloseDebugModeGuard.java similarity index 91% rename from src/main/java/com/tuoheng/machine/platform/impl/dji/guard/airport/DjiCanCloseDebugModeGuard.java rename to src/main/java/com/tuoheng/machine/impl/dji/guard/airport/DjiCanCloseDebugModeGuard.java index 1221a89..f1644d6 100644 --- a/src/main/java/com/tuoheng/machine/platform/impl/dji/guard/airport/DjiCanCloseDebugModeGuard.java +++ b/src/main/java/com/tuoheng/machine/impl/dji/guard/airport/DjiCanCloseDebugModeGuard.java @@ -1,4 +1,4 @@ -package com.tuoheng.machine.platform.impl.dji.guard.airport; +package com.tuoheng.machine.impl.dji.guard.airport; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/guard/airport/DjiCanOfflineGuard.java b/src/main/java/com/tuoheng/machine/impl/dji/guard/airport/DjiCanOfflineGuard.java similarity index 91% rename from src/main/java/com/tuoheng/machine/platform/impl/dji/guard/airport/DjiCanOfflineGuard.java rename to src/main/java/com/tuoheng/machine/impl/dji/guard/airport/DjiCanOfflineGuard.java index c865d1c..57025bc 100644 --- a/src/main/java/com/tuoheng/machine/platform/impl/dji/guard/airport/DjiCanOfflineGuard.java +++ b/src/main/java/com/tuoheng/machine/impl/dji/guard/airport/DjiCanOfflineGuard.java @@ -1,4 +1,4 @@ -package com.tuoheng.machine.platform.impl.dji.guard.airport; +package com.tuoheng.machine.impl.dji.guard.airport; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/guard/airport/DjiCanOnlineGuard.java b/src/main/java/com/tuoheng/machine/impl/dji/guard/airport/DjiCanOnlineGuard.java similarity index 93% rename from src/main/java/com/tuoheng/machine/platform/impl/dji/guard/airport/DjiCanOnlineGuard.java rename to src/main/java/com/tuoheng/machine/impl/dji/guard/airport/DjiCanOnlineGuard.java index a72d74f..5745ada 100644 --- a/src/main/java/com/tuoheng/machine/platform/impl/dji/guard/airport/DjiCanOnlineGuard.java +++ b/src/main/java/com/tuoheng/machine/impl/dji/guard/airport/DjiCanOnlineGuard.java @@ -1,4 +1,4 @@ -package com.tuoheng.machine.platform.impl.dji.guard.airport; +package com.tuoheng.machine.impl.dji.guard.airport; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/guard/airport/DjiIsDebugModeGuard.java b/src/main/java/com/tuoheng/machine/impl/dji/guard/airport/DjiIsDebugModeGuard.java similarity index 91% rename from src/main/java/com/tuoheng/machine/platform/impl/dji/guard/airport/DjiIsDebugModeGuard.java rename to src/main/java/com/tuoheng/machine/impl/dji/guard/airport/DjiIsDebugModeGuard.java index 495529f..9cd87eb 100644 --- a/src/main/java/com/tuoheng/machine/platform/impl/dji/guard/airport/DjiIsDebugModeGuard.java +++ b/src/main/java/com/tuoheng/machine/impl/dji/guard/airport/DjiIsDebugModeGuard.java @@ -1,4 +1,4 @@ -package com.tuoheng.machine.platform.impl.dji.guard.airport; +package com.tuoheng.machine.impl.dji.guard.airport; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/guard/airport/DjiIsNotDebugModeGuard.java b/src/main/java/com/tuoheng/machine/impl/dji/guard/airport/DjiIsNotDebugModeGuard.java similarity index 91% rename from src/main/java/com/tuoheng/machine/platform/impl/dji/guard/airport/DjiIsNotDebugModeGuard.java rename to src/main/java/com/tuoheng/machine/impl/dji/guard/airport/DjiIsNotDebugModeGuard.java index 4bc16e9..c7a51d1 100644 --- a/src/main/java/com/tuoheng/machine/platform/impl/dji/guard/airport/DjiIsNotDebugModeGuard.java +++ b/src/main/java/com/tuoheng/machine/impl/dji/guard/airport/DjiIsNotDebugModeGuard.java @@ -1,4 +1,4 @@ -package com.tuoheng.machine.platform.impl.dji.guard.airport; +package com.tuoheng.machine.impl.dji.guard.airport; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/guard/airport/DjiIsRebootCompletedGuard.java b/src/main/java/com/tuoheng/machine/impl/dji/guard/airport/DjiIsRebootCompletedGuard.java similarity index 91% rename from src/main/java/com/tuoheng/machine/platform/impl/dji/guard/airport/DjiIsRebootCompletedGuard.java rename to src/main/java/com/tuoheng/machine/impl/dji/guard/airport/DjiIsRebootCompletedGuard.java index 44be09e..b310fac 100644 --- a/src/main/java/com/tuoheng/machine/platform/impl/dji/guard/airport/DjiIsRebootCompletedGuard.java +++ b/src/main/java/com/tuoheng/machine/impl/dji/guard/airport/DjiIsRebootCompletedGuard.java @@ -1,4 +1,4 @@ -package com.tuoheng.machine.platform.impl.dji.guard.airport; +package com.tuoheng.machine.impl.dji.guard.airport; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/guard/cover/DjiCanCloseCoverGuard.java b/src/main/java/com/tuoheng/machine/impl/dji/guard/cover/DjiCanCloseCoverGuard.java similarity index 91% rename from src/main/java/com/tuoheng/machine/platform/impl/dji/guard/cover/DjiCanCloseCoverGuard.java rename to src/main/java/com/tuoheng/machine/impl/dji/guard/cover/DjiCanCloseCoverGuard.java index 422a311..2266227 100644 --- a/src/main/java/com/tuoheng/machine/platform/impl/dji/guard/cover/DjiCanCloseCoverGuard.java +++ b/src/main/java/com/tuoheng/machine/impl/dji/guard/cover/DjiCanCloseCoverGuard.java @@ -1,4 +1,4 @@ -package com.tuoheng.machine.platform.impl.dji.guard.cover; +package com.tuoheng.machine.impl.dji.guard.cover; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/guard/cover/DjiCanOpenCoverGuard.java b/src/main/java/com/tuoheng/machine/impl/dji/guard/cover/DjiCanOpenCoverGuard.java similarity index 91% rename from src/main/java/com/tuoheng/machine/platform/impl/dji/guard/cover/DjiCanOpenCoverGuard.java rename to src/main/java/com/tuoheng/machine/impl/dji/guard/cover/DjiCanOpenCoverGuard.java index b5593dd..050c437 100644 --- a/src/main/java/com/tuoheng/machine/platform/impl/dji/guard/cover/DjiCanOpenCoverGuard.java +++ b/src/main/java/com/tuoheng/machine/impl/dji/guard/cover/DjiCanOpenCoverGuard.java @@ -1,4 +1,4 @@ -package com.tuoheng.machine.platform.impl.dji.guard.cover; +package com.tuoheng.machine.impl.dji.guard.cover; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/guard/cover/DjiIsCoverClosedGuard.java b/src/main/java/com/tuoheng/machine/impl/dji/guard/cover/DjiIsCoverClosedGuard.java similarity index 91% rename from src/main/java/com/tuoheng/machine/platform/impl/dji/guard/cover/DjiIsCoverClosedGuard.java rename to src/main/java/com/tuoheng/machine/impl/dji/guard/cover/DjiIsCoverClosedGuard.java index 67098e2..5b00eab 100644 --- a/src/main/java/com/tuoheng/machine/platform/impl/dji/guard/cover/DjiIsCoverClosedGuard.java +++ b/src/main/java/com/tuoheng/machine/impl/dji/guard/cover/DjiIsCoverClosedGuard.java @@ -1,4 +1,4 @@ -package com.tuoheng.machine.platform.impl.dji.guard.cover; +package com.tuoheng.machine.impl.dji.guard.cover; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/guard/cover/DjiIsCoverOpenedGuard.java b/src/main/java/com/tuoheng/machine/impl/dji/guard/cover/DjiIsCoverOpenedGuard.java similarity index 91% rename from src/main/java/com/tuoheng/machine/platform/impl/dji/guard/cover/DjiIsCoverOpenedGuard.java rename to src/main/java/com/tuoheng/machine/impl/dji/guard/cover/DjiIsCoverOpenedGuard.java index 20e98ee..0ef103a 100644 --- a/src/main/java/com/tuoheng/machine/platform/impl/dji/guard/cover/DjiIsCoverOpenedGuard.java +++ b/src/main/java/com/tuoheng/machine/impl/dji/guard/cover/DjiIsCoverOpenedGuard.java @@ -1,4 +1,4 @@ -package com.tuoheng.machine.platform.impl.dji.guard.cover; +package com.tuoheng.machine.impl.dji.guard.cover; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/guard/drc/DjiCanEnterGuard.java b/src/main/java/com/tuoheng/machine/impl/dji/guard/drc/DjiCanEnterGuard.java similarity index 92% rename from src/main/java/com/tuoheng/machine/platform/impl/dji/guard/drc/DjiCanEnterGuard.java rename to src/main/java/com/tuoheng/machine/impl/dji/guard/drc/DjiCanEnterGuard.java index 59ad46d..f1be2f3 100644 --- a/src/main/java/com/tuoheng/machine/platform/impl/dji/guard/drc/DjiCanEnterGuard.java +++ b/src/main/java/com/tuoheng/machine/impl/dji/guard/drc/DjiCanEnterGuard.java @@ -1,4 +1,4 @@ -package com.tuoheng.machine.platform.impl.dji.guard.drc; +package com.tuoheng.machine.impl.dji.guard.drc; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/guard/drc/DjiCanExitGuard.java b/src/main/java/com/tuoheng/machine/impl/dji/guard/drc/DjiCanExitGuard.java similarity index 92% rename from src/main/java/com/tuoheng/machine/platform/impl/dji/guard/drc/DjiCanExitGuard.java rename to src/main/java/com/tuoheng/machine/impl/dji/guard/drc/DjiCanExitGuard.java index ead88ee..f74951e 100644 --- a/src/main/java/com/tuoheng/machine/platform/impl/dji/guard/drc/DjiCanExitGuard.java +++ b/src/main/java/com/tuoheng/machine/impl/dji/guard/drc/DjiCanExitGuard.java @@ -1,4 +1,4 @@ -package com.tuoheng.machine.platform.impl.dji.guard.drc; +package com.tuoheng.machine.impl.dji.guard.drc; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/guard/drone/DjiCanPointGuard.java b/src/main/java/com/tuoheng/machine/impl/dji/guard/drone/DjiCanPointGuard.java similarity index 94% rename from src/main/java/com/tuoheng/machine/platform/impl/dji/guard/drone/DjiCanPointGuard.java rename to src/main/java/com/tuoheng/machine/impl/dji/guard/drone/DjiCanPointGuard.java index 8bfe1b6..55cf1f4 100644 --- a/src/main/java/com/tuoheng/machine/platform/impl/dji/guard/drone/DjiCanPointGuard.java +++ b/src/main/java/com/tuoheng/machine/impl/dji/guard/drone/DjiCanPointGuard.java @@ -1,4 +1,4 @@ -package com.tuoheng.machine.platform.impl.dji.guard.drone; +package com.tuoheng.machine.impl.dji.guard.drone; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/listener/DjiAirportListener.java b/src/main/java/com/tuoheng/machine/impl/dji/listener/DjiAirportListener.java similarity index 82% rename from src/main/java/com/tuoheng/machine/platform/impl/dji/listener/DjiAirportListener.java rename to src/main/java/com/tuoheng/machine/impl/dji/listener/DjiAirportListener.java index b663ec3..e845da2 100644 --- a/src/main/java/com/tuoheng/machine/platform/impl/dji/listener/DjiAirportListener.java +++ b/src/main/java/com/tuoheng/machine/impl/dji/listener/DjiAirportListener.java @@ -1,4 +1,4 @@ -package com.tuoheng.machine.platform.impl.dji.listener; +package com.tuoheng.machine.impl.dji.listener; import com.tuoheng.machine.listener.DefaultAirportListener; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/listener/DjiCoverListener.java b/src/main/java/com/tuoheng/machine/impl/dji/listener/DjiCoverListener.java similarity index 82% rename from src/main/java/com/tuoheng/machine/platform/impl/dji/listener/DjiCoverListener.java rename to src/main/java/com/tuoheng/machine/impl/dji/listener/DjiCoverListener.java index d67ad64..4f56214 100644 --- a/src/main/java/com/tuoheng/machine/platform/impl/dji/listener/DjiCoverListener.java +++ b/src/main/java/com/tuoheng/machine/impl/dji/listener/DjiCoverListener.java @@ -1,4 +1,4 @@ -package com.tuoheng.machine.platform.impl.dji.listener; +package com.tuoheng.machine.impl.dji.listener; import com.tuoheng.machine.listener.DefaultCoverListener; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/listener/DjiDrcListener.java b/src/main/java/com/tuoheng/machine/impl/dji/listener/DjiDrcListener.java similarity index 83% rename from src/main/java/com/tuoheng/machine/platform/impl/dji/listener/DjiDrcListener.java rename to src/main/java/com/tuoheng/machine/impl/dji/listener/DjiDrcListener.java index 5a713f5..dfaf135 100644 --- a/src/main/java/com/tuoheng/machine/platform/impl/dji/listener/DjiDrcListener.java +++ b/src/main/java/com/tuoheng/machine/impl/dji/listener/DjiDrcListener.java @@ -1,4 +1,4 @@ -package com.tuoheng.machine.platform.impl.dji.listener; +package com.tuoheng.machine.impl.dji.listener; import com.tuoheng.machine.listener.DefaultDrcListener; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/listener/DjiDroneListener.java b/src/main/java/com/tuoheng/machine/impl/dji/listener/DjiDroneListener.java similarity index 84% rename from src/main/java/com/tuoheng/machine/platform/impl/dji/listener/DjiDroneListener.java rename to src/main/java/com/tuoheng/machine/impl/dji/listener/DjiDroneListener.java index 5dcfa75..12eec26 100644 --- a/src/main/java/com/tuoheng/machine/platform/impl/dji/listener/DjiDroneListener.java +++ b/src/main/java/com/tuoheng/machine/impl/dji/listener/DjiDroneListener.java @@ -1,4 +1,4 @@ -package com.tuoheng.machine.platform.impl.dji.listener; +package com.tuoheng.machine.impl.dji.listener; import com.tuoheng.machine.listener.DefaultDroneListener; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/tuoheng/machine/manager/AbstractAirportSystemManager.java b/src/main/java/com/tuoheng/machine/manager/AbsSystemManager.java similarity index 99% rename from src/main/java/com/tuoheng/machine/manager/AbstractAirportSystemManager.java rename to src/main/java/com/tuoheng/machine/manager/AbsSystemManager.java index b0e9296..f2fe988 100644 --- a/src/main/java/com/tuoheng/machine/manager/AbstractAirportSystemManager.java +++ b/src/main/java/com/tuoheng/machine/manager/AbsSystemManager.java @@ -22,7 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired; * 提供通用的业务编排能力，具体实现可按需扩展 */ @Slf4j -public abstract class AbstractAirportSystemManager implements AirportSystemManager { +public abstract class AbsSystemManager implements ISystemManager { /** * 子类需要声明自己支持的平台类型 diff --git a/src/main/java/com/tuoheng/machine/manager/AirportSystemManager.java b/src/main/java/com/tuoheng/machine/manager/ISystemManager.java similarity index 96% rename from src/main/java/com/tuoheng/machine/manager/AirportSystemManager.java rename to src/main/java/com/tuoheng/machine/manager/ISystemManager.java index 4c1067e..f24b532 100644 --- a/src/main/java/com/tuoheng/machine/manager/AirportSystemManager.java +++ b/src/main/java/com/tuoheng/machine/manager/ISystemManager.java @@ -1,7 +1,5 @@ package com.tuoheng.machine.manager; -import lombok.extern.slf4j.Slf4j; - import com.tuoheng.machine.events.AirportEvent; import com.tuoheng.machine.events.CoverEvent; import com.tuoheng.machine.events.DroneEvent; @@ -16,7 +14,7 @@ import com.tuoheng.machine.status.DrcState; * 机巢系统管理器接口 * 抽象对外能力，便于后续扩展不同实现 */ -public interface AirportSystemManager { +public interface ISystemManager { /** * 该Manager对应的平台类型 diff --git a/src/main/java/com/tuoheng/machine/manager/factory/AirportSystemManagerFactory.java b/src/main/java/com/tuoheng/machine/manager/factory/AirportSystemManagerFactory.java index fc144a4..9764fd9 100644 --- a/src/main/java/com/tuoheng/machine/manager/factory/AirportSystemManagerFactory.java +++ b/src/main/java/com/tuoheng/machine/manager/factory/AirportSystemManagerFactory.java @@ -1,8 +1,8 @@ package com.tuoheng.machine.manager.factory; -import com.tuoheng.machine.manager.AirportSystemManager; +import com.tuoheng.machine.manager.ISystemManager; import com.tuoheng.machine.platform.PlatformType; -import com.tuoheng.machine.repository.AirportPlatformRepository; +import com.tuoheng.machine.repository.MachinePlatTypeRepository; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -20,22 +20,22 @@ import java.util.concurrent.ConcurrentHashMap; public class AirportSystemManagerFactory { @Autowired - private AirportPlatformRepository airportPlatformRepository; + private MachinePlatTypeRepository machinePlatTypeRepository; /** * 存储所有平台的系统管理器实现 * Key: PlatformType * Value: AirportSystemManager实现 */ - private final Map managerMap = new ConcurrentHashMap<>(); + private final Map managerMap = new ConcurrentHashMap<>(); /** * 注册所有系统管理器 * Spring会自动注入所有实现了AirportSystemManager的Bean */ @Autowired - public void registerManagers(List managers) { - for (AirportSystemManager manager : managers) { + public void registerManagers(List managers) { + for (ISystemManager manager : managers) { managerMap.put(manager.getPlatformType(), manager); log.info("注册系统管理器: {} -> {}", manager.getPlatformType().getName(), manager.getClass().getSimpleName()); @@ -49,15 +49,15 @@ public class AirportSystemManagerFactory { * @return 对应平台的AirportSystemManager实现 * @throws IllegalArgumentException 如果机巢未注册或系统管理器不存在 */ - public AirportSystemManager getManager(String airportSn) { - PlatformType platformType = airportPlatformRepository.getPlatformType(airportSn); + public ISystemManager getManager(String airportSn) { + PlatformType platformType = machinePlatTypeRepository.getPlatformType(airportSn); if (platformType == null) { throw new IllegalArgumentException( String.format("机巢未注册或平台类型未配置: %s", airportSn)); } - AirportSystemManager manager = managerMap.get(platformType); + ISystemManager manager = managerMap.get(platformType); if (manager == null) { throw new IllegalArgumentException( @@ -73,7 +73,7 @@ public class AirportSystemManagerFactory { * @param platformType 平台类型 * @return 对应平台的AirportSystemManager实现 */ - public AirportSystemManager getManagerByType(PlatformType platformType) { + public ISystemManager getManagerByType(PlatformType platformType) { return managerMap.get(platformType); } } diff --git a/src/main/java/com/tuoheng/machine/platform/factory/PlatformStrategyFactory.java b/src/main/java/com/tuoheng/machine/platform/factory/PlatformStrategyFactory.java index 2c50691..1ea8914 100644 --- a/src/main/java/com/tuoheng/machine/platform/factory/PlatformStrategyFactory.java +++ b/src/main/java/com/tuoheng/machine/platform/factory/PlatformStrategyFactory.java @@ -1,7 +1,7 @@ package com.tuoheng.machine.platform.factory; import com.tuoheng.machine.platform.PlatformType; -import com.tuoheng.machine.repository.AirportPlatformRepository; +import com.tuoheng.machine.repository.MachinePlatTypeRepository; import com.tuoheng.machine.platform.strategy.AirportPlatformStrategy; import com.tuoheng.machine.platform.strategy.CoverPlatformStrategy; import com.tuoheng.machine.platform.strategy.DronePlatformStrategy; @@ -23,7 +23,7 @@ import java.util.concurrent.ConcurrentHashMap; public class PlatformStrategyFactory { @Autowired - private AirportPlatformRepository airportPlatformRepository; + private MachinePlatTypeRepository machinePlatTypeRepository; /** * 存储所有机巢平台策略实现 @@ -102,7 +102,7 @@ public class PlatformStrategyFactory { */ public AirportPlatformStrategy getAirportStrategy(String airportSn) { // 从数据库查询平台类型 - PlatformType platformType = airportPlatformRepository.getPlatformType(airportSn); + PlatformType platformType = machinePlatTypeRepository.getPlatformType(airportSn); if (platformType == null) { throw new IllegalArgumentException( @@ -128,7 +128,7 @@ public class PlatformStrategyFactory { */ public CoverPlatformStrategy getCoverStrategy(String airportSn) { // 从数据库查询平台类型 - PlatformType platformType = airportPlatformRepository.getPlatformType(airportSn); + PlatformType platformType = machinePlatTypeRepository.getPlatformType(airportSn); if (platformType == null) { throw new IllegalArgumentException( @@ -175,7 +175,7 @@ public class PlatformStrategyFactory { */ public DronePlatformStrategy getDroneStrategy(String droneSn) { // 从数据库查询平台类型 - PlatformType platformType = airportPlatformRepository.getPlatformType(droneSn); + PlatformType platformType = machinePlatTypeRepository.getPlatformType(droneSn); if (platformType == null) { throw new IllegalArgumentException( @@ -211,7 +211,7 @@ public class PlatformStrategyFactory { */ public DrcPlatformStrategy getDrcStrategy(String airportSn) { // 从数据库查询平台类型 - PlatformType platformType = airportPlatformRepository.getPlatformType(airportSn); + PlatformType platformType = machinePlatTypeRepository.getPlatformType(airportSn); if (platformType == null) { throw new IllegalArgumentException( @@ -245,6 +245,6 @@ public class PlatformStrategyFactory { * @return 平台类型 */ public PlatformType getPlatformType(String airportSn) { - return airportPlatformRepository.getPlatformType(airportSn); + return machinePlatTypeRepository.getPlatformType(airportSn); } } diff --git a/src/main/java/com/tuoheng/machine/repository/AirportPlatformRepository.java b/src/main/java/com/tuoheng/machine/repository/MachinePlatTypeRepository.java similarity index 96% rename from src/main/java/com/tuoheng/machine/repository/AirportPlatformRepository.java rename to src/main/java/com/tuoheng/machine/repository/MachinePlatTypeRepository.java index ab44206..1f667e2 100644 --- a/src/main/java/com/tuoheng/machine/repository/AirportPlatformRepository.java +++ b/src/main/java/com/tuoheng/machine/repository/MachinePlatTypeRepository.java @@ -13,7 +13,7 @@ import java.util.concurrent.ConcurrentHashMap; */ @Slf4j @Repository -public class AirportPlatformRepository { +public class MachinePlatTypeRepository { /** * 模拟数据库存储 @@ -25,7 +25,7 @@ public class AirportPlatformRepository { /** * 初始化一些测试数据 */ - public AirportPlatformRepository() { + public MachinePlatTypeRepository() { // 模拟数据库中的数据 airportPlatformMap.put("airport-001", PlatformType.DJI); airportPlatformMap.put("airport-002", PlatformType.DJI); diff --git a/src/test/java/com/tuoheng/machine/DrcStateMachineTest.java b/src/test/java/com/tuoheng/machine/DrcStateMachineTest.java index a027aa2..182c401 100644 --- a/src/test/java/com/tuoheng/machine/DrcStateMachineTest.java +++ b/src/test/java/com/tuoheng/machine/DrcStateMachineTest.java @@ -1,11 +1,10 @@ package com.tuoheng.machine; -import com.tuoheng.machine.events.DrcEvent; import com.tuoheng.machine.platform.PlatformType; import com.tuoheng.machine.platform.factory.PlatformStrategyFactory; -import com.tuoheng.machine.repository.AirportPlatformRepository; +import com.tuoheng.machine.repository.MachinePlatTypeRepository; import com.tuoheng.machine.service.DrcMachineService; -import com.tuoheng.machine.status.DrcState; +import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; @@ -20,6 +19,7 @@ import static org.mockito.Mockito.when; * 测试DRC模式的完整状态转换流程 */ @SpringBootTest +@Slf4j public class DrcStateMachineTest { @Autowired @@ -29,7 +29,7 @@ public class DrcStateMachineTest { private PlatformStrategyFactory platformStrategyFactory; @MockBean - private AirportPlatformRepository airportPlatformRepository; + private MachinePlatTypeRepository machinePlatTypeRepository; private static final String TEST_AIRPORT_SN = "test-airport-001"; @@ -38,347 +38,15 @@ public class DrcStateMachineTest { */ @Test public void testAutowiredInjection() { - System.out.println("\n========== 测试依赖注入 =========="); // 验证 PlatformStrategyFactory 是否成功注入 assertNotNull(platformStrategyFactory, "PlatformStrategyFactory 应该被成功注入"); - System.out.println("✓ PlatformStrategyFactory 注入成功: " + platformStrategyFactory.getClass().getName()); - // 验证 DrcMachineService 是否成功注入 assertNotNull(drcMachineService, "DrcMachineService 应该被成功注入"); - System.out.println("✓ DrcMachineService 注入成功: " + drcMachineService.getClass().getName()); - // 验证 AirportPlatformRepository Mock 是否成功 - assertNotNull(airportPlatformRepository, "AirportPlatformRepository Mock 应该被成功创建"); - System.out.println("✓ AirportPlatformRepository Mock 创建成功"); + assertNotNull(machinePlatTypeRepository, "AirportPlatformRepository Mock 应该被成功创建"); - // 配置 Mock 行为 - when(airportPlatformRepository.getPlatformType(anyString())).thenReturn(PlatformType.DJI); - // 测试 Mock 是否工作 - PlatformType platformType = airportPlatformRepository.getPlatformType(TEST_AIRPORT_SN); - assertEquals(PlatformType.DJI, platformType, "Mock 应该返回 DJI 平台类型"); - System.out.println("✓ Mock 行为配置成功，返回平台类型: " + platformType.getName()); - - System.out.println("\n========== 依赖注入测试通过 ✓ ==========\n"); } -// private DrcMachineService drcMachineService; -// private PlatformStrategyFactory platformStrategyFactory; -// private AnnotationConfigApplicationContext context; -// -// private static final String TEST_AIRPORT_SN = "test-airport-001"; -// -// /** -// * 测试配置类 -// */ -// @Configuration -// static class TestConfig { -// @Bean -// public RedisStateStore redisStateStore() { -// return new RedisStateStore(); -// } -// -// @Bean -// public DjiCanEnterGuard djiCanEnterGuard() { -// return new DjiCanEnterGuard(); -// } -// -// @Bean -// public DjiCanExitGuard djiCanExitGuard() { -// return new DjiCanExitGuard(); -// } -// -// @Bean -// public DjiEnterAction djiEnterAction() { -// return new DjiEnterAction(); -// } -// -// @Bean -// public DjiEnteredAction djiEnteredAction() { -// return new DjiEnteredAction(); -// } -// -// @Bean -// public DjiExitAction djiExitAction() { -// return new DjiExitAction(); -// } -// -// @Bean -// public DjiExitedAction djiExitedAction() { -// return new DjiExitedAction(); -// } -// -// @Bean -// public DjiDrcListener djiDrcListener() { -// return new DjiDrcListener(); -// } -// -// @Bean -// public DjiDrcPlatformStrategy djiDrcPlatformStrategy() { -// return new DjiDrcPlatformStrategy(); -// } -// -// @Bean -// public AirportPlatformRepository airportPlatformRepository() { -// // Mock实现，返回DJI平台类型 -// return new AirportPlatformRepository() { -// @Override -// public PlatformType getPlatformType(String sn) { -// return PlatformType.DJI; -// } -// -// @Override -// public void registerAirport(String sn, PlatformType platformType) { -// } -// }; -// } -// -// @Bean -// public PlatformStrategyFactory platformStrategyFactory() { -// return new PlatformStrategyFactory(); -// } -// -// @Bean -// public DrcMachineConfig drcMachineConfig() { -// return new DrcMachineConfig(); -// } -// -// @Bean -// public DrcMachineService drcMachineService() { -// return new DrcMachineService(); -// } -// } -// -// @Override -// protected void setUp() throws Exception { -// super.setUp(); -// System.out.println("========== 开始DRC状态机测试 =========="); -// -// // 初始化Spring上下文 -// context = new AnnotationConfigApplicationContext(TestConfig.class); -// drcMachineService = context.getBean(DrcMachineService.class); -// platformStrategyFactory = context.getBean(PlatformStrategyFactory.class); -// } -// -// @Override -// protected void tearDown() throws Exception { -// if (context != null) { -// context.close(); -// } -// super.tearDown(); -// } -// -// /** -// * 测试DRC状态机的完整流程： -// * UNKNOWN -> EXITED -> ENTERING -> ENTERED -> EXITING -> EXITED -// */ -// @Test -// public void testDrcCompleteFlow() { -// System.out.println("\n========== 测试DRC完整流程 =========="); -// -// // 1. 初始状态应该是 UNKNOWN -// DrcState initialState = drcMachineService.getCurrentState(TEST_AIRPORT_SN); -// assertNotNull("状态机应该已创建", initialState); -// assertEquals("初始状态应该是UNKNOWN", DrcState.UNKNOWN, initialState); -// System.out.println("✓ 步骤1: 初始状态验证通过 - UNKNOWN"); -// -// // 2. 从 UNKNOWN 同步到 EXITED（退出状态） -// boolean syncResult = drcMachineService.sendEvent(TEST_AIRPORT_SN, DrcEvent.EXITED); -// assertTrue("同步到EXITED应该成功", syncResult); -// assertEquals("当前状态应该是EXITED", DrcState.EXITED, -// drcMachineService.getCurrentState(TEST_AIRPORT_SN)); -// System.out.println("✓ 步骤2: UNKNOWN -> EXITED 转换成功"); -// -// // 3. 进入DRC模式：EXITED -> ENTERING -// boolean enterResult = drcMachineService.sendEvent(TEST_AIRPORT_SN, DrcEvent.ENTER); -// assertTrue("进入DRC模式应该成功", enterResult); -// assertEquals("当前状态应该是ENTERING", DrcState.ENTERING, -// drcMachineService.getCurrentState(TEST_AIRPORT_SN)); -// System.out.println("✓ 步骤3: EXITED -> ENTERING 转换成功"); -// -// // 4. 进入完成：ENTERING -> ENTERED -// boolean enteredResult = drcMachineService.sendEvent(TEST_AIRPORT_SN, DrcEvent.ENTERED); -// assertTrue("进入完成应该成功", enteredResult); -// assertEquals("当前状态应该是ENTERED", DrcState.ENTERED, -// drcMachineService.getCurrentState(TEST_AIRPORT_SN)); -// System.out.println("✓ 步骤4: ENTERING -> ENTERED 转换成功"); -// -// // 5. 退出DRC模式：ENTERED -> EXITING -// boolean exitResult = drcMachineService.sendEvent(TEST_AIRPORT_SN, DrcEvent.EXIT); -// assertTrue("退出DRC模式应该成功", exitResult); -// assertEquals("当前状态应该是EXITING", DrcState.EXITING, -// drcMachineService.getCurrentState(TEST_AIRPORT_SN)); -// System.out.println("✓ 步骤5: ENTERED -> EXITING 转换成功"); -// -// // 6. 退出完成：EXITING -> EXITED -// boolean exitedResult = drcMachineService.sendEvent(TEST_AIRPORT_SN, DrcEvent.EXITED); -// assertTrue("退出完成应该成功", exitedResult); -// assertEquals("当前状态应该是EXITED", DrcState.EXITED, -// drcMachineService.getCurrentState(TEST_AIRPORT_SN)); -// System.out.println("✓ 步骤6: EXITING -> EXITED 转换成功"); -// -// System.out.println("\n========== DRC完整流程测试通过 ✓ ==========\n"); -// } -// -// /** -// * 测试DRC状态机的循环流程： -// * 可以多次进入和退出DRC模式 -// */ -// @Test -// public void testDrcCycleFlow() { -// System.out.println("\n========== 测试DRC循环流程 =========="); -// -// // 初始化到EXITED状态 -// drcMachineService.sendEvent(TEST_AIRPORT_SN, DrcEvent.EXITED); -// assertEquals("初始状态应该是EXITED", DrcState.EXITED, -// drcMachineService.getCurrentState(TEST_AIRPORT_SN)); -// -// // 第一次循环：进入 -> 退出 -// System.out.println("\n--- 第一次循环 ---"); -// drcMachineService.sendEvent(TEST_AIRPORT_SN, DrcEvent.ENTER); -// assertEquals("应该进入ENTERING状态", DrcState.ENTERING, -// drcMachineService.getCurrentState(TEST_AIRPORT_SN)); -// -// drcMachineService.sendEvent(TEST_AIRPORT_SN, DrcEvent.ENTERED); -// assertEquals("应该进入ENTERED状态", DrcState.ENTERED, -// drcMachineService.getCurrentState(TEST_AIRPORT_SN)); -// -// drcMachineService.sendEvent(TEST_AIRPORT_SN, DrcEvent.EXIT); -// assertEquals("应该进入EXITING状态", DrcState.EXITING, -// drcMachineService.getCurrentState(TEST_AIRPORT_SN)); -// -// drcMachineService.sendEvent(TEST_AIRPORT_SN, DrcEvent.EXITED); -// assertEquals("应该回到EXITED状态", DrcState.EXITED, -// drcMachineService.getCurrentState(TEST_AIRPORT_SN)); -// System.out.println("✓ 第一次循环完成"); -// -// // 第二次循环：再次进入 -> 退出 -// System.out.println("\n--- 第二次循环 ---"); -// drcMachineService.sendEvent(TEST_AIRPORT_SN, DrcEvent.ENTER); -// assertEquals("应该再次进入ENTERING状态", DrcState.ENTERING, -// drcMachineService.getCurrentState(TEST_AIRPORT_SN)); -// -// drcMachineService.sendEvent(TEST_AIRPORT_SN, DrcEvent.ENTERED); -// assertEquals("应该再次进入ENTERED状态", DrcState.ENTERED, -// drcMachineService.getCurrentState(TEST_AIRPORT_SN)); -// -// drcMachineService.sendEvent(TEST_AIRPORT_SN, DrcEvent.EXIT); -// assertEquals("应该再次进入EXITING状态", DrcState.EXITING, -// drcMachineService.getCurrentState(TEST_AIRPORT_SN)); -// -// drcMachineService.sendEvent(TEST_AIRPORT_SN, DrcEvent.EXITED); -// assertEquals("应该再次回到EXITED状态", DrcState.EXITED, -// drcMachineService.getCurrentState(TEST_AIRPORT_SN)); -// System.out.println("✓ 第二次循环完成"); -// -// System.out.println("\n========== DRC循环流程测试通过 ✓ ==========\n"); -// } -// -// /** -// * 测试非法状态转换 -// * 验证状态机会拒绝不合法的状态转换 -// */ -// @Test -// public void testInvalidStateTransitions() { -// System.out.println("\n========== 测试非法状态转换 =========="); -// -// // 初始化到EXITED状态 -// drcMachineService.sendEvent(TEST_AIRPORT_SN, DrcEvent.EXITED); -// assertEquals("初始状态应该是EXITED", DrcState.EXITED, -// drcMachineService.getCurrentState(TEST_AIRPORT_SN)); -// -// // 尝试从EXITED直接到ENTERED（应该失败） -// boolean invalidResult = drcMachineService.sendEvent(TEST_AIRPORT_SN, DrcEvent.ENTERED); -// assertFalse("从EXITED直接到ENTERED应该失败", invalidResult); -// assertEquals("状态应该保持EXITED", DrcState.EXITED, -// drcMachineService.getCurrentState(TEST_AIRPORT_SN)); -// System.out.println("✓ 非法转换被正确拒绝: EXITED -X-> ENTERED"); -// -// // 进入ENTERING状态 -// drcMachineService.sendEvent(TEST_AIRPORT_SN, DrcEvent.ENTER); -// assertEquals("应该进入ENTERING状态", DrcState.ENTERING, -// drcMachineService.getCurrentState(TEST_AIRPORT_SN)); -// -// // 尝试从ENTERING直接到EXITING（应该失败） -// invalidResult = drcMachineService.sendEvent(TEST_AIRPORT_SN, DrcEvent.EXIT); -// assertFalse("从ENTERING直接到EXITING应该失败", invalidResult); -// assertEquals("状态应该保持ENTERING", DrcState.ENTERING, -// drcMachineService.getCurrentState(TEST_AIRPORT_SN)); -// System.out.println("✓ 非法转换被正确拒绝: ENTERING -X-> EXITING"); -// -// System.out.println("\n========== 非法状态转换测试通过 ✓ ==========\n"); -// } -// -// /** -// * 测试状态机的状态查询功能 -// */ -// @Test -// public void testStateQuery() { -// System.out.println("\n========== 测试状态查询功能 =========="); -// -// // 初始化到EXITED状态 -// drcMachineService.sendEvent(TEST_AIRPORT_SN, DrcEvent.EXITED); -// -// // 测试getCurrentState -// DrcState currentState = drcMachineService.getCurrentState(TEST_AIRPORT_SN); -// assertNotNull("当前状态不应该为null", currentState); -// assertEquals("当前状态应该是EXITED", DrcState.EXITED, currentState); -// System.out.println("✓ getCurrentState() 工作正常"); -// -// // 测试getCurrentStates（获取状态字符串） -// String statesString = drcMachineService.getCurrentStates(TEST_AIRPORT_SN); -// assertNotNull("状态字符串不应该为null", statesString); -// assertTrue("状态字符串应该包含EXITED", statesString.contains("EXITED")); -// System.out.println("✓ getCurrentStates() 工作正常: " + statesString); -// -// // 测试isInState -// boolean isInExited = drcMachineService.isInState(TEST_AIRPORT_SN, DrcState.EXITED); -// assertTrue("应该处于EXITED状态", isInExited); -// System.out.println("✓ isInState() 工作正常"); -// -// boolean isInEntered = drcMachineService.isInState(TEST_AIRPORT_SN, DrcState.ENTERED); -// assertFalse("不应该处于ENTERED状态", isInEntered); -// System.out.println("✓ isInState() 负面测试通过"); -// -// System.out.println("\n========== 状态查询功能测试通过 ✓ ==========\n"); -// } -// -// /** -// * 测试状态机管理功能 -// */ -// @Test -// public void testStateMachineManagement() { -// System.out.println("\n========== 测试状态机管理功能 =========="); -// -// String testAirport = "test-airport-mgmt"; -// -// // 测试状态机创建 -// assertFalse("状态机应该不存在", drcMachineService.hasStateMachine(testAirport)); -// drcMachineService.getOrCreateStateMachine(testAirport); -// assertTrue("状态机应该已创建", drcMachineService.hasStateMachine(testAirport)); -// System.out.println("✓ 状态机创建成功"); -// -// // 测试状态机计数 -// int count = drcMachineService.getStateMachineCount(); -// assertTrue("状态机数量应该大于0", count > 0); -// System.out.println("✓ 状态机计数: " + count); -// -// // 测试状态机重启 -// drcMachineService.sendEvent(testAirport, DrcEvent.EXITED); -// assertEquals("状态应该是EXITED", DrcState.EXITED, -// drcMachineService.getCurrentState(testAirport)); -// -// drcMachineService.restartStateMachine(testAirport); -// assertEquals("重启后状态应该回到UNKNOWN", DrcState.UNKNOWN, -// drcMachineService.getCurrentState(testAirport)); -// System.out.println("✓ 状态机重启成功"); -// -// // 测试状态机移除 -// drcMachineService.removeStateMachine(testAirport); -// assertFalse("状态机应该已移除", drcMachineService.hasStateMachine(testAirport)); -// System.out.println("✓ 状态机移除成功"); -// -// System.out.println("\n========== 状态机管理功能测试通过 ✓ ==========\n"); -// } }