From 263433598b06d9bb50ee17efd294e1669fd46ee9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Mon, 15 Dec 2025 18:54:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8C=85=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MULTI_PLATFORM_ARCHITECTURE.md | 2 +- .../airport/action/airport/OfflineAction.java | 12 ---------- .../airport/action/airport/OnlineAction.java | 12 ---------- .../action/cover/CloseCoverAction.java | 12 ---------- .../action/cover/CoverClosedAction.java | 12 ---------- .../action/cover/CoverOpenedAction.java | 12 ---------- .../airport/action/cover/OpenCoverAction.java | 12 ---------- .../action/debug/CloseDebugModeAction.java | 12 ---------- .../action/debug/OpenDebugModeAction.java | 12 ---------- .../airport/action/reboot/RebootAction.java | 12 ---------- .../action/reboot/RebootCompletedAction.java | 12 ---------- .../guard/airport/CanOfflineGuard.java | 12 ---------- .../airport/guard/airport/CanOnlineGuard.java | 12 ---------- .../guard/airport/IsAirportOnlineGuard.java | 12 ---------- .../guard/cover/CanCloseCoverGuard.java | 12 ---------- .../guard/cover/CanOpenCoverGuard.java | 12 ---------- .../guard/cover/IsCoverClosedGuard.java | 12 ---------- .../guard/cover/IsCoverOpenedGuard.java | 12 ---------- .../guard/debug/CanCloseDebugModeGuard.java | 12 ---------- .../airport/guard/debug/IsDebugModeGuard.java | 12 ---------- .../guard/debug/IsNotDebugModeGuard.java | 12 ---------- .../guard/reboot/IsRebootCompletedGuard.java | 12 ---------- .../status/airport/status/DroneState.java | 4 ---- .../machine/action/airport/OfflineAction.java | 12 ++++++++++ .../machine/action/airport/OnlineAction.java | 12 ++++++++++ .../action/cover/CloseCoverAction.java | 12 ++++++++++ .../action/cover/CoverClosedAction.java | 12 ++++++++++ .../action/cover/CoverOpenedAction.java | 12 ++++++++++ .../machine/action/cover/OpenCoverAction.java | 12 ++++++++++ .../action/debug/CloseDebugModeAction.java | 12 ++++++++++ .../action/debug/OpenDebugModeAction.java | 12 ++++++++++ .../machine/action/reboot/RebootAction.java | 12 ++++++++++ .../action/reboot/RebootCompletedAction.java | 12 ++++++++++ .../config/AirportMachineConfig.java | 10 ++++----- .../config/CoverMachineConfig.java | 10 ++++----- .../demo/MultiPlatformDemo.java | 10 ++++----- .../events/AirportEvent.java | 2 +- .../events/CoverEvent.java | 2 +- .../guard/airport/CanOfflineGuard.java | 12 ++++++++++ .../machine/guard/airport/CanOnlineGuard.java | 12 ++++++++++ .../guard/airport/IsAirportOnlineGuard.java | 12 ++++++++++ .../guard/cover/CanCloseCoverGuard.java | 12 ++++++++++ .../guard/cover/CanOpenCoverGuard.java | 12 ++++++++++ .../guard/cover/IsCoverClosedGuard.java | 12 ++++++++++ .../guard/cover/IsCoverOpenedGuard.java | 12 ++++++++++ .../guard/debug/CanCloseDebugModeGuard.java | 12 ++++++++++ .../machine/guard/debug/IsDebugModeGuard.java | 12 ++++++++++ .../guard/debug/IsNotDebugModeGuard.java | 12 ++++++++++ .../guard/reboot/IsRebootCompletedGuard.java | 12 ++++++++++ .../listener/DefaultAirportListener.java | 9 ++++---- .../listener/DefaultCoverListener.java | 9 ++++---- .../manager/AbstractAirportSystemManager.java | 8 +++---- .../manager/AirportSystemManager.java | 8 +++---- .../platform/PlatformType.java | 2 +- .../factory/PlatformStrategyFactory.java | 12 +++++----- .../impl/dji/DjiAirportPlatformStrategy.java | 22 +++++++++---------- .../impl/dji/DjiAirportSystemManager.java | 14 ++++++------ .../impl/dji/DjiCoverPlatformStrategy.java | 22 +++++++++---------- .../airport/DjiCloseDebugModeAction.java | 8 +++---- .../dji/action/airport/DjiOfflineAction.java | 8 +++---- .../dji/action/airport/DjiOnlineAction.java | 8 +++---- .../airport/DjiOpenDebugModeAction.java | 8 +++---- .../dji/action/airport/DjiRebootAction.java | 8 +++---- .../airport/DjiRebootCompletedAction.java | 8 +++---- .../dji/action/cover/DjiCloseCoverAction.java | 8 +++---- .../action/cover/DjiCoverClosedAction.java | 8 +++---- .../dji/action/cover/DjiCoverErrorAction.java | 8 +++---- .../action/cover/DjiCoverOpenedAction.java | 8 +++---- .../dji/action/cover/DjiCoverResetAction.java | 8 +++---- .../dji/action/cover/DjiOpenCoverAction.java | 8 +++---- .../airport/DjiCanCloseDebugModeGuard.java | 8 +++---- .../dji/guard/airport/DjiCanOfflineGuard.java | 8 +++---- .../dji/guard/airport/DjiCanOnlineGuard.java | 8 +++---- .../guard/airport/DjiIsDebugModeGuard.java | 8 +++---- .../guard/airport/DjiIsNotDebugModeGuard.java | 8 +++---- .../airport/DjiIsRebootCompletedGuard.java | 8 +++---- .../guard/cover/DjiCanCloseCoverGuard.java | 8 +++---- .../dji/guard/cover/DjiCanOpenCoverGuard.java | 8 +++---- .../guard/cover/DjiIsCoverClosedGuard.java | 8 +++---- .../guard/cover/DjiIsCoverOpenedGuard.java | 8 +++---- .../impl/dji/listener/DjiAirportListener.java | 4 ++-- .../impl/dji/listener/DjiCoverListener.java | 4 ++-- .../repository/AirportPlatformRepository.java | 4 ++-- .../strategy/AirportPlatformStrategy.java | 8 +++---- .../strategy/CoverPlatformStrategy.java | 8 +++---- .../platform/strategy/PlatformAction.java | 2 +- .../platform/strategy/PlatformGuard.java | 2 +- .../platform/strategy/PlatformListener.java | 2 +- .../service/AirportMachineService.java | 6 ++--- .../service/CoverMachineService.java | 6 ++--- .../status/AirportState.java | 2 +- .../status/CoverState.java | 2 +- .../status/machine/status/DroneState.java | 4 ++++ 93 files changed, 439 insertions(+), 441 deletions(-) delete mode 100644 src/main/java/com/tuoheng/status/airport/action/airport/OfflineAction.java delete mode 100644 src/main/java/com/tuoheng/status/airport/action/airport/OnlineAction.java delete mode 100644 src/main/java/com/tuoheng/status/airport/action/cover/CloseCoverAction.java delete mode 100644 src/main/java/com/tuoheng/status/airport/action/cover/CoverClosedAction.java delete mode 100644 src/main/java/com/tuoheng/status/airport/action/cover/CoverOpenedAction.java delete mode 100644 src/main/java/com/tuoheng/status/airport/action/cover/OpenCoverAction.java delete mode 100644 src/main/java/com/tuoheng/status/airport/action/debug/CloseDebugModeAction.java delete mode 100644 src/main/java/com/tuoheng/status/airport/action/debug/OpenDebugModeAction.java delete mode 100644 src/main/java/com/tuoheng/status/airport/action/reboot/RebootAction.java delete mode 100644 src/main/java/com/tuoheng/status/airport/action/reboot/RebootCompletedAction.java delete mode 100644 src/main/java/com/tuoheng/status/airport/guard/airport/CanOfflineGuard.java delete mode 100644 src/main/java/com/tuoheng/status/airport/guard/airport/CanOnlineGuard.java delete mode 100644 src/main/java/com/tuoheng/status/airport/guard/airport/IsAirportOnlineGuard.java delete mode 100644 src/main/java/com/tuoheng/status/airport/guard/cover/CanCloseCoverGuard.java delete mode 100644 src/main/java/com/tuoheng/status/airport/guard/cover/CanOpenCoverGuard.java delete mode 100644 src/main/java/com/tuoheng/status/airport/guard/cover/IsCoverClosedGuard.java delete mode 100644 src/main/java/com/tuoheng/status/airport/guard/cover/IsCoverOpenedGuard.java delete mode 100644 src/main/java/com/tuoheng/status/airport/guard/debug/CanCloseDebugModeGuard.java delete mode 100644 src/main/java/com/tuoheng/status/airport/guard/debug/IsDebugModeGuard.java delete mode 100644 src/main/java/com/tuoheng/status/airport/guard/debug/IsNotDebugModeGuard.java delete mode 100644 src/main/java/com/tuoheng/status/airport/guard/reboot/IsRebootCompletedGuard.java delete mode 100644 src/main/java/com/tuoheng/status/airport/status/DroneState.java create mode 100644 src/main/java/com/tuoheng/status/machine/action/airport/OfflineAction.java create mode 100644 src/main/java/com/tuoheng/status/machine/action/airport/OnlineAction.java create mode 100644 src/main/java/com/tuoheng/status/machine/action/cover/CloseCoverAction.java create mode 100644 src/main/java/com/tuoheng/status/machine/action/cover/CoverClosedAction.java create mode 100644 src/main/java/com/tuoheng/status/machine/action/cover/CoverOpenedAction.java create mode 100644 src/main/java/com/tuoheng/status/machine/action/cover/OpenCoverAction.java create mode 100644 src/main/java/com/tuoheng/status/machine/action/debug/CloseDebugModeAction.java create mode 100644 src/main/java/com/tuoheng/status/machine/action/debug/OpenDebugModeAction.java create mode 100644 src/main/java/com/tuoheng/status/machine/action/reboot/RebootAction.java create mode 100644 src/main/java/com/tuoheng/status/machine/action/reboot/RebootCompletedAction.java rename src/main/java/com/tuoheng/status/{airport => machine}/config/AirportMachineConfig.java (95%) rename src/main/java/com/tuoheng/status/{airport => machine}/config/CoverMachineConfig.java (94%) rename src/main/java/com/tuoheng/status/{airport => machine}/demo/MultiPlatformDemo.java (93%) rename src/main/java/com/tuoheng/status/{airport => machine}/events/AirportEvent.java (95%) rename src/main/java/com/tuoheng/status/{airport => machine}/events/CoverEvent.java (89%) create mode 100644 src/main/java/com/tuoheng/status/machine/guard/airport/CanOfflineGuard.java create mode 100644 src/main/java/com/tuoheng/status/machine/guard/airport/CanOnlineGuard.java create mode 100644 src/main/java/com/tuoheng/status/machine/guard/airport/IsAirportOnlineGuard.java create mode 100644 src/main/java/com/tuoheng/status/machine/guard/cover/CanCloseCoverGuard.java create mode 100644 src/main/java/com/tuoheng/status/machine/guard/cover/CanOpenCoverGuard.java create mode 100644 src/main/java/com/tuoheng/status/machine/guard/cover/IsCoverClosedGuard.java create mode 100644 src/main/java/com/tuoheng/status/machine/guard/cover/IsCoverOpenedGuard.java create mode 100644 src/main/java/com/tuoheng/status/machine/guard/debug/CanCloseDebugModeGuard.java create mode 100644 src/main/java/com/tuoheng/status/machine/guard/debug/IsDebugModeGuard.java create mode 100644 src/main/java/com/tuoheng/status/machine/guard/debug/IsNotDebugModeGuard.java create mode 100644 src/main/java/com/tuoheng/status/machine/guard/reboot/IsRebootCompletedGuard.java rename src/main/java/com/tuoheng/status/{airport => machine}/listener/DefaultAirportListener.java (92%) rename src/main/java/com/tuoheng/status/{airport => machine}/listener/DefaultCoverListener.java (93%) rename src/main/java/com/tuoheng/status/{airport => machine}/manager/AbstractAirportSystemManager.java (69%) rename src/main/java/com/tuoheng/status/{airport => machine}/manager/AirportSystemManager.java (79%) rename src/main/java/com/tuoheng/status/{airport => machine}/platform/PlatformType.java (95%) rename src/main/java/com/tuoheng/status/{airport => machine}/platform/factory/PlatformStrategyFactory.java (94%) rename src/main/java/com/tuoheng/status/{airport => machine}/platform/impl/dji/DjiAirportPlatformStrategy.java (82%) rename src/main/java/com/tuoheng/status/{airport => machine}/platform/impl/dji/DjiAirportSystemManager.java (89%) rename src/main/java/com/tuoheng/status/{airport => machine}/platform/impl/dji/DjiCoverPlatformStrategy.java (79%) rename src/main/java/com/tuoheng/status/{airport => machine}/platform/impl/dji/action/airport/DjiCloseDebugModeAction.java (70%) rename src/main/java/com/tuoheng/status/{airport => machine}/platform/impl/dji/action/airport/DjiOfflineAction.java (69%) rename src/main/java/com/tuoheng/status/{airport => machine}/platform/impl/dji/action/airport/DjiOnlineAction.java (72%) rename src/main/java/com/tuoheng/status/{airport => machine}/platform/impl/dji/action/airport/DjiOpenDebugModeAction.java (70%) rename src/main/java/com/tuoheng/status/{airport => machine}/platform/impl/dji/action/airport/DjiRebootAction.java (69%) rename src/main/java/com/tuoheng/status/{airport => machine}/platform/impl/dji/action/airport/DjiRebootCompletedAction.java (70%) rename src/main/java/com/tuoheng/status/{airport => machine}/platform/impl/dji/action/cover/DjiCloseCoverAction.java (69%) rename src/main/java/com/tuoheng/status/{airport => machine}/platform/impl/dji/action/cover/DjiCoverClosedAction.java (70%) rename src/main/java/com/tuoheng/status/{airport => machine}/platform/impl/dji/action/cover/DjiCoverErrorAction.java (70%) rename src/main/java/com/tuoheng/status/{airport => machine}/platform/impl/dji/action/cover/DjiCoverOpenedAction.java (70%) rename src/main/java/com/tuoheng/status/{airport => machine}/platform/impl/dji/action/cover/DjiCoverResetAction.java (70%) rename src/main/java/com/tuoheng/status/{airport => machine}/platform/impl/dji/action/cover/DjiOpenCoverAction.java (71%) rename src/main/java/com/tuoheng/status/{airport => machine}/platform/impl/dji/guard/airport/DjiCanCloseDebugModeGuard.java (67%) rename src/main/java/com/tuoheng/status/{airport => machine}/platform/impl/dji/guard/airport/DjiCanOfflineGuard.java (65%) rename src/main/java/com/tuoheng/status/{airport => machine}/platform/impl/dji/guard/airport/DjiCanOnlineGuard.java (75%) rename src/main/java/com/tuoheng/status/{airport => machine}/platform/impl/dji/guard/airport/DjiIsDebugModeGuard.java (65%) rename src/main/java/com/tuoheng/status/{airport => machine}/platform/impl/dji/guard/airport/DjiIsNotDebugModeGuard.java (66%) rename src/main/java/com/tuoheng/status/{airport => machine}/platform/impl/dji/guard/airport/DjiIsRebootCompletedGuard.java (66%) rename src/main/java/com/tuoheng/status/{airport => machine}/platform/impl/dji/guard/cover/DjiCanCloseCoverGuard.java (66%) rename src/main/java/com/tuoheng/status/{airport => machine}/platform/impl/dji/guard/cover/DjiCanOpenCoverGuard.java (66%) rename src/main/java/com/tuoheng/status/{airport => machine}/platform/impl/dji/guard/cover/DjiIsCoverClosedGuard.java (66%) rename src/main/java/com/tuoheng/status/{airport => machine}/platform/impl/dji/guard/cover/DjiIsCoverOpenedGuard.java (66%) rename src/main/java/com/tuoheng/status/{airport => machine}/platform/impl/dji/listener/DjiAirportListener.java (61%) rename src/main/java/com/tuoheng/status/{airport => machine}/platform/impl/dji/listener/DjiCoverListener.java (62%) rename src/main/java/com/tuoheng/status/{airport => machine}/platform/repository/AirportPlatformRepository.java (94%) rename src/main/java/com/tuoheng/status/{airport => machine}/platform/strategy/AirportPlatformStrategy.java (86%) rename src/main/java/com/tuoheng/status/{airport => machine}/platform/strategy/CoverPlatformStrategy.java (84%) rename src/main/java/com/tuoheng/status/{airport => machine}/platform/strategy/PlatformAction.java (88%) rename src/main/java/com/tuoheng/status/{airport => machine}/platform/strategy/PlatformGuard.java (88%) rename src/main/java/com/tuoheng/status/{airport => machine}/platform/strategy/PlatformListener.java (84%) rename src/main/java/com/tuoheng/status/{airport => machine}/service/AirportMachineService.java (97%) rename src/main/java/com/tuoheng/status/{airport => machine}/service/CoverMachineService.java (94%) rename src/main/java/com/tuoheng/status/{airport => machine}/status/AirportState.java (88%) rename src/main/java/com/tuoheng/status/{airport => machine}/status/CoverState.java (89%) create mode 100644 src/main/java/com/tuoheng/status/machine/status/DroneState.java diff --git a/MULTI_PLATFORM_ARCHITECTURE.md b/MULTI_PLATFORM_ARCHITECTURE.md index 7d91375..d0001fa 100644 --- a/MULTI_PLATFORM_ARCHITECTURE.md +++ b/MULTI_PLATFORM_ARCHITECTURE.md @@ -71,7 +71,7 @@ airport-004 -> YUNEEC ## 目录结构 ``` -com.tuoheng.status.airport +com.tuoheng.status.machine ├── platform │ ├── PlatformType.java # 平台类型枚举 │ ├── strategy # 策略接口 diff --git a/src/main/java/com/tuoheng/status/airport/action/airport/OfflineAction.java b/src/main/java/com/tuoheng/status/airport/action/airport/OfflineAction.java deleted file mode 100644 index 46d837b..0000000 --- a/src/main/java/com/tuoheng/status/airport/action/airport/OfflineAction.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.tuoheng.status.airport.action.airport; - -import com.tuoheng.status.airport.events.AirportEvent; -import com.tuoheng.status.airport.platform.strategy.PlatformAction; -import com.tuoheng.status.airport.status.AirportState; - -/** - * Base action for airport offline handling; platform implementations extend this. - */ -public abstract class OfflineAction implements PlatformAction { -} - diff --git a/src/main/java/com/tuoheng/status/airport/action/airport/OnlineAction.java b/src/main/java/com/tuoheng/status/airport/action/airport/OnlineAction.java deleted file mode 100644 index 681c572..0000000 --- a/src/main/java/com/tuoheng/status/airport/action/airport/OnlineAction.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.tuoheng.status.airport.action.airport; - -import com.tuoheng.status.airport.events.AirportEvent; -import com.tuoheng.status.airport.platform.strategy.PlatformAction; -import com.tuoheng.status.airport.status.AirportState; - -/** - * Base action for airport online handling; platform implementations extend this. - */ -public abstract class OnlineAction implements PlatformAction { -} - diff --git a/src/main/java/com/tuoheng/status/airport/action/cover/CloseCoverAction.java b/src/main/java/com/tuoheng/status/airport/action/cover/CloseCoverAction.java deleted file mode 100644 index 3bca989..0000000 --- a/src/main/java/com/tuoheng/status/airport/action/cover/CloseCoverAction.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.tuoheng.status.airport.action.cover; - -import com.tuoheng.status.airport.events.CoverEvent; -import com.tuoheng.status.airport.platform.strategy.PlatformAction; -import com.tuoheng.status.airport.status.CoverState; - -/** - * Base action for closing the cover; platform implementations extend this. - */ -public abstract class CloseCoverAction implements PlatformAction { -} - diff --git a/src/main/java/com/tuoheng/status/airport/action/cover/CoverClosedAction.java b/src/main/java/com/tuoheng/status/airport/action/cover/CoverClosedAction.java deleted file mode 100644 index b89224d..0000000 --- a/src/main/java/com/tuoheng/status/airport/action/cover/CoverClosedAction.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.tuoheng.status.airport.action.cover; - -import com.tuoheng.status.airport.events.CoverEvent; -import com.tuoheng.status.airport.platform.strategy.PlatformAction; -import com.tuoheng.status.airport.status.CoverState; - -/** - * Base action for cover-closed handling; platform implementations extend this. - */ -public abstract class CoverClosedAction implements PlatformAction { -} - diff --git a/src/main/java/com/tuoheng/status/airport/action/cover/CoverOpenedAction.java b/src/main/java/com/tuoheng/status/airport/action/cover/CoverOpenedAction.java deleted file mode 100644 index 53a6aac..0000000 --- a/src/main/java/com/tuoheng/status/airport/action/cover/CoverOpenedAction.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.tuoheng.status.airport.action.cover; - -import com.tuoheng.status.airport.events.CoverEvent; -import com.tuoheng.status.airport.platform.strategy.PlatformAction; -import com.tuoheng.status.airport.status.CoverState; - -/** - * Base action for cover-opened handling; platform implementations extend this. - */ -public abstract class CoverOpenedAction implements PlatformAction { -} - diff --git a/src/main/java/com/tuoheng/status/airport/action/cover/OpenCoverAction.java b/src/main/java/com/tuoheng/status/airport/action/cover/OpenCoverAction.java deleted file mode 100644 index 816efb5..0000000 --- a/src/main/java/com/tuoheng/status/airport/action/cover/OpenCoverAction.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.tuoheng.status.airport.action.cover; - -import com.tuoheng.status.airport.events.CoverEvent; -import com.tuoheng.status.airport.platform.strategy.PlatformAction; -import com.tuoheng.status.airport.status.CoverState; - -/** - * Base action for opening the cover; platform implementations extend this. - */ -public abstract class OpenCoverAction implements PlatformAction { -} - diff --git a/src/main/java/com/tuoheng/status/airport/action/debug/CloseDebugModeAction.java b/src/main/java/com/tuoheng/status/airport/action/debug/CloseDebugModeAction.java deleted file mode 100644 index cd53398..0000000 --- a/src/main/java/com/tuoheng/status/airport/action/debug/CloseDebugModeAction.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.tuoheng.status.airport.action.debug; - -import com.tuoheng.status.airport.events.AirportEvent; -import com.tuoheng.status.airport.platform.strategy.PlatformAction; -import com.tuoheng.status.airport.status.AirportState; - -/** - * Base action for closing debug mode; platform implementations extend this. - */ -public abstract class CloseDebugModeAction implements PlatformAction { -} - diff --git a/src/main/java/com/tuoheng/status/airport/action/debug/OpenDebugModeAction.java b/src/main/java/com/tuoheng/status/airport/action/debug/OpenDebugModeAction.java deleted file mode 100644 index d86baef..0000000 --- a/src/main/java/com/tuoheng/status/airport/action/debug/OpenDebugModeAction.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.tuoheng.status.airport.action.debug; - -import com.tuoheng.status.airport.events.AirportEvent; -import com.tuoheng.status.airport.platform.strategy.PlatformAction; -import com.tuoheng.status.airport.status.AirportState; - -/** - * Base action for opening debug mode; platform implementations extend this. - */ -public abstract class OpenDebugModeAction implements PlatformAction { -} - diff --git a/src/main/java/com/tuoheng/status/airport/action/reboot/RebootAction.java b/src/main/java/com/tuoheng/status/airport/action/reboot/RebootAction.java deleted file mode 100644 index 7a9e9ce..0000000 --- a/src/main/java/com/tuoheng/status/airport/action/reboot/RebootAction.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.tuoheng.status.airport.action.reboot; - -import com.tuoheng.status.airport.events.AirportEvent; -import com.tuoheng.status.airport.platform.strategy.PlatformAction; -import com.tuoheng.status.airport.status.AirportState; - -/** - * Base action for rebooting; platform implementations extend this. - */ -public abstract class RebootAction implements PlatformAction { -} - diff --git a/src/main/java/com/tuoheng/status/airport/action/reboot/RebootCompletedAction.java b/src/main/java/com/tuoheng/status/airport/action/reboot/RebootCompletedAction.java deleted file mode 100644 index 807d9ff..0000000 --- a/src/main/java/com/tuoheng/status/airport/action/reboot/RebootCompletedAction.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.tuoheng.status.airport.action.reboot; - -import com.tuoheng.status.airport.events.AirportEvent; -import com.tuoheng.status.airport.platform.strategy.PlatformAction; -import com.tuoheng.status.airport.status.AirportState; - -/** - * Base action for completing reboot; platform implementations extend this. - */ -public abstract class RebootCompletedAction implements PlatformAction { -} - diff --git a/src/main/java/com/tuoheng/status/airport/guard/airport/CanOfflineGuard.java b/src/main/java/com/tuoheng/status/airport/guard/airport/CanOfflineGuard.java deleted file mode 100644 index 0585be3..0000000 --- a/src/main/java/com/tuoheng/status/airport/guard/airport/CanOfflineGuard.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.tuoheng.status.airport.guard.airport; - -import com.tuoheng.status.airport.events.AirportEvent; -import com.tuoheng.status.airport.platform.strategy.PlatformGuard; -import com.tuoheng.status.airport.status.AirportState; - -/** - * Base guard for checking if an airport can go offline; platform implementations extend this. - */ -public abstract class CanOfflineGuard implements PlatformGuard { -} - diff --git a/src/main/java/com/tuoheng/status/airport/guard/airport/CanOnlineGuard.java b/src/main/java/com/tuoheng/status/airport/guard/airport/CanOnlineGuard.java deleted file mode 100644 index a6ab3fb..0000000 --- a/src/main/java/com/tuoheng/status/airport/guard/airport/CanOnlineGuard.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.tuoheng.status.airport.guard.airport; - -import com.tuoheng.status.airport.events.AirportEvent; -import com.tuoheng.status.airport.platform.strategy.PlatformGuard; -import com.tuoheng.status.airport.status.AirportState; - -/** - * Base guard for checking if an airport can go online; platform implementations extend this. - */ -public abstract class CanOnlineGuard implements PlatformGuard { -} - diff --git a/src/main/java/com/tuoheng/status/airport/guard/airport/IsAirportOnlineGuard.java b/src/main/java/com/tuoheng/status/airport/guard/airport/IsAirportOnlineGuard.java deleted file mode 100644 index 39ed05e..0000000 --- a/src/main/java/com/tuoheng/status/airport/guard/airport/IsAirportOnlineGuard.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.tuoheng.status.airport.guard.airport; - -import com.tuoheng.status.airport.events.AirportEvent; -import com.tuoheng.status.airport.platform.strategy.PlatformGuard; -import com.tuoheng.status.airport.status.AirportState; - -/** - * Base guard for checking airport online status; platform implementations extend this. - */ -public abstract class IsAirportOnlineGuard implements PlatformGuard { -} - diff --git a/src/main/java/com/tuoheng/status/airport/guard/cover/CanCloseCoverGuard.java b/src/main/java/com/tuoheng/status/airport/guard/cover/CanCloseCoverGuard.java deleted file mode 100644 index 1f29e13..0000000 --- a/src/main/java/com/tuoheng/status/airport/guard/cover/CanCloseCoverGuard.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.tuoheng.status.airport.guard.cover; - -import com.tuoheng.status.airport.events.CoverEvent; -import com.tuoheng.status.airport.platform.strategy.PlatformGuard; -import com.tuoheng.status.airport.status.CoverState; - -/** - * Base guard for closing the cover; platform implementations extend this. - */ -public abstract class CanCloseCoverGuard implements PlatformGuard { -} - diff --git a/src/main/java/com/tuoheng/status/airport/guard/cover/CanOpenCoverGuard.java b/src/main/java/com/tuoheng/status/airport/guard/cover/CanOpenCoverGuard.java deleted file mode 100644 index 357d44f..0000000 --- a/src/main/java/com/tuoheng/status/airport/guard/cover/CanOpenCoverGuard.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.tuoheng.status.airport.guard.cover; - -import com.tuoheng.status.airport.events.CoverEvent; -import com.tuoheng.status.airport.platform.strategy.PlatformGuard; -import com.tuoheng.status.airport.status.CoverState; - -/** - * Base guard for opening the cover; platform implementations extend this. - */ -public abstract class CanOpenCoverGuard implements PlatformGuard { -} - diff --git a/src/main/java/com/tuoheng/status/airport/guard/cover/IsCoverClosedGuard.java b/src/main/java/com/tuoheng/status/airport/guard/cover/IsCoverClosedGuard.java deleted file mode 100644 index b850984..0000000 --- a/src/main/java/com/tuoheng/status/airport/guard/cover/IsCoverClosedGuard.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.tuoheng.status.airport.guard.cover; - -import com.tuoheng.status.airport.events.CoverEvent; -import com.tuoheng.status.airport.platform.strategy.PlatformGuard; -import com.tuoheng.status.airport.status.CoverState; - -/** - * Base guard for verifying the cover is closed; platform implementations extend this. - */ -public abstract class IsCoverClosedGuard implements PlatformGuard { -} - diff --git a/src/main/java/com/tuoheng/status/airport/guard/cover/IsCoverOpenedGuard.java b/src/main/java/com/tuoheng/status/airport/guard/cover/IsCoverOpenedGuard.java deleted file mode 100644 index 22d6e9c..0000000 --- a/src/main/java/com/tuoheng/status/airport/guard/cover/IsCoverOpenedGuard.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.tuoheng.status.airport.guard.cover; - -import com.tuoheng.status.airport.events.CoverEvent; -import com.tuoheng.status.airport.platform.strategy.PlatformGuard; -import com.tuoheng.status.airport.status.CoverState; - -/** - * Base guard for verifying the cover is opened; platform implementations extend this. - */ -public abstract class IsCoverOpenedGuard implements PlatformGuard { -} - diff --git a/src/main/java/com/tuoheng/status/airport/guard/debug/CanCloseDebugModeGuard.java b/src/main/java/com/tuoheng/status/airport/guard/debug/CanCloseDebugModeGuard.java deleted file mode 100644 index 61ca62f..0000000 --- a/src/main/java/com/tuoheng/status/airport/guard/debug/CanCloseDebugModeGuard.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.tuoheng.status.airport.guard.debug; - -import com.tuoheng.status.airport.events.AirportEvent; -import com.tuoheng.status.airport.platform.strategy.PlatformGuard; -import com.tuoheng.status.airport.status.AirportState; - -/** - * Base guard for closing debug mode; platform implementations extend this. - */ -public abstract class CanCloseDebugModeGuard implements PlatformGuard { -} - diff --git a/src/main/java/com/tuoheng/status/airport/guard/debug/IsDebugModeGuard.java b/src/main/java/com/tuoheng/status/airport/guard/debug/IsDebugModeGuard.java deleted file mode 100644 index e6f4ebc..0000000 --- a/src/main/java/com/tuoheng/status/airport/guard/debug/IsDebugModeGuard.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.tuoheng.status.airport.guard.debug; - -import com.tuoheng.status.airport.events.AirportEvent; -import com.tuoheng.status.airport.platform.strategy.PlatformGuard; -import com.tuoheng.status.airport.status.AirportState; - -/** - * Base guard for checking debug mode; platform implementations extend this. - */ -public abstract class IsDebugModeGuard implements PlatformGuard { -} - diff --git a/src/main/java/com/tuoheng/status/airport/guard/debug/IsNotDebugModeGuard.java b/src/main/java/com/tuoheng/status/airport/guard/debug/IsNotDebugModeGuard.java deleted file mode 100644 index 9768fd3..0000000 --- a/src/main/java/com/tuoheng/status/airport/guard/debug/IsNotDebugModeGuard.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.tuoheng.status.airport.guard.debug; - -import com.tuoheng.status.airport.events.AirportEvent; -import com.tuoheng.status.airport.platform.strategy.PlatformGuard; -import com.tuoheng.status.airport.status.AirportState; - -/** - * Base guard for checking non-debug mode; platform implementations extend this. - */ -public abstract class IsNotDebugModeGuard implements PlatformGuard { -} - diff --git a/src/main/java/com/tuoheng/status/airport/guard/reboot/IsRebootCompletedGuard.java b/src/main/java/com/tuoheng/status/airport/guard/reboot/IsRebootCompletedGuard.java deleted file mode 100644 index d8e9da5..0000000 --- a/src/main/java/com/tuoheng/status/airport/guard/reboot/IsRebootCompletedGuard.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.tuoheng.status.airport.guard.reboot; - -import com.tuoheng.status.airport.events.AirportEvent; -import com.tuoheng.status.airport.platform.strategy.PlatformGuard; -import com.tuoheng.status.airport.status.AirportState; - -/** - * Base guard for verifying reboot completion; platform implementations extend this. - */ -public abstract class IsRebootCompletedGuard implements PlatformGuard { -} - diff --git a/src/main/java/com/tuoheng/status/airport/status/DroneState.java b/src/main/java/com/tuoheng/status/airport/status/DroneState.java deleted file mode 100644 index a357e9d..0000000 --- a/src/main/java/com/tuoheng/status/airport/status/DroneState.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.tuoheng.status.airport.status; - -public enum DroneState { -} diff --git a/src/main/java/com/tuoheng/status/machine/action/airport/OfflineAction.java b/src/main/java/com/tuoheng/status/machine/action/airport/OfflineAction.java new file mode 100644 index 0000000..2938037 --- /dev/null +++ b/src/main/java/com/tuoheng/status/machine/action/airport/OfflineAction.java @@ -0,0 +1,12 @@ +package com.tuoheng.status.machine.action.airport; + +import com.tuoheng.status.machine.events.AirportEvent; +import com.tuoheng.status.machine.platform.strategy.PlatformAction; +import com.tuoheng.status.machine.status.AirportState; + +/** + * Base action for machine offline handling; platform implementations extend this. + */ +public abstract class OfflineAction implements PlatformAction { +} + diff --git a/src/main/java/com/tuoheng/status/machine/action/airport/OnlineAction.java b/src/main/java/com/tuoheng/status/machine/action/airport/OnlineAction.java new file mode 100644 index 0000000..f84004c --- /dev/null +++ b/src/main/java/com/tuoheng/status/machine/action/airport/OnlineAction.java @@ -0,0 +1,12 @@ +package com.tuoheng.status.machine.action.airport; + +import com.tuoheng.status.machine.events.AirportEvent; +import com.tuoheng.status.machine.platform.strategy.PlatformAction; +import com.tuoheng.status.machine.status.AirportState; + +/** + * Base action for machine online handling; platform implementations extend this. + */ +public abstract class OnlineAction implements PlatformAction { +} + diff --git a/src/main/java/com/tuoheng/status/machine/action/cover/CloseCoverAction.java b/src/main/java/com/tuoheng/status/machine/action/cover/CloseCoverAction.java new file mode 100644 index 0000000..2b30ee2 --- /dev/null +++ b/src/main/java/com/tuoheng/status/machine/action/cover/CloseCoverAction.java @@ -0,0 +1,12 @@ +package com.tuoheng.status.machine.action.cover; + +import com.tuoheng.status.machine.events.CoverEvent; +import com.tuoheng.status.machine.platform.strategy.PlatformAction; +import com.tuoheng.status.machine.status.CoverState; + +/** + * Base action for closing the cover; platform implementations extend this. + */ +public abstract class CloseCoverAction implements PlatformAction { +} + diff --git a/src/main/java/com/tuoheng/status/machine/action/cover/CoverClosedAction.java b/src/main/java/com/tuoheng/status/machine/action/cover/CoverClosedAction.java new file mode 100644 index 0000000..59de7fc --- /dev/null +++ b/src/main/java/com/tuoheng/status/machine/action/cover/CoverClosedAction.java @@ -0,0 +1,12 @@ +package com.tuoheng.status.machine.action.cover; + +import com.tuoheng.status.machine.events.CoverEvent; +import com.tuoheng.status.machine.platform.strategy.PlatformAction; +import com.tuoheng.status.machine.status.CoverState; + +/** + * Base action for cover-closed handling; platform implementations extend this. + */ +public abstract class CoverClosedAction implements PlatformAction { +} + diff --git a/src/main/java/com/tuoheng/status/machine/action/cover/CoverOpenedAction.java b/src/main/java/com/tuoheng/status/machine/action/cover/CoverOpenedAction.java new file mode 100644 index 0000000..1baa2fc --- /dev/null +++ b/src/main/java/com/tuoheng/status/machine/action/cover/CoverOpenedAction.java @@ -0,0 +1,12 @@ +package com.tuoheng.status.machine.action.cover; + +import com.tuoheng.status.machine.events.CoverEvent; +import com.tuoheng.status.machine.platform.strategy.PlatformAction; +import com.tuoheng.status.machine.status.CoverState; + +/** + * Base action for cover-opened handling; platform implementations extend this. + */ +public abstract class CoverOpenedAction implements PlatformAction { +} + diff --git a/src/main/java/com/tuoheng/status/machine/action/cover/OpenCoverAction.java b/src/main/java/com/tuoheng/status/machine/action/cover/OpenCoverAction.java new file mode 100644 index 0000000..3234b7d --- /dev/null +++ b/src/main/java/com/tuoheng/status/machine/action/cover/OpenCoverAction.java @@ -0,0 +1,12 @@ +package com.tuoheng.status.machine.action.cover; + +import com.tuoheng.status.machine.events.CoverEvent; +import com.tuoheng.status.machine.platform.strategy.PlatformAction; +import com.tuoheng.status.machine.status.CoverState; + +/** + * Base action for opening the cover; platform implementations extend this. + */ +public abstract class OpenCoverAction implements PlatformAction { +} + diff --git a/src/main/java/com/tuoheng/status/machine/action/debug/CloseDebugModeAction.java b/src/main/java/com/tuoheng/status/machine/action/debug/CloseDebugModeAction.java new file mode 100644 index 0000000..e1d8eeb --- /dev/null +++ b/src/main/java/com/tuoheng/status/machine/action/debug/CloseDebugModeAction.java @@ -0,0 +1,12 @@ +package com.tuoheng.status.machine.action.debug; + +import com.tuoheng.status.machine.events.AirportEvent; +import com.tuoheng.status.machine.platform.strategy.PlatformAction; +import com.tuoheng.status.machine.status.AirportState; + +/** + * Base action for closing debug mode; platform implementations extend this. + */ +public abstract class CloseDebugModeAction implements PlatformAction { +} + diff --git a/src/main/java/com/tuoheng/status/machine/action/debug/OpenDebugModeAction.java b/src/main/java/com/tuoheng/status/machine/action/debug/OpenDebugModeAction.java new file mode 100644 index 0000000..25ab308 --- /dev/null +++ b/src/main/java/com/tuoheng/status/machine/action/debug/OpenDebugModeAction.java @@ -0,0 +1,12 @@ +package com.tuoheng.status.machine.action.debug; + +import com.tuoheng.status.machine.events.AirportEvent; +import com.tuoheng.status.machine.platform.strategy.PlatformAction; +import com.tuoheng.status.machine.status.AirportState; + +/** + * Base action for opening debug mode; platform implementations extend this. + */ +public abstract class OpenDebugModeAction implements PlatformAction { +} + diff --git a/src/main/java/com/tuoheng/status/machine/action/reboot/RebootAction.java b/src/main/java/com/tuoheng/status/machine/action/reboot/RebootAction.java new file mode 100644 index 0000000..59979fb --- /dev/null +++ b/src/main/java/com/tuoheng/status/machine/action/reboot/RebootAction.java @@ -0,0 +1,12 @@ +package com.tuoheng.status.machine.action.reboot; + +import com.tuoheng.status.machine.events.AirportEvent; +import com.tuoheng.status.machine.platform.strategy.PlatformAction; +import com.tuoheng.status.machine.status.AirportState; + +/** + * Base action for rebooting; platform implementations extend this. + */ +public abstract class RebootAction implements PlatformAction { +} + diff --git a/src/main/java/com/tuoheng/status/machine/action/reboot/RebootCompletedAction.java b/src/main/java/com/tuoheng/status/machine/action/reboot/RebootCompletedAction.java new file mode 100644 index 0000000..f505084 --- /dev/null +++ b/src/main/java/com/tuoheng/status/machine/action/reboot/RebootCompletedAction.java @@ -0,0 +1,12 @@ +package com.tuoheng.status.machine.action.reboot; + +import com.tuoheng.status.machine.events.AirportEvent; +import com.tuoheng.status.machine.platform.strategy.PlatformAction; +import com.tuoheng.status.machine.status.AirportState; + +/** + * Base action for completing reboot; platform implementations extend this. + */ +public abstract class RebootCompletedAction implements PlatformAction { +} + diff --git a/src/main/java/com/tuoheng/status/airport/config/AirportMachineConfig.java b/src/main/java/com/tuoheng/status/machine/config/AirportMachineConfig.java similarity index 95% rename from src/main/java/com/tuoheng/status/airport/config/AirportMachineConfig.java rename to src/main/java/com/tuoheng/status/machine/config/AirportMachineConfig.java index 414ce56..b0e8e8f 100644 --- a/src/main/java/com/tuoheng/status/airport/config/AirportMachineConfig.java +++ b/src/main/java/com/tuoheng/status/machine/config/AirportMachineConfig.java @@ -1,9 +1,9 @@ -package com.tuoheng.status.airport.config; +package com.tuoheng.status.machine.config; -import com.tuoheng.status.airport.events.AirportEvent; -import com.tuoheng.status.airport.platform.factory.PlatformStrategyFactory; -import com.tuoheng.status.airport.platform.strategy.AirportPlatformStrategy; -import com.tuoheng.status.airport.status.AirportState; +import com.tuoheng.status.machine.events.AirportEvent; +import com.tuoheng.status.machine.platform.factory.PlatformStrategyFactory; +import com.tuoheng.status.machine.platform.strategy.AirportPlatformStrategy; +import com.tuoheng.status.machine.status.AirportState; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/com/tuoheng/status/airport/config/CoverMachineConfig.java b/src/main/java/com/tuoheng/status/machine/config/CoverMachineConfig.java similarity index 94% rename from src/main/java/com/tuoheng/status/airport/config/CoverMachineConfig.java rename to src/main/java/com/tuoheng/status/machine/config/CoverMachineConfig.java index 0e56eff..a502edd 100644 --- a/src/main/java/com/tuoheng/status/airport/config/CoverMachineConfig.java +++ b/src/main/java/com/tuoheng/status/machine/config/CoverMachineConfig.java @@ -1,9 +1,9 @@ -package com.tuoheng.status.airport.config; +package com.tuoheng.status.machine.config; -import com.tuoheng.status.airport.events.CoverEvent; -import com.tuoheng.status.airport.platform.factory.PlatformStrategyFactory; -import com.tuoheng.status.airport.platform.strategy.CoverPlatformStrategy; -import com.tuoheng.status.airport.status.CoverState; +import com.tuoheng.status.machine.events.CoverEvent; +import com.tuoheng.status.machine.platform.factory.PlatformStrategyFactory; +import com.tuoheng.status.machine.platform.strategy.CoverPlatformStrategy; +import com.tuoheng.status.machine.status.CoverState; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/com/tuoheng/status/airport/demo/MultiPlatformDemo.java b/src/main/java/com/tuoheng/status/machine/demo/MultiPlatformDemo.java similarity index 93% rename from src/main/java/com/tuoheng/status/airport/demo/MultiPlatformDemo.java rename to src/main/java/com/tuoheng/status/machine/demo/MultiPlatformDemo.java index 373f16f..35de492 100644 --- a/src/main/java/com/tuoheng/status/airport/demo/MultiPlatformDemo.java +++ b/src/main/java/com/tuoheng/status/machine/demo/MultiPlatformDemo.java @@ -1,8 +1,8 @@ -package com.tuoheng.status.airport.demo; +package com.tuoheng.status.machine.demo; -import com.tuoheng.status.airport.manager.AirportSystemManager; -import com.tuoheng.status.airport.platform.factory.PlatformStrategyFactory; -import com.tuoheng.status.airport.platform.repository.AirportPlatformRepository; +import com.tuoheng.status.machine.manager.AirportSystemManager; +import com.tuoheng.status.machine.platform.factory.PlatformStrategyFactory; +import com.tuoheng.status.machine.platform.repository.AirportPlatformRepository; import org.springframework.context.annotation.AnnotationConfigApplicationContext; /** @@ -16,7 +16,7 @@ public class MultiPlatformDemo { AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(); // 扫描所有组件 - context.scan("com.tuoheng.status.airport"); + context.scan("com.tuoheng.status.machine"); context.refresh(); // 获取必要的Bean diff --git a/src/main/java/com/tuoheng/status/airport/events/AirportEvent.java b/src/main/java/com/tuoheng/status/machine/events/AirportEvent.java similarity index 95% rename from src/main/java/com/tuoheng/status/airport/events/AirportEvent.java rename to src/main/java/com/tuoheng/status/machine/events/AirportEvent.java index 77108f0..7d31db5 100644 --- a/src/main/java/com/tuoheng/status/airport/events/AirportEvent.java +++ b/src/main/java/com/tuoheng/status/machine/events/AirportEvent.java @@ -1,4 +1,4 @@ -package com.tuoheng.status.airport.events; +package com.tuoheng.status.machine.events; /** * 机巢事件枚举 diff --git a/src/main/java/com/tuoheng/status/airport/events/CoverEvent.java b/src/main/java/com/tuoheng/status/machine/events/CoverEvent.java similarity index 89% rename from src/main/java/com/tuoheng/status/airport/events/CoverEvent.java rename to src/main/java/com/tuoheng/status/machine/events/CoverEvent.java index f06ae13..0122ad1 100644 --- a/src/main/java/com/tuoheng/status/airport/events/CoverEvent.java +++ b/src/main/java/com/tuoheng/status/machine/events/CoverEvent.java @@ -1,4 +1,4 @@ -package com.tuoheng.status.airport.events; +package com.tuoheng.status.machine.events; /** * 舱门事件枚举 diff --git a/src/main/java/com/tuoheng/status/machine/guard/airport/CanOfflineGuard.java b/src/main/java/com/tuoheng/status/machine/guard/airport/CanOfflineGuard.java new file mode 100644 index 0000000..c533823 --- /dev/null +++ b/src/main/java/com/tuoheng/status/machine/guard/airport/CanOfflineGuard.java @@ -0,0 +1,12 @@ +package com.tuoheng.status.machine.guard.airport; + +import com.tuoheng.status.machine.events.AirportEvent; +import com.tuoheng.status.machine.platform.strategy.PlatformGuard; +import com.tuoheng.status.machine.status.AirportState; + +/** + * Base guard for checking if an machine can go offline; platform implementations extend this. + */ +public abstract class CanOfflineGuard implements PlatformGuard { +} + diff --git a/src/main/java/com/tuoheng/status/machine/guard/airport/CanOnlineGuard.java b/src/main/java/com/tuoheng/status/machine/guard/airport/CanOnlineGuard.java new file mode 100644 index 0000000..f84bbf3 --- /dev/null +++ b/src/main/java/com/tuoheng/status/machine/guard/airport/CanOnlineGuard.java @@ -0,0 +1,12 @@ +package com.tuoheng.status.machine.guard.airport; + +import com.tuoheng.status.machine.events.AirportEvent; +import com.tuoheng.status.machine.platform.strategy.PlatformGuard; +import com.tuoheng.status.machine.status.AirportState; + +/** + * Base guard for checking if an machine can go online; platform implementations extend this. + */ +public abstract class CanOnlineGuard implements PlatformGuard { +} + diff --git a/src/main/java/com/tuoheng/status/machine/guard/airport/IsAirportOnlineGuard.java b/src/main/java/com/tuoheng/status/machine/guard/airport/IsAirportOnlineGuard.java new file mode 100644 index 0000000..78461be --- /dev/null +++ b/src/main/java/com/tuoheng/status/machine/guard/airport/IsAirportOnlineGuard.java @@ -0,0 +1,12 @@ +package com.tuoheng.status.machine.guard.airport; + +import com.tuoheng.status.machine.events.AirportEvent; +import com.tuoheng.status.machine.platform.strategy.PlatformGuard; +import com.tuoheng.status.machine.status.AirportState; + +/** + * Base guard for checking machine online status; platform implementations extend this. + */ +public abstract class IsAirportOnlineGuard implements PlatformGuard { +} + diff --git a/src/main/java/com/tuoheng/status/machine/guard/cover/CanCloseCoverGuard.java b/src/main/java/com/tuoheng/status/machine/guard/cover/CanCloseCoverGuard.java new file mode 100644 index 0000000..4209de7 --- /dev/null +++ b/src/main/java/com/tuoheng/status/machine/guard/cover/CanCloseCoverGuard.java @@ -0,0 +1,12 @@ +package com.tuoheng.status.machine.guard.cover; + +import com.tuoheng.status.machine.events.CoverEvent; +import com.tuoheng.status.machine.platform.strategy.PlatformGuard; +import com.tuoheng.status.machine.status.CoverState; + +/** + * Base guard for closing the cover; platform implementations extend this. + */ +public abstract class CanCloseCoverGuard implements PlatformGuard { +} + diff --git a/src/main/java/com/tuoheng/status/machine/guard/cover/CanOpenCoverGuard.java b/src/main/java/com/tuoheng/status/machine/guard/cover/CanOpenCoverGuard.java new file mode 100644 index 0000000..fe2da5f --- /dev/null +++ b/src/main/java/com/tuoheng/status/machine/guard/cover/CanOpenCoverGuard.java @@ -0,0 +1,12 @@ +package com.tuoheng.status.machine.guard.cover; + +import com.tuoheng.status.machine.events.CoverEvent; +import com.tuoheng.status.machine.platform.strategy.PlatformGuard; +import com.tuoheng.status.machine.status.CoverState; + +/** + * Base guard for opening the cover; platform implementations extend this. + */ +public abstract class CanOpenCoverGuard implements PlatformGuard { +} + diff --git a/src/main/java/com/tuoheng/status/machine/guard/cover/IsCoverClosedGuard.java b/src/main/java/com/tuoheng/status/machine/guard/cover/IsCoverClosedGuard.java new file mode 100644 index 0000000..71cce62 --- /dev/null +++ b/src/main/java/com/tuoheng/status/machine/guard/cover/IsCoverClosedGuard.java @@ -0,0 +1,12 @@ +package com.tuoheng.status.machine.guard.cover; + +import com.tuoheng.status.machine.events.CoverEvent; +import com.tuoheng.status.machine.platform.strategy.PlatformGuard; +import com.tuoheng.status.machine.status.CoverState; + +/** + * Base guard for verifying the cover is closed; platform implementations extend this. + */ +public abstract class IsCoverClosedGuard implements PlatformGuard { +} + diff --git a/src/main/java/com/tuoheng/status/machine/guard/cover/IsCoverOpenedGuard.java b/src/main/java/com/tuoheng/status/machine/guard/cover/IsCoverOpenedGuard.java new file mode 100644 index 0000000..6e34440 --- /dev/null +++ b/src/main/java/com/tuoheng/status/machine/guard/cover/IsCoverOpenedGuard.java @@ -0,0 +1,12 @@ +package com.tuoheng.status.machine.guard.cover; + +import com.tuoheng.status.machine.events.CoverEvent; +import com.tuoheng.status.machine.platform.strategy.PlatformGuard; +import com.tuoheng.status.machine.status.CoverState; + +/** + * Base guard for verifying the cover is opened; platform implementations extend this. + */ +public abstract class IsCoverOpenedGuard implements PlatformGuard { +} + diff --git a/src/main/java/com/tuoheng/status/machine/guard/debug/CanCloseDebugModeGuard.java b/src/main/java/com/tuoheng/status/machine/guard/debug/CanCloseDebugModeGuard.java new file mode 100644 index 0000000..51d0f1f --- /dev/null +++ b/src/main/java/com/tuoheng/status/machine/guard/debug/CanCloseDebugModeGuard.java @@ -0,0 +1,12 @@ +package com.tuoheng.status.machine.guard.debug; + +import com.tuoheng.status.machine.events.AirportEvent; +import com.tuoheng.status.machine.platform.strategy.PlatformGuard; +import com.tuoheng.status.machine.status.AirportState; + +/** + * Base guard for closing debug mode; platform implementations extend this. + */ +public abstract class CanCloseDebugModeGuard implements PlatformGuard { +} + diff --git a/src/main/java/com/tuoheng/status/machine/guard/debug/IsDebugModeGuard.java b/src/main/java/com/tuoheng/status/machine/guard/debug/IsDebugModeGuard.java new file mode 100644 index 0000000..37419e4 --- /dev/null +++ b/src/main/java/com/tuoheng/status/machine/guard/debug/IsDebugModeGuard.java @@ -0,0 +1,12 @@ +package com.tuoheng.status.machine.guard.debug; + +import com.tuoheng.status.machine.events.AirportEvent; +import com.tuoheng.status.machine.platform.strategy.PlatformGuard; +import com.tuoheng.status.machine.status.AirportState; + +/** + * Base guard for checking debug mode; platform implementations extend this. + */ +public abstract class IsDebugModeGuard implements PlatformGuard { +} + diff --git a/src/main/java/com/tuoheng/status/machine/guard/debug/IsNotDebugModeGuard.java b/src/main/java/com/tuoheng/status/machine/guard/debug/IsNotDebugModeGuard.java new file mode 100644 index 0000000..f52f5ed --- /dev/null +++ b/src/main/java/com/tuoheng/status/machine/guard/debug/IsNotDebugModeGuard.java @@ -0,0 +1,12 @@ +package com.tuoheng.status.machine.guard.debug; + +import com.tuoheng.status.machine.events.AirportEvent; +import com.tuoheng.status.machine.platform.strategy.PlatformGuard; +import com.tuoheng.status.machine.status.AirportState; + +/** + * Base guard for checking non-debug mode; platform implementations extend this. + */ +public abstract class IsNotDebugModeGuard implements PlatformGuard { +} + diff --git a/src/main/java/com/tuoheng/status/machine/guard/reboot/IsRebootCompletedGuard.java b/src/main/java/com/tuoheng/status/machine/guard/reboot/IsRebootCompletedGuard.java new file mode 100644 index 0000000..1847d56 --- /dev/null +++ b/src/main/java/com/tuoheng/status/machine/guard/reboot/IsRebootCompletedGuard.java @@ -0,0 +1,12 @@ +package com.tuoheng.status.machine.guard.reboot; + +import com.tuoheng.status.machine.events.AirportEvent; +import com.tuoheng.status.machine.platform.strategy.PlatformGuard; +import com.tuoheng.status.machine.status.AirportState; + +/** + * Base guard for verifying reboot completion; platform implementations extend this. + */ +public abstract class IsRebootCompletedGuard implements PlatformGuard { +} + diff --git a/src/main/java/com/tuoheng/status/airport/listener/DefaultAirportListener.java b/src/main/java/com/tuoheng/status/machine/listener/DefaultAirportListener.java similarity index 92% rename from src/main/java/com/tuoheng/status/airport/listener/DefaultAirportListener.java rename to src/main/java/com/tuoheng/status/machine/listener/DefaultAirportListener.java index 78740e5..160ea20 100644 --- a/src/main/java/com/tuoheng/status/airport/listener/DefaultAirportListener.java +++ b/src/main/java/com/tuoheng/status/machine/listener/DefaultAirportListener.java @@ -1,14 +1,13 @@ -package com.tuoheng.status.airport.listener; +package com.tuoheng.status.machine.listener; -import com.tuoheng.status.airport.events.AirportEvent; -import com.tuoheng.status.airport.platform.strategy.PlatformListener; -import com.tuoheng.status.airport.status.AirportState; +import com.tuoheng.status.machine.events.AirportEvent; +import com.tuoheng.status.machine.platform.strategy.PlatformListener; +import com.tuoheng.status.machine.status.AirportState; import org.springframework.messaging.Message; import org.springframework.statemachine.StateContext; import org.springframework.statemachine.StateMachine; import org.springframework.statemachine.state.State; import org.springframework.statemachine.transition.Transition; -import org.springframework.stereotype.Component; /** * 默认机巢状态监听器 diff --git a/src/main/java/com/tuoheng/status/airport/listener/DefaultCoverListener.java b/src/main/java/com/tuoheng/status/machine/listener/DefaultCoverListener.java similarity index 93% rename from src/main/java/com/tuoheng/status/airport/listener/DefaultCoverListener.java rename to src/main/java/com/tuoheng/status/machine/listener/DefaultCoverListener.java index 0d2979b..bbe7e65 100644 --- a/src/main/java/com/tuoheng/status/airport/listener/DefaultCoverListener.java +++ b/src/main/java/com/tuoheng/status/machine/listener/DefaultCoverListener.java @@ -1,14 +1,13 @@ -package com.tuoheng.status.airport.listener; +package com.tuoheng.status.machine.listener; -import com.tuoheng.status.airport.events.CoverEvent; -import com.tuoheng.status.airport.platform.strategy.PlatformListener; -import com.tuoheng.status.airport.status.CoverState; +import com.tuoheng.status.machine.events.CoverEvent; +import com.tuoheng.status.machine.platform.strategy.PlatformListener; +import com.tuoheng.status.machine.status.CoverState; import org.springframework.messaging.Message; import org.springframework.statemachine.StateContext; import org.springframework.statemachine.StateMachine; import org.springframework.statemachine.state.State; import org.springframework.statemachine.transition.Transition; -import org.springframework.stereotype.Component; /** * 默认舱门状态监听器 diff --git a/src/main/java/com/tuoheng/status/airport/manager/AbstractAirportSystemManager.java b/src/main/java/com/tuoheng/status/machine/manager/AbstractAirportSystemManager.java similarity index 69% rename from src/main/java/com/tuoheng/status/airport/manager/AbstractAirportSystemManager.java rename to src/main/java/com/tuoheng/status/machine/manager/AbstractAirportSystemManager.java index b21e757..6ee0b6c 100644 --- a/src/main/java/com/tuoheng/status/airport/manager/AbstractAirportSystemManager.java +++ b/src/main/java/com/tuoheng/status/machine/manager/AbstractAirportSystemManager.java @@ -1,8 +1,8 @@ -package com.tuoheng.status.airport.manager; +package com.tuoheng.status.machine.manager; -import com.tuoheng.status.airport.platform.PlatformType; -import com.tuoheng.status.airport.service.AirportMachineService; -import com.tuoheng.status.airport.service.CoverMachineService; +import com.tuoheng.status.machine.platform.PlatformType; +import com.tuoheng.status.machine.service.AirportMachineService; +import com.tuoheng.status.machine.service.CoverMachineService; import org.springframework.beans.factory.annotation.Autowired; /** diff --git a/src/main/java/com/tuoheng/status/airport/manager/AirportSystemManager.java b/src/main/java/com/tuoheng/status/machine/manager/AirportSystemManager.java similarity index 79% rename from src/main/java/com/tuoheng/status/airport/manager/AirportSystemManager.java rename to src/main/java/com/tuoheng/status/machine/manager/AirportSystemManager.java index 625e682..2410666 100644 --- a/src/main/java/com/tuoheng/status/airport/manager/AirportSystemManager.java +++ b/src/main/java/com/tuoheng/status/machine/manager/AirportSystemManager.java @@ -1,8 +1,8 @@ -package com.tuoheng.status.airport.manager; +package com.tuoheng.status.machine.manager; -import com.tuoheng.status.airport.platform.PlatformType; -import com.tuoheng.status.airport.status.AirportState; -import com.tuoheng.status.airport.status.CoverState; +import com.tuoheng.status.machine.platform.PlatformType; +import com.tuoheng.status.machine.status.AirportState; +import com.tuoheng.status.machine.status.CoverState; /** * 机巢系统管理器接口 diff --git a/src/main/java/com/tuoheng/status/airport/platform/PlatformType.java b/src/main/java/com/tuoheng/status/machine/platform/PlatformType.java similarity index 95% rename from src/main/java/com/tuoheng/status/airport/platform/PlatformType.java rename to src/main/java/com/tuoheng/status/machine/platform/PlatformType.java index 5941ae4..f32e853 100644 --- a/src/main/java/com/tuoheng/status/airport/platform/PlatformType.java +++ b/src/main/java/com/tuoheng/status/machine/platform/PlatformType.java @@ -1,4 +1,4 @@ -package com.tuoheng.status.airport.platform; +package com.tuoheng.status.machine.platform; /** * 无人机平台类型枚举 diff --git a/src/main/java/com/tuoheng/status/airport/platform/factory/PlatformStrategyFactory.java b/src/main/java/com/tuoheng/status/machine/platform/factory/PlatformStrategyFactory.java similarity index 94% rename from src/main/java/com/tuoheng/status/airport/platform/factory/PlatformStrategyFactory.java rename to src/main/java/com/tuoheng/status/machine/platform/factory/PlatformStrategyFactory.java index 4a0e431..e4694ad 100644 --- a/src/main/java/com/tuoheng/status/airport/platform/factory/PlatformStrategyFactory.java +++ b/src/main/java/com/tuoheng/status/machine/platform/factory/PlatformStrategyFactory.java @@ -1,10 +1,10 @@ -package com.tuoheng.status.airport.platform.factory; +package com.tuoheng.status.machine.platform.factory; -import com.tuoheng.status.airport.manager.AirportSystemManager; -import com.tuoheng.status.airport.platform.PlatformType; -import com.tuoheng.status.airport.platform.repository.AirportPlatformRepository; -import com.tuoheng.status.airport.platform.strategy.AirportPlatformStrategy; -import com.tuoheng.status.airport.platform.strategy.CoverPlatformStrategy; +import com.tuoheng.status.machine.manager.AirportSystemManager; +import com.tuoheng.status.machine.platform.PlatformType; +import com.tuoheng.status.machine.platform.repository.AirportPlatformRepository; +import com.tuoheng.status.machine.platform.strategy.AirportPlatformStrategy; +import com.tuoheng.status.machine.platform.strategy.CoverPlatformStrategy; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/tuoheng/status/airport/platform/impl/dji/DjiAirportPlatformStrategy.java b/src/main/java/com/tuoheng/status/machine/platform/impl/dji/DjiAirportPlatformStrategy.java similarity index 82% rename from src/main/java/com/tuoheng/status/airport/platform/impl/dji/DjiAirportPlatformStrategy.java rename to src/main/java/com/tuoheng/status/machine/platform/impl/dji/DjiAirportPlatformStrategy.java index 26688a7..cd591a8 100644 --- a/src/main/java/com/tuoheng/status/airport/platform/impl/dji/DjiAirportPlatformStrategy.java +++ b/src/main/java/com/tuoheng/status/machine/platform/impl/dji/DjiAirportPlatformStrategy.java @@ -1,15 +1,15 @@ -package com.tuoheng.status.airport.platform.impl.dji; +package com.tuoheng.status.machine.platform.impl.dji; -import com.tuoheng.status.airport.events.AirportEvent; -import com.tuoheng.status.airport.platform.impl.dji.listener.DjiAirportListener; -import com.tuoheng.status.airport.platform.PlatformType; -import com.tuoheng.status.airport.platform.impl.dji.action.airport.*; -import com.tuoheng.status.airport.platform.impl.dji.guard.airport.*; -import com.tuoheng.status.airport.platform.strategy.AirportPlatformStrategy; -import com.tuoheng.status.airport.platform.strategy.PlatformAction; -import com.tuoheng.status.airport.platform.strategy.PlatformGuard; -import com.tuoheng.status.airport.platform.strategy.PlatformListener; -import com.tuoheng.status.airport.status.AirportState; +import com.tuoheng.status.machine.events.AirportEvent; +import com.tuoheng.status.machine.platform.impl.dji.listener.DjiAirportListener; +import com.tuoheng.status.machine.platform.PlatformType; +import com.tuoheng.status.machine.platform.impl.dji.action.airport.*; +import com.tuoheng.status.machine.platform.impl.dji.guard.airport.*; +import com.tuoheng.status.machine.platform.strategy.AirportPlatformStrategy; +import com.tuoheng.status.machine.platform.strategy.PlatformAction; +import com.tuoheng.status.machine.platform.strategy.PlatformGuard; +import com.tuoheng.status.machine.platform.strategy.PlatformListener; +import com.tuoheng.status.machine.status.AirportState; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/tuoheng/status/airport/platform/impl/dji/DjiAirportSystemManager.java b/src/main/java/com/tuoheng/status/machine/platform/impl/dji/DjiAirportSystemManager.java similarity index 89% rename from src/main/java/com/tuoheng/status/airport/platform/impl/dji/DjiAirportSystemManager.java rename to src/main/java/com/tuoheng/status/machine/platform/impl/dji/DjiAirportSystemManager.java index 3446229..6b61865 100644 --- a/src/main/java/com/tuoheng/status/airport/platform/impl/dji/DjiAirportSystemManager.java +++ b/src/main/java/com/tuoheng/status/machine/platform/impl/dji/DjiAirportSystemManager.java @@ -1,12 +1,12 @@ -package com.tuoheng.status.airport.platform.impl.dji; +package com.tuoheng.status.machine.platform.impl.dji; -import com.tuoheng.status.airport.events.AirportEvent; -import com.tuoheng.status.airport.events.CoverEvent; +import com.tuoheng.status.machine.events.AirportEvent; +import com.tuoheng.status.machine.events.CoverEvent; -import com.tuoheng.status.airport.manager.AbstractAirportSystemManager; -import com.tuoheng.status.airport.platform.PlatformType; -import com.tuoheng.status.airport.status.AirportState; -import com.tuoheng.status.airport.status.CoverState; +import com.tuoheng.status.machine.manager.AbstractAirportSystemManager; +import com.tuoheng.status.machine.platform.PlatformType; +import com.tuoheng.status.machine.status.AirportState; +import com.tuoheng.status.machine.status.CoverState; import org.springframework.stereotype.Component; /** diff --git a/src/main/java/com/tuoheng/status/airport/platform/impl/dji/DjiCoverPlatformStrategy.java b/src/main/java/com/tuoheng/status/machine/platform/impl/dji/DjiCoverPlatformStrategy.java similarity index 79% rename from src/main/java/com/tuoheng/status/airport/platform/impl/dji/DjiCoverPlatformStrategy.java rename to src/main/java/com/tuoheng/status/machine/platform/impl/dji/DjiCoverPlatformStrategy.java index 4194526..e9d2b6d 100644 --- a/src/main/java/com/tuoheng/status/airport/platform/impl/dji/DjiCoverPlatformStrategy.java +++ b/src/main/java/com/tuoheng/status/machine/platform/impl/dji/DjiCoverPlatformStrategy.java @@ -1,15 +1,15 @@ -package com.tuoheng.status.airport.platform.impl.dji; +package com.tuoheng.status.machine.platform.impl.dji; -import com.tuoheng.status.airport.events.CoverEvent; -import com.tuoheng.status.airport.platform.impl.dji.listener.DjiCoverListener; -import com.tuoheng.status.airport.platform.PlatformType; -import com.tuoheng.status.airport.platform.impl.dji.action.cover.*; -import com.tuoheng.status.airport.platform.impl.dji.guard.cover.*; -import com.tuoheng.status.airport.platform.strategy.CoverPlatformStrategy; -import com.tuoheng.status.airport.platform.strategy.PlatformAction; -import com.tuoheng.status.airport.platform.strategy.PlatformGuard; -import com.tuoheng.status.airport.platform.strategy.PlatformListener; -import com.tuoheng.status.airport.status.CoverState; +import com.tuoheng.status.machine.events.CoverEvent; +import com.tuoheng.status.machine.platform.impl.dji.listener.DjiCoverListener; +import com.tuoheng.status.machine.platform.PlatformType; +import com.tuoheng.status.machine.platform.impl.dji.action.cover.*; +import com.tuoheng.status.machine.platform.impl.dji.guard.cover.*; +import com.tuoheng.status.machine.platform.strategy.CoverPlatformStrategy; +import com.tuoheng.status.machine.platform.strategy.PlatformAction; +import com.tuoheng.status.machine.platform.strategy.PlatformGuard; +import com.tuoheng.status.machine.platform.strategy.PlatformListener; +import com.tuoheng.status.machine.status.CoverState; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/tuoheng/status/airport/platform/impl/dji/action/airport/DjiCloseDebugModeAction.java b/src/main/java/com/tuoheng/status/machine/platform/impl/dji/action/airport/DjiCloseDebugModeAction.java similarity index 70% rename from src/main/java/com/tuoheng/status/airport/platform/impl/dji/action/airport/DjiCloseDebugModeAction.java rename to src/main/java/com/tuoheng/status/machine/platform/impl/dji/action/airport/DjiCloseDebugModeAction.java index ca8d090..29769c6 100644 --- a/src/main/java/com/tuoheng/status/airport/platform/impl/dji/action/airport/DjiCloseDebugModeAction.java +++ b/src/main/java/com/tuoheng/status/machine/platform/impl/dji/action/airport/DjiCloseDebugModeAction.java @@ -1,8 +1,8 @@ -package com.tuoheng.status.airport.platform.impl.dji.action.airport; +package com.tuoheng.status.machine.platform.impl.dji.action.airport; -import com.tuoheng.status.airport.action.debug.CloseDebugModeAction; -import com.tuoheng.status.airport.events.AirportEvent; -import com.tuoheng.status.airport.status.AirportState; +import com.tuoheng.status.machine.action.debug.CloseDebugModeAction; +import com.tuoheng.status.machine.events.AirportEvent; +import com.tuoheng.status.machine.status.AirportState; import org.springframework.statemachine.StateContext; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/tuoheng/status/airport/platform/impl/dji/action/airport/DjiOfflineAction.java b/src/main/java/com/tuoheng/status/machine/platform/impl/dji/action/airport/DjiOfflineAction.java similarity index 69% rename from src/main/java/com/tuoheng/status/airport/platform/impl/dji/action/airport/DjiOfflineAction.java rename to src/main/java/com/tuoheng/status/machine/platform/impl/dji/action/airport/DjiOfflineAction.java index 0051436..f0683e6 100644 --- a/src/main/java/com/tuoheng/status/airport/platform/impl/dji/action/airport/DjiOfflineAction.java +++ b/src/main/java/com/tuoheng/status/machine/platform/impl/dji/action/airport/DjiOfflineAction.java @@ -1,8 +1,8 @@ -package com.tuoheng.status.airport.platform.impl.dji.action.airport; +package com.tuoheng.status.machine.platform.impl.dji.action.airport; -import com.tuoheng.status.airport.action.airport.OfflineAction; -import com.tuoheng.status.airport.events.AirportEvent; -import com.tuoheng.status.airport.status.AirportState; +import com.tuoheng.status.machine.action.airport.OfflineAction; +import com.tuoheng.status.machine.events.AirportEvent; +import com.tuoheng.status.machine.status.AirportState; import org.springframework.statemachine.StateContext; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/tuoheng/status/airport/platform/impl/dji/action/airport/DjiOnlineAction.java b/src/main/java/com/tuoheng/status/machine/platform/impl/dji/action/airport/DjiOnlineAction.java similarity index 72% rename from src/main/java/com/tuoheng/status/airport/platform/impl/dji/action/airport/DjiOnlineAction.java rename to src/main/java/com/tuoheng/status/machine/platform/impl/dji/action/airport/DjiOnlineAction.java index a7505f0..15e038b 100644 --- a/src/main/java/com/tuoheng/status/airport/platform/impl/dji/action/airport/DjiOnlineAction.java +++ b/src/main/java/com/tuoheng/status/machine/platform/impl/dji/action/airport/DjiOnlineAction.java @@ -1,8 +1,8 @@ -package com.tuoheng.status.airport.platform.impl.dji.action.airport; +package com.tuoheng.status.machine.platform.impl.dji.action.airport; -import com.tuoheng.status.airport.action.airport.OnlineAction; -import com.tuoheng.status.airport.events.AirportEvent; -import com.tuoheng.status.airport.status.AirportState; +import com.tuoheng.status.machine.action.airport.OnlineAction; +import com.tuoheng.status.machine.events.AirportEvent; +import com.tuoheng.status.machine.status.AirportState; import org.springframework.statemachine.StateContext; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/tuoheng/status/airport/platform/impl/dji/action/airport/DjiOpenDebugModeAction.java b/src/main/java/com/tuoheng/status/machine/platform/impl/dji/action/airport/DjiOpenDebugModeAction.java similarity index 70% rename from src/main/java/com/tuoheng/status/airport/platform/impl/dji/action/airport/DjiOpenDebugModeAction.java rename to src/main/java/com/tuoheng/status/machine/platform/impl/dji/action/airport/DjiOpenDebugModeAction.java index 78ec04f..00575e8 100644 --- a/src/main/java/com/tuoheng/status/airport/platform/impl/dji/action/airport/DjiOpenDebugModeAction.java +++ b/src/main/java/com/tuoheng/status/machine/platform/impl/dji/action/airport/DjiOpenDebugModeAction.java @@ -1,8 +1,8 @@ -package com.tuoheng.status.airport.platform.impl.dji.action.airport; +package com.tuoheng.status.machine.platform.impl.dji.action.airport; -import com.tuoheng.status.airport.action.debug.OpenDebugModeAction; -import com.tuoheng.status.airport.events.AirportEvent; -import com.tuoheng.status.airport.status.AirportState; +import com.tuoheng.status.machine.action.debug.OpenDebugModeAction; +import com.tuoheng.status.machine.events.AirportEvent; +import com.tuoheng.status.machine.status.AirportState; import org.springframework.statemachine.StateContext; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/tuoheng/status/airport/platform/impl/dji/action/airport/DjiRebootAction.java b/src/main/java/com/tuoheng/status/machine/platform/impl/dji/action/airport/DjiRebootAction.java similarity index 69% rename from src/main/java/com/tuoheng/status/airport/platform/impl/dji/action/airport/DjiRebootAction.java rename to src/main/java/com/tuoheng/status/machine/platform/impl/dji/action/airport/DjiRebootAction.java index 121990f..c9c17f8 100644 --- a/src/main/java/com/tuoheng/status/airport/platform/impl/dji/action/airport/DjiRebootAction.java +++ b/src/main/java/com/tuoheng/status/machine/platform/impl/dji/action/airport/DjiRebootAction.java @@ -1,8 +1,8 @@ -package com.tuoheng.status.airport.platform.impl.dji.action.airport; +package com.tuoheng.status.machine.platform.impl.dji.action.airport; -import com.tuoheng.status.airport.action.reboot.RebootAction; -import com.tuoheng.status.airport.events.AirportEvent; -import com.tuoheng.status.airport.status.AirportState; +import com.tuoheng.status.machine.action.reboot.RebootAction; +import com.tuoheng.status.machine.events.AirportEvent; +import com.tuoheng.status.machine.status.AirportState; import org.springframework.statemachine.StateContext; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/tuoheng/status/airport/platform/impl/dji/action/airport/DjiRebootCompletedAction.java b/src/main/java/com/tuoheng/status/machine/platform/impl/dji/action/airport/DjiRebootCompletedAction.java similarity index 70% rename from src/main/java/com/tuoheng/status/airport/platform/impl/dji/action/airport/DjiRebootCompletedAction.java rename to src/main/java/com/tuoheng/status/machine/platform/impl/dji/action/airport/DjiRebootCompletedAction.java index 05a37b9..de9c2ec 100644 --- a/src/main/java/com/tuoheng/status/airport/platform/impl/dji/action/airport/DjiRebootCompletedAction.java +++ b/src/main/java/com/tuoheng/status/machine/platform/impl/dji/action/airport/DjiRebootCompletedAction.java @@ -1,8 +1,8 @@ -package com.tuoheng.status.airport.platform.impl.dji.action.airport; +package com.tuoheng.status.machine.platform.impl.dji.action.airport; -import com.tuoheng.status.airport.action.reboot.RebootCompletedAction; -import com.tuoheng.status.airport.events.AirportEvent; -import com.tuoheng.status.airport.status.AirportState; +import com.tuoheng.status.machine.action.reboot.RebootCompletedAction; +import com.tuoheng.status.machine.events.AirportEvent; +import com.tuoheng.status.machine.status.AirportState; import org.springframework.statemachine.StateContext; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/tuoheng/status/airport/platform/impl/dji/action/cover/DjiCloseCoverAction.java b/src/main/java/com/tuoheng/status/machine/platform/impl/dji/action/cover/DjiCloseCoverAction.java similarity index 69% rename from src/main/java/com/tuoheng/status/airport/platform/impl/dji/action/cover/DjiCloseCoverAction.java rename to src/main/java/com/tuoheng/status/machine/platform/impl/dji/action/cover/DjiCloseCoverAction.java index 5c03270..b7571b3 100644 --- a/src/main/java/com/tuoheng/status/airport/platform/impl/dji/action/cover/DjiCloseCoverAction.java +++ b/src/main/java/com/tuoheng/status/machine/platform/impl/dji/action/cover/DjiCloseCoverAction.java @@ -1,8 +1,8 @@ -package com.tuoheng.status.airport.platform.impl.dji.action.cover; +package com.tuoheng.status.machine.platform.impl.dji.action.cover; -import com.tuoheng.status.airport.action.cover.CloseCoverAction; -import com.tuoheng.status.airport.events.CoverEvent; -import com.tuoheng.status.airport.status.CoverState; +import com.tuoheng.status.machine.action.cover.CloseCoverAction; +import com.tuoheng.status.machine.events.CoverEvent; +import com.tuoheng.status.machine.status.CoverState; import org.springframework.statemachine.StateContext; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/tuoheng/status/airport/platform/impl/dji/action/cover/DjiCoverClosedAction.java b/src/main/java/com/tuoheng/status/machine/platform/impl/dji/action/cover/DjiCoverClosedAction.java similarity index 70% rename from src/main/java/com/tuoheng/status/airport/platform/impl/dji/action/cover/DjiCoverClosedAction.java rename to src/main/java/com/tuoheng/status/machine/platform/impl/dji/action/cover/DjiCoverClosedAction.java index befd1f6..28cd7d4 100644 --- a/src/main/java/com/tuoheng/status/airport/platform/impl/dji/action/cover/DjiCoverClosedAction.java +++ b/src/main/java/com/tuoheng/status/machine/platform/impl/dji/action/cover/DjiCoverClosedAction.java @@ -1,8 +1,8 @@ -package com.tuoheng.status.airport.platform.impl.dji.action.cover; +package com.tuoheng.status.machine.platform.impl.dji.action.cover; -import com.tuoheng.status.airport.action.cover.CoverClosedAction; -import com.tuoheng.status.airport.events.CoverEvent; -import com.tuoheng.status.airport.status.CoverState; +import com.tuoheng.status.machine.action.cover.CoverClosedAction; +import com.tuoheng.status.machine.events.CoverEvent; +import com.tuoheng.status.machine.status.CoverState; import org.springframework.statemachine.StateContext; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/tuoheng/status/airport/platform/impl/dji/action/cover/DjiCoverErrorAction.java b/src/main/java/com/tuoheng/status/machine/platform/impl/dji/action/cover/DjiCoverErrorAction.java similarity index 70% rename from src/main/java/com/tuoheng/status/airport/platform/impl/dji/action/cover/DjiCoverErrorAction.java rename to src/main/java/com/tuoheng/status/machine/platform/impl/dji/action/cover/DjiCoverErrorAction.java index 3de1c98..e20c56f 100644 --- a/src/main/java/com/tuoheng/status/airport/platform/impl/dji/action/cover/DjiCoverErrorAction.java +++ b/src/main/java/com/tuoheng/status/machine/platform/impl/dji/action/cover/DjiCoverErrorAction.java @@ -1,8 +1,8 @@ -package com.tuoheng.status.airport.platform.impl.dji.action.cover; +package com.tuoheng.status.machine.platform.impl.dji.action.cover; -import com.tuoheng.status.airport.events.CoverEvent; -import com.tuoheng.status.airport.platform.strategy.PlatformAction; -import com.tuoheng.status.airport.status.CoverState; +import com.tuoheng.status.machine.events.CoverEvent; +import com.tuoheng.status.machine.platform.strategy.PlatformAction; +import com.tuoheng.status.machine.status.CoverState; import org.springframework.statemachine.StateContext; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/tuoheng/status/airport/platform/impl/dji/action/cover/DjiCoverOpenedAction.java b/src/main/java/com/tuoheng/status/machine/platform/impl/dji/action/cover/DjiCoverOpenedAction.java similarity index 70% rename from src/main/java/com/tuoheng/status/airport/platform/impl/dji/action/cover/DjiCoverOpenedAction.java rename to src/main/java/com/tuoheng/status/machine/platform/impl/dji/action/cover/DjiCoverOpenedAction.java index 2e408a2..37f4010 100644 --- a/src/main/java/com/tuoheng/status/airport/platform/impl/dji/action/cover/DjiCoverOpenedAction.java +++ b/src/main/java/com/tuoheng/status/machine/platform/impl/dji/action/cover/DjiCoverOpenedAction.java @@ -1,8 +1,8 @@ -package com.tuoheng.status.airport.platform.impl.dji.action.cover; +package com.tuoheng.status.machine.platform.impl.dji.action.cover; -import com.tuoheng.status.airport.action.cover.CoverOpenedAction; -import com.tuoheng.status.airport.events.CoverEvent; -import com.tuoheng.status.airport.status.CoverState; +import com.tuoheng.status.machine.action.cover.CoverOpenedAction; +import com.tuoheng.status.machine.events.CoverEvent; +import com.tuoheng.status.machine.status.CoverState; import org.springframework.statemachine.StateContext; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/tuoheng/status/airport/platform/impl/dji/action/cover/DjiCoverResetAction.java b/src/main/java/com/tuoheng/status/machine/platform/impl/dji/action/cover/DjiCoverResetAction.java similarity index 70% rename from src/main/java/com/tuoheng/status/airport/platform/impl/dji/action/cover/DjiCoverResetAction.java rename to src/main/java/com/tuoheng/status/machine/platform/impl/dji/action/cover/DjiCoverResetAction.java index 330b10b..8fabe01 100644 --- a/src/main/java/com/tuoheng/status/airport/platform/impl/dji/action/cover/DjiCoverResetAction.java +++ b/src/main/java/com/tuoheng/status/machine/platform/impl/dji/action/cover/DjiCoverResetAction.java @@ -1,8 +1,8 @@ -package com.tuoheng.status.airport.platform.impl.dji.action.cover; +package com.tuoheng.status.machine.platform.impl.dji.action.cover; -import com.tuoheng.status.airport.events.CoverEvent; -import com.tuoheng.status.airport.platform.strategy.PlatformAction; -import com.tuoheng.status.airport.status.CoverState; +import com.tuoheng.status.machine.events.CoverEvent; +import com.tuoheng.status.machine.platform.strategy.PlatformAction; +import com.tuoheng.status.machine.status.CoverState; import org.springframework.statemachine.StateContext; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/tuoheng/status/airport/platform/impl/dji/action/cover/DjiOpenCoverAction.java b/src/main/java/com/tuoheng/status/machine/platform/impl/dji/action/cover/DjiOpenCoverAction.java similarity index 71% rename from src/main/java/com/tuoheng/status/airport/platform/impl/dji/action/cover/DjiOpenCoverAction.java rename to src/main/java/com/tuoheng/status/machine/platform/impl/dji/action/cover/DjiOpenCoverAction.java index 851cf25..fb378fe 100644 --- a/src/main/java/com/tuoheng/status/airport/platform/impl/dji/action/cover/DjiOpenCoverAction.java +++ b/src/main/java/com/tuoheng/status/machine/platform/impl/dji/action/cover/DjiOpenCoverAction.java @@ -1,8 +1,8 @@ -package com.tuoheng.status.airport.platform.impl.dji.action.cover; +package com.tuoheng.status.machine.platform.impl.dji.action.cover; -import com.tuoheng.status.airport.action.cover.OpenCoverAction; -import com.tuoheng.status.airport.events.CoverEvent; -import com.tuoheng.status.airport.status.CoverState; +import com.tuoheng.status.machine.action.cover.OpenCoverAction; +import com.tuoheng.status.machine.events.CoverEvent; +import com.tuoheng.status.machine.status.CoverState; import org.springframework.statemachine.StateContext; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/tuoheng/status/airport/platform/impl/dji/guard/airport/DjiCanCloseDebugModeGuard.java b/src/main/java/com/tuoheng/status/machine/platform/impl/dji/guard/airport/DjiCanCloseDebugModeGuard.java similarity index 67% rename from src/main/java/com/tuoheng/status/airport/platform/impl/dji/guard/airport/DjiCanCloseDebugModeGuard.java rename to src/main/java/com/tuoheng/status/machine/platform/impl/dji/guard/airport/DjiCanCloseDebugModeGuard.java index 4dc2835..ef9a12c 100644 --- a/src/main/java/com/tuoheng/status/airport/platform/impl/dji/guard/airport/DjiCanCloseDebugModeGuard.java +++ b/src/main/java/com/tuoheng/status/machine/platform/impl/dji/guard/airport/DjiCanCloseDebugModeGuard.java @@ -1,8 +1,8 @@ -package com.tuoheng.status.airport.platform.impl.dji.guard.airport; +package com.tuoheng.status.machine.platform.impl.dji.guard.airport; -import com.tuoheng.status.airport.guard.debug.CanCloseDebugModeGuard; -import com.tuoheng.status.airport.events.AirportEvent; -import com.tuoheng.status.airport.status.AirportState; +import com.tuoheng.status.machine.guard.debug.CanCloseDebugModeGuard; +import com.tuoheng.status.machine.events.AirportEvent; +import com.tuoheng.status.machine.status.AirportState; import org.springframework.statemachine.StateContext; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/tuoheng/status/airport/platform/impl/dji/guard/airport/DjiCanOfflineGuard.java b/src/main/java/com/tuoheng/status/machine/platform/impl/dji/guard/airport/DjiCanOfflineGuard.java similarity index 65% rename from src/main/java/com/tuoheng/status/airport/platform/impl/dji/guard/airport/DjiCanOfflineGuard.java rename to src/main/java/com/tuoheng/status/machine/platform/impl/dji/guard/airport/DjiCanOfflineGuard.java index 5706493..7a66025 100644 --- a/src/main/java/com/tuoheng/status/airport/platform/impl/dji/guard/airport/DjiCanOfflineGuard.java +++ b/src/main/java/com/tuoheng/status/machine/platform/impl/dji/guard/airport/DjiCanOfflineGuard.java @@ -1,8 +1,8 @@ -package com.tuoheng.status.airport.platform.impl.dji.guard.airport; +package com.tuoheng.status.machine.platform.impl.dji.guard.airport; -import com.tuoheng.status.airport.guard.airport.CanOfflineGuard; -import com.tuoheng.status.airport.events.AirportEvent; -import com.tuoheng.status.airport.status.AirportState; +import com.tuoheng.status.machine.guard.airport.CanOfflineGuard; +import com.tuoheng.status.machine.events.AirportEvent; +import com.tuoheng.status.machine.status.AirportState; import org.springframework.statemachine.StateContext; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/tuoheng/status/airport/platform/impl/dji/guard/airport/DjiCanOnlineGuard.java b/src/main/java/com/tuoheng/status/machine/platform/impl/dji/guard/airport/DjiCanOnlineGuard.java similarity index 75% rename from src/main/java/com/tuoheng/status/airport/platform/impl/dji/guard/airport/DjiCanOnlineGuard.java rename to src/main/java/com/tuoheng/status/machine/platform/impl/dji/guard/airport/DjiCanOnlineGuard.java index 2abb0d2..e4e3e4b 100644 --- a/src/main/java/com/tuoheng/status/airport/platform/impl/dji/guard/airport/DjiCanOnlineGuard.java +++ b/src/main/java/com/tuoheng/status/machine/platform/impl/dji/guard/airport/DjiCanOnlineGuard.java @@ -1,8 +1,8 @@ -package com.tuoheng.status.airport.platform.impl.dji.guard.airport; +package com.tuoheng.status.machine.platform.impl.dji.guard.airport; -import com.tuoheng.status.airport.guard.airport.CanOnlineGuard; -import com.tuoheng.status.airport.events.AirportEvent; -import com.tuoheng.status.airport.status.AirportState; +import com.tuoheng.status.machine.guard.airport.CanOnlineGuard; +import com.tuoheng.status.machine.events.AirportEvent; +import com.tuoheng.status.machine.status.AirportState; import org.springframework.statemachine.StateContext; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/tuoheng/status/airport/platform/impl/dji/guard/airport/DjiIsDebugModeGuard.java b/src/main/java/com/tuoheng/status/machine/platform/impl/dji/guard/airport/DjiIsDebugModeGuard.java similarity index 65% rename from src/main/java/com/tuoheng/status/airport/platform/impl/dji/guard/airport/DjiIsDebugModeGuard.java rename to src/main/java/com/tuoheng/status/machine/platform/impl/dji/guard/airport/DjiIsDebugModeGuard.java index ec0430a..bde39c8 100644 --- a/src/main/java/com/tuoheng/status/airport/platform/impl/dji/guard/airport/DjiIsDebugModeGuard.java +++ b/src/main/java/com/tuoheng/status/machine/platform/impl/dji/guard/airport/DjiIsDebugModeGuard.java @@ -1,8 +1,8 @@ -package com.tuoheng.status.airport.platform.impl.dji.guard.airport; +package com.tuoheng.status.machine.platform.impl.dji.guard.airport; -import com.tuoheng.status.airport.guard.debug.IsDebugModeGuard; -import com.tuoheng.status.airport.events.AirportEvent; -import com.tuoheng.status.airport.status.AirportState; +import com.tuoheng.status.machine.guard.debug.IsDebugModeGuard; +import com.tuoheng.status.machine.events.AirportEvent; +import com.tuoheng.status.machine.status.AirportState; import org.springframework.statemachine.StateContext; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/tuoheng/status/airport/platform/impl/dji/guard/airport/DjiIsNotDebugModeGuard.java b/src/main/java/com/tuoheng/status/machine/platform/impl/dji/guard/airport/DjiIsNotDebugModeGuard.java similarity index 66% rename from src/main/java/com/tuoheng/status/airport/platform/impl/dji/guard/airport/DjiIsNotDebugModeGuard.java rename to src/main/java/com/tuoheng/status/machine/platform/impl/dji/guard/airport/DjiIsNotDebugModeGuard.java index 13edde7..fd59e38 100644 --- a/src/main/java/com/tuoheng/status/airport/platform/impl/dji/guard/airport/DjiIsNotDebugModeGuard.java +++ b/src/main/java/com/tuoheng/status/machine/platform/impl/dji/guard/airport/DjiIsNotDebugModeGuard.java @@ -1,8 +1,8 @@ -package com.tuoheng.status.airport.platform.impl.dji.guard.airport; +package com.tuoheng.status.machine.platform.impl.dji.guard.airport; -import com.tuoheng.status.airport.guard.debug.IsNotDebugModeGuard; -import com.tuoheng.status.airport.events.AirportEvent; -import com.tuoheng.status.airport.status.AirportState; +import com.tuoheng.status.machine.guard.debug.IsNotDebugModeGuard; +import com.tuoheng.status.machine.events.AirportEvent; +import com.tuoheng.status.machine.status.AirportState; import org.springframework.statemachine.StateContext; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/tuoheng/status/airport/platform/impl/dji/guard/airport/DjiIsRebootCompletedGuard.java b/src/main/java/com/tuoheng/status/machine/platform/impl/dji/guard/airport/DjiIsRebootCompletedGuard.java similarity index 66% rename from src/main/java/com/tuoheng/status/airport/platform/impl/dji/guard/airport/DjiIsRebootCompletedGuard.java rename to src/main/java/com/tuoheng/status/machine/platform/impl/dji/guard/airport/DjiIsRebootCompletedGuard.java index cfc77ba..939e2d1 100644 --- a/src/main/java/com/tuoheng/status/airport/platform/impl/dji/guard/airport/DjiIsRebootCompletedGuard.java +++ b/src/main/java/com/tuoheng/status/machine/platform/impl/dji/guard/airport/DjiIsRebootCompletedGuard.java @@ -1,8 +1,8 @@ -package com.tuoheng.status.airport.platform.impl.dji.guard.airport; +package com.tuoheng.status.machine.platform.impl.dji.guard.airport; -import com.tuoheng.status.airport.guard.reboot.IsRebootCompletedGuard; -import com.tuoheng.status.airport.events.AirportEvent; -import com.tuoheng.status.airport.status.AirportState; +import com.tuoheng.status.machine.guard.reboot.IsRebootCompletedGuard; +import com.tuoheng.status.machine.events.AirportEvent; +import com.tuoheng.status.machine.status.AirportState; import org.springframework.statemachine.StateContext; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/tuoheng/status/airport/platform/impl/dji/guard/cover/DjiCanCloseCoverGuard.java b/src/main/java/com/tuoheng/status/machine/platform/impl/dji/guard/cover/DjiCanCloseCoverGuard.java similarity index 66% rename from src/main/java/com/tuoheng/status/airport/platform/impl/dji/guard/cover/DjiCanCloseCoverGuard.java rename to src/main/java/com/tuoheng/status/machine/platform/impl/dji/guard/cover/DjiCanCloseCoverGuard.java index f6ff011..70ff1d6 100644 --- a/src/main/java/com/tuoheng/status/airport/platform/impl/dji/guard/cover/DjiCanCloseCoverGuard.java +++ b/src/main/java/com/tuoheng/status/machine/platform/impl/dji/guard/cover/DjiCanCloseCoverGuard.java @@ -1,8 +1,8 @@ -package com.tuoheng.status.airport.platform.impl.dji.guard.cover; +package com.tuoheng.status.machine.platform.impl.dji.guard.cover; -import com.tuoheng.status.airport.guard.cover.CanCloseCoverGuard; -import com.tuoheng.status.airport.events.CoverEvent; -import com.tuoheng.status.airport.status.CoverState; +import com.tuoheng.status.machine.guard.cover.CanCloseCoverGuard; +import com.tuoheng.status.machine.events.CoverEvent; +import com.tuoheng.status.machine.status.CoverState; import org.springframework.statemachine.StateContext; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/tuoheng/status/airport/platform/impl/dji/guard/cover/DjiCanOpenCoverGuard.java b/src/main/java/com/tuoheng/status/machine/platform/impl/dji/guard/cover/DjiCanOpenCoverGuard.java similarity index 66% rename from src/main/java/com/tuoheng/status/airport/platform/impl/dji/guard/cover/DjiCanOpenCoverGuard.java rename to src/main/java/com/tuoheng/status/machine/platform/impl/dji/guard/cover/DjiCanOpenCoverGuard.java index 3e36215..9f41939 100644 --- a/src/main/java/com/tuoheng/status/airport/platform/impl/dji/guard/cover/DjiCanOpenCoverGuard.java +++ b/src/main/java/com/tuoheng/status/machine/platform/impl/dji/guard/cover/DjiCanOpenCoverGuard.java @@ -1,8 +1,8 @@ -package com.tuoheng.status.airport.platform.impl.dji.guard.cover; +package com.tuoheng.status.machine.platform.impl.dji.guard.cover; -import com.tuoheng.status.airport.guard.cover.CanOpenCoverGuard; -import com.tuoheng.status.airport.events.CoverEvent; -import com.tuoheng.status.airport.status.CoverState; +import com.tuoheng.status.machine.guard.cover.CanOpenCoverGuard; +import com.tuoheng.status.machine.events.CoverEvent; +import com.tuoheng.status.machine.status.CoverState; import org.springframework.statemachine.StateContext; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/tuoheng/status/airport/platform/impl/dji/guard/cover/DjiIsCoverClosedGuard.java b/src/main/java/com/tuoheng/status/machine/platform/impl/dji/guard/cover/DjiIsCoverClosedGuard.java similarity index 66% rename from src/main/java/com/tuoheng/status/airport/platform/impl/dji/guard/cover/DjiIsCoverClosedGuard.java rename to src/main/java/com/tuoheng/status/machine/platform/impl/dji/guard/cover/DjiIsCoverClosedGuard.java index 8670cfc..3a5e268 100644 --- a/src/main/java/com/tuoheng/status/airport/platform/impl/dji/guard/cover/DjiIsCoverClosedGuard.java +++ b/src/main/java/com/tuoheng/status/machine/platform/impl/dji/guard/cover/DjiIsCoverClosedGuard.java @@ -1,8 +1,8 @@ -package com.tuoheng.status.airport.platform.impl.dji.guard.cover; +package com.tuoheng.status.machine.platform.impl.dji.guard.cover; -import com.tuoheng.status.airport.guard.cover.IsCoverClosedGuard; -import com.tuoheng.status.airport.events.CoverEvent; -import com.tuoheng.status.airport.status.CoverState; +import com.tuoheng.status.machine.guard.cover.IsCoverClosedGuard; +import com.tuoheng.status.machine.events.CoverEvent; +import com.tuoheng.status.machine.status.CoverState; import org.springframework.statemachine.StateContext; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/tuoheng/status/airport/platform/impl/dji/guard/cover/DjiIsCoverOpenedGuard.java b/src/main/java/com/tuoheng/status/machine/platform/impl/dji/guard/cover/DjiIsCoverOpenedGuard.java similarity index 66% rename from src/main/java/com/tuoheng/status/airport/platform/impl/dji/guard/cover/DjiIsCoverOpenedGuard.java rename to src/main/java/com/tuoheng/status/machine/platform/impl/dji/guard/cover/DjiIsCoverOpenedGuard.java index d78d206..6fe4eac 100644 --- a/src/main/java/com/tuoheng/status/airport/platform/impl/dji/guard/cover/DjiIsCoverOpenedGuard.java +++ b/src/main/java/com/tuoheng/status/machine/platform/impl/dji/guard/cover/DjiIsCoverOpenedGuard.java @@ -1,8 +1,8 @@ -package com.tuoheng.status.airport.platform.impl.dji.guard.cover; +package com.tuoheng.status.machine.platform.impl.dji.guard.cover; -import com.tuoheng.status.airport.guard.cover.IsCoverOpenedGuard; -import com.tuoheng.status.airport.events.CoverEvent; -import com.tuoheng.status.airport.status.CoverState; +import com.tuoheng.status.machine.guard.cover.IsCoverOpenedGuard; +import com.tuoheng.status.machine.events.CoverEvent; +import com.tuoheng.status.machine.status.CoverState; import org.springframework.statemachine.StateContext; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/tuoheng/status/airport/platform/impl/dji/listener/DjiAirportListener.java b/src/main/java/com/tuoheng/status/machine/platform/impl/dji/listener/DjiAirportListener.java similarity index 61% rename from src/main/java/com/tuoheng/status/airport/platform/impl/dji/listener/DjiAirportListener.java rename to src/main/java/com/tuoheng/status/machine/platform/impl/dji/listener/DjiAirportListener.java index cc73abb..a7a94ab 100644 --- a/src/main/java/com/tuoheng/status/airport/platform/impl/dji/listener/DjiAirportListener.java +++ b/src/main/java/com/tuoheng/status/machine/platform/impl/dji/listener/DjiAirportListener.java @@ -1,6 +1,6 @@ -package com.tuoheng.status.airport.platform.impl.dji.listener; +package com.tuoheng.status.machine.platform.impl.dji.listener; -import com.tuoheng.status.airport.listener.DefaultAirportListener; +import com.tuoheng.status.machine.listener.DefaultAirportListener; import org.springframework.stereotype.Component; @Component diff --git a/src/main/java/com/tuoheng/status/airport/platform/impl/dji/listener/DjiCoverListener.java b/src/main/java/com/tuoheng/status/machine/platform/impl/dji/listener/DjiCoverListener.java similarity index 62% rename from src/main/java/com/tuoheng/status/airport/platform/impl/dji/listener/DjiCoverListener.java rename to src/main/java/com/tuoheng/status/machine/platform/impl/dji/listener/DjiCoverListener.java index ca28760..5de85ae 100644 --- a/src/main/java/com/tuoheng/status/airport/platform/impl/dji/listener/DjiCoverListener.java +++ b/src/main/java/com/tuoheng/status/machine/platform/impl/dji/listener/DjiCoverListener.java @@ -1,6 +1,6 @@ -package com.tuoheng.status.airport.platform.impl.dji.listener; +package com.tuoheng.status.machine.platform.impl.dji.listener; -import com.tuoheng.status.airport.listener.DefaultCoverListener; +import com.tuoheng.status.machine.listener.DefaultCoverListener; import org.springframework.stereotype.Component; @Component diff --git a/src/main/java/com/tuoheng/status/airport/platform/repository/AirportPlatformRepository.java b/src/main/java/com/tuoheng/status/machine/platform/repository/AirportPlatformRepository.java similarity index 94% rename from src/main/java/com/tuoheng/status/airport/platform/repository/AirportPlatformRepository.java rename to src/main/java/com/tuoheng/status/machine/platform/repository/AirportPlatformRepository.java index a896585..467c721 100644 --- a/src/main/java/com/tuoheng/status/airport/platform/repository/AirportPlatformRepository.java +++ b/src/main/java/com/tuoheng/status/machine/platform/repository/AirportPlatformRepository.java @@ -1,6 +1,6 @@ -package com.tuoheng.status.airport.platform.repository; +package com.tuoheng.status.machine.platform.repository; -import com.tuoheng.status.airport.platform.PlatformType; +import com.tuoheng.status.machine.platform.PlatformType; import org.springframework.stereotype.Repository; import java.util.Map; diff --git a/src/main/java/com/tuoheng/status/airport/platform/strategy/AirportPlatformStrategy.java b/src/main/java/com/tuoheng/status/machine/platform/strategy/AirportPlatformStrategy.java similarity index 86% rename from src/main/java/com/tuoheng/status/airport/platform/strategy/AirportPlatformStrategy.java rename to src/main/java/com/tuoheng/status/machine/platform/strategy/AirportPlatformStrategy.java index 860c43e..01f6de9 100644 --- a/src/main/java/com/tuoheng/status/airport/platform/strategy/AirportPlatformStrategy.java +++ b/src/main/java/com/tuoheng/status/machine/platform/strategy/AirportPlatformStrategy.java @@ -1,8 +1,8 @@ -package com.tuoheng.status.airport.platform.strategy; +package com.tuoheng.status.machine.platform.strategy; -import com.tuoheng.status.airport.events.AirportEvent; -import com.tuoheng.status.airport.platform.PlatformType; -import com.tuoheng.status.airport.status.AirportState; +import com.tuoheng.status.machine.events.AirportEvent; +import com.tuoheng.status.machine.platform.PlatformType; +import com.tuoheng.status.machine.status.AirportState; /** * 机巢平台策略接口 diff --git a/src/main/java/com/tuoheng/status/airport/platform/strategy/CoverPlatformStrategy.java b/src/main/java/com/tuoheng/status/machine/platform/strategy/CoverPlatformStrategy.java similarity index 84% rename from src/main/java/com/tuoheng/status/airport/platform/strategy/CoverPlatformStrategy.java rename to src/main/java/com/tuoheng/status/machine/platform/strategy/CoverPlatformStrategy.java index 7db562e..66577f1 100644 --- a/src/main/java/com/tuoheng/status/airport/platform/strategy/CoverPlatformStrategy.java +++ b/src/main/java/com/tuoheng/status/machine/platform/strategy/CoverPlatformStrategy.java @@ -1,8 +1,8 @@ -package com.tuoheng.status.airport.platform.strategy; +package com.tuoheng.status.machine.platform.strategy; -import com.tuoheng.status.airport.events.CoverEvent; -import com.tuoheng.status.airport.platform.PlatformType; -import com.tuoheng.status.airport.status.CoverState; +import com.tuoheng.status.machine.events.CoverEvent; +import com.tuoheng.status.machine.platform.PlatformType; +import com.tuoheng.status.machine.status.CoverState; /** * 舱门平台策略接口 diff --git a/src/main/java/com/tuoheng/status/airport/platform/strategy/PlatformAction.java b/src/main/java/com/tuoheng/status/machine/platform/strategy/PlatformAction.java similarity index 88% rename from src/main/java/com/tuoheng/status/airport/platform/strategy/PlatformAction.java rename to src/main/java/com/tuoheng/status/machine/platform/strategy/PlatformAction.java index 5756757..67c4d81 100644 --- a/src/main/java/com/tuoheng/status/airport/platform/strategy/PlatformAction.java +++ b/src/main/java/com/tuoheng/status/machine/platform/strategy/PlatformAction.java @@ -1,4 +1,4 @@ -package com.tuoheng.status.airport.platform.strategy; +package com.tuoheng.status.machine.platform.strategy; import org.springframework.statemachine.StateContext; import org.springframework.statemachine.action.Action; diff --git a/src/main/java/com/tuoheng/status/airport/platform/strategy/PlatformGuard.java b/src/main/java/com/tuoheng/status/machine/platform/strategy/PlatformGuard.java similarity index 88% rename from src/main/java/com/tuoheng/status/airport/platform/strategy/PlatformGuard.java rename to src/main/java/com/tuoheng/status/machine/platform/strategy/PlatformGuard.java index e367391..6db3347 100644 --- a/src/main/java/com/tuoheng/status/airport/platform/strategy/PlatformGuard.java +++ b/src/main/java/com/tuoheng/status/machine/platform/strategy/PlatformGuard.java @@ -1,4 +1,4 @@ -package com.tuoheng.status.airport.platform.strategy; +package com.tuoheng.status.machine.platform.strategy; import org.springframework.statemachine.StateContext; import org.springframework.statemachine.guard.Guard; diff --git a/src/main/java/com/tuoheng/status/airport/platform/strategy/PlatformListener.java b/src/main/java/com/tuoheng/status/machine/platform/strategy/PlatformListener.java similarity index 84% rename from src/main/java/com/tuoheng/status/airport/platform/strategy/PlatformListener.java rename to src/main/java/com/tuoheng/status/machine/platform/strategy/PlatformListener.java index 359fcbd..ed0cce7 100644 --- a/src/main/java/com/tuoheng/status/airport/platform/strategy/PlatformListener.java +++ b/src/main/java/com/tuoheng/status/machine/platform/strategy/PlatformListener.java @@ -1,4 +1,4 @@ -package com.tuoheng.status.airport.platform.strategy; +package com.tuoheng.status.machine.platform.strategy; import org.springframework.statemachine.listener.StateMachineListener; diff --git a/src/main/java/com/tuoheng/status/airport/service/AirportMachineService.java b/src/main/java/com/tuoheng/status/machine/service/AirportMachineService.java similarity index 97% rename from src/main/java/com/tuoheng/status/airport/service/AirportMachineService.java rename to src/main/java/com/tuoheng/status/machine/service/AirportMachineService.java index 68bc908..a55c533 100644 --- a/src/main/java/com/tuoheng/status/airport/service/AirportMachineService.java +++ b/src/main/java/com/tuoheng/status/machine/service/AirportMachineService.java @@ -1,7 +1,7 @@ -package com.tuoheng.status.airport.service; +package com.tuoheng.status.machine.service; -import com.tuoheng.status.airport.events.AirportEvent; -import com.tuoheng.status.airport.status.AirportState; +import com.tuoheng.status.machine.events.AirportEvent; +import com.tuoheng.status.machine.status.AirportState; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.statemachine.StateMachine; import org.springframework.statemachine.config.StateMachineFactory; diff --git a/src/main/java/com/tuoheng/status/airport/service/CoverMachineService.java b/src/main/java/com/tuoheng/status/machine/service/CoverMachineService.java similarity index 94% rename from src/main/java/com/tuoheng/status/airport/service/CoverMachineService.java rename to src/main/java/com/tuoheng/status/machine/service/CoverMachineService.java index bc11166..2da16a3 100644 --- a/src/main/java/com/tuoheng/status/airport/service/CoverMachineService.java +++ b/src/main/java/com/tuoheng/status/machine/service/CoverMachineService.java @@ -1,7 +1,7 @@ -package com.tuoheng.status.airport.service; +package com.tuoheng.status.machine.service; -import com.tuoheng.status.airport.events.CoverEvent; -import com.tuoheng.status.airport.status.CoverState; +import com.tuoheng.status.machine.events.CoverEvent; +import com.tuoheng.status.machine.status.CoverState; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.statemachine.StateMachine; import org.springframework.statemachine.config.StateMachineFactory; diff --git a/src/main/java/com/tuoheng/status/airport/status/AirportState.java b/src/main/java/com/tuoheng/status/machine/status/AirportState.java similarity index 88% rename from src/main/java/com/tuoheng/status/airport/status/AirportState.java rename to src/main/java/com/tuoheng/status/machine/status/AirportState.java index 4b5b868..f517446 100644 --- a/src/main/java/com/tuoheng/status/airport/status/AirportState.java +++ b/src/main/java/com/tuoheng/status/machine/status/AirportState.java @@ -1,4 +1,4 @@ -package com.tuoheng.status.airport.status; +package com.tuoheng.status.machine.status; /** * 机巢状态枚举（简化版 - 舱门状态已分离） diff --git a/src/main/java/com/tuoheng/status/airport/status/CoverState.java b/src/main/java/com/tuoheng/status/machine/status/CoverState.java similarity index 89% rename from src/main/java/com/tuoheng/status/airport/status/CoverState.java rename to src/main/java/com/tuoheng/status/machine/status/CoverState.java index 1050513..a3c463a 100644 --- a/src/main/java/com/tuoheng/status/airport/status/CoverState.java +++ b/src/main/java/com/tuoheng/status/machine/status/CoverState.java @@ -1,4 +1,4 @@ -package com.tuoheng.status.airport.status; +package com.tuoheng.status.machine.status; /** * 舱门状态枚举 diff --git a/src/main/java/com/tuoheng/status/machine/status/DroneState.java b/src/main/java/com/tuoheng/status/machine/status/DroneState.java new file mode 100644 index 0000000..69100c2 --- /dev/null +++ b/src/main/java/com/tuoheng/status/machine/status/DroneState.java @@ -0,0 +1,4 @@ +package com.tuoheng.status.machine.status; + +public enum DroneState { +}