diff --git a/pom.xml b/pom.xml
index 55c7f4b..43a19fa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,5 +64,12 @@
3.14.0
+
+
+ org.projectlombok
+ lombok
+ true
+
+
diff --git a/src/main/java/com/tuoheng/machine/config/AirportMachineConfig.java b/src/main/java/com/tuoheng/machine/config/AirportMachineConfig.java
index b4ca074..714754c 100644
--- a/src/main/java/com/tuoheng/machine/config/AirportMachineConfig.java
+++ b/src/main/java/com/tuoheng/machine/config/AirportMachineConfig.java
@@ -23,6 +23,7 @@ public class AirportMachineConfig {
@Bean(name = "airportStateMachineFactory")
public StateMachineFactory stateMachineFactory(
PlatformStrategyFactory platformStrategyFactory) throws Exception {
+
return new StateMachineFactory() {
@Override
public StateMachine getStateMachine() {
diff --git a/src/main/java/com/tuoheng/machine/listener/DefaultAirportListener.java b/src/main/java/com/tuoheng/machine/listener/DefaultAirportListener.java
index 3eecd78..7563d50 100644
--- a/src/main/java/com/tuoheng/machine/listener/DefaultAirportListener.java
+++ b/src/main/java/com/tuoheng/machine/listener/DefaultAirportListener.java
@@ -1,5 +1,7 @@
package com.tuoheng.machine.listener;
+import lombok.extern.slf4j.Slf4j;
+
import com.tuoheng.machine.events.AirportEvent;
import com.tuoheng.machine.platform.strategy.PlatformListener;
import com.tuoheng.machine.status.AirportState;
@@ -14,30 +16,30 @@ import org.springframework.statemachine.transition.Transition;
* 提供基础的状态变化监听功能，各平台可以继承并定制
*/
+@Slf4j
public abstract class DefaultAirportListener implements PlatformListener {
@Override
public void stateChanged(State from, State to) {
if (from != null && to != null) {
- System.out.println(String.format("[%s] 状态变化: %s -> %s",
- getName(), from.getId(), to.getId()));
+ log.debug("[{}] 状态变化: {} -> {}", getName(), from.getId(), to.getId());
}
}
@Override
public void stateEntered(State state) {
- System.out.println(String.format("[%s] 进入状态: %s", getName(), state.getId()));
+ log.debug("[{}] 进入状态: {}", getName(), state.getId());
}
@Override
public void stateExited(State state) {
- System.out.println(String.format("[%s] 退出状态: %s", getName(), state.getId()));
+ log.debug("[{}] 退出状态: {}", getName(), state.getId());
}
@Override
public void eventNotAccepted(Message event) {
- System.out.println(String.format("[%s] 事件未被接受: %s", getName(), event.getPayload()));
+ log.warn("[{}] 事件未被接受: {}", getName(), event.getPayload());
}
@Override
@@ -48,41 +50,41 @@ public abstract class DefaultAirportListener implements PlatformListener transition) {
if (transition.getSource() != null && transition.getTarget() != null) {
- System.out.println(String.format("[%s] 转换开始: %s -> %s",
- getName(), transition.getSource().getId(), transition.getTarget().getId()));
+ log.debug("[{}] 转换开始: {} -> {}",
+ getName(), transition.getSource().getId(), transition.getTarget().getId());
}
}
@Override
public void transitionEnded(Transition transition) {
if (transition.getSource() != null && transition.getTarget() != null) {
- System.out.println(String.format("[%s] 转换结束: %s -> %s",
- getName(), transition.getSource().getId(), transition.getTarget().getId()));
+ log.debug("[{}] 转换结束: {} -> {}",
+ getName(), transition.getSource().getId(), transition.getTarget().getId());
}
}
@Override
public void stateMachineStarted(StateMachine stateMachine) {
String machineId = (String) stateMachine.getExtendedState().getVariables().get("machineId");
- System.out.println(String.format("[%s] 状态机启动: %s", getName(), machineId));
+ log.info("[{}] 状态机启动: {}", getName(), machineId);
}
@Override
public void stateMachineStopped(StateMachine stateMachine) {
String machineId = (String) stateMachine.getExtendedState().getVariables().get("machineId");
- System.out.println(String.format("[%s] 状态机停止: %s", getName(), machineId));
+ log.info("[{}] 状态机停止: {}", getName(), machineId);
}
@Override
public void stateMachineError(StateMachine stateMachine, Exception exception) {
String machineId = (String) stateMachine.getExtendedState().getVariables().get("machineId");
- System.err.println(String.format("[%s] 状态机错误: %s, 异常: %s",
- getName(), machineId, exception.getMessage()));
+ log.error("[{}] 状态机错误: {}, 异常信息: {}",
+ getName(), machineId, exception.getMessage());
}
@Override
public void extendedStateChanged(Object key, Object value) {
- System.out.println(String.format("[%s] 扩展状态变化: %s = %s", getName(), key, value));
+ log.info("[{}] 扩展状态变化: {} = {}", getName(), key, value);
}
@Override
diff --git a/src/main/java/com/tuoheng/machine/listener/DefaultCoverListener.java b/src/main/java/com/tuoheng/machine/listener/DefaultCoverListener.java
index 068d084..b14a6d8 100644
--- a/src/main/java/com/tuoheng/machine/listener/DefaultCoverListener.java
+++ b/src/main/java/com/tuoheng/machine/listener/DefaultCoverListener.java
@@ -1,5 +1,7 @@
package com.tuoheng.machine.listener;
+import lombok.extern.slf4j.Slf4j;
+
import com.tuoheng.machine.events.CoverEvent;
import com.tuoheng.machine.platform.strategy.PlatformListener;
import com.tuoheng.machine.status.CoverState;
@@ -13,35 +15,29 @@ import org.springframework.statemachine.transition.Transition;
* 默认舱门状态监听器
* 提供基础的状态变化监听功能，各平台可以继承并定制
*/
-
+@Slf4j
public abstract class DefaultCoverListener implements PlatformListener {
- @Override
- public String getName() {
- return "DefaultCoverListener";
- }
-
@Override
public void stateChanged(State from, State to) {
if (from != null && to != null) {
- System.out.println(String.format("[%s] 状态变化: %s -> %s",
- getName(), from.getId(), to.getId()));
+ log.debug("[{}] 状态变化: {} -> {}", getName(), from.getId(), to.getId());
}
}
@Override
public void stateEntered(State state) {
- System.out.println(String.format("[%s] 进入状态: %s", getName(), state.getId()));
+ log.debug("[{}] 进入状态: {}", getName(), state.getId());
}
@Override
public void stateExited(State state) {
- System.out.println(String.format("[%s] 退出状态: %s", getName(), state.getId()));
+ log.debug("[{}] 退出状态: {}", getName(), state.getId());
}
@Override
public void eventNotAccepted(Message event) {
- System.out.println(String.format("[%s] 事件未被接受: %s", getName(), event.getPayload()));
+ log.warn("[{}] 事件未被接受: {}", getName(), event.getPayload());
}
@Override
@@ -52,41 +48,41 @@ public abstract class DefaultCoverListener implements PlatformListener transition) {
if (transition.getSource() != null && transition.getTarget() != null) {
- System.out.println(String.format("[%s] 转换开始: %s -> %s",
- getName(), transition.getSource().getId(), transition.getTarget().getId()));
+ log.debug("[{}] 转换开始: {} -> {}",
+ getName(), transition.getSource().getId(), transition.getTarget().getId());
}
}
@Override
public void transitionEnded(Transition transition) {
if (transition.getSource() != null && transition.getTarget() != null) {
- System.out.println(String.format("[%s] 转换结束: %s -> %s",
- getName(), transition.getSource().getId(), transition.getTarget().getId()));
+ log.debug("[{}] 转换结束: {} -> {}",
+ getName(), transition.getSource().getId(), transition.getTarget().getId());
}
}
@Override
public void stateMachineStarted(StateMachine stateMachine) {
String machineId = (String) stateMachine.getExtendedState().getVariables().get("machineId");
- System.out.println(String.format("[%s] 状态机启动: %s", getName(), machineId));
+ log.info("[{}] 状态机启动: {}", getName(), machineId);
}
@Override
public void stateMachineStopped(StateMachine stateMachine) {
String machineId = (String) stateMachine.getExtendedState().getVariables().get("machineId");
- System.out.println(String.format("[%s] 状态机停止: %s", getName(), machineId));
+ log.info("[{}] 状态机停止: {}", getName(), machineId);
}
@Override
public void stateMachineError(StateMachine stateMachine, Exception exception) {
String machineId = (String) stateMachine.getExtendedState().getVariables().get("machineId");
- System.err.println(String.format("[%s] 状态机错误: %s, 异常: %s",
- getName(), machineId, exception.getMessage()));
+ log.error("[{}] 状态机错误: {}, 异常信息: {}",
+ getName(), machineId, exception.getMessage());
}
@Override
public void extendedStateChanged(Object key, Object value) {
- System.out.println(String.format("[%s] 扩展状态变化: %s = %s", getName(), key, value));
+ log.info("[{}] 扩展状态变化: {} = {}", getName(), key, value);
}
@Override
diff --git a/src/main/java/com/tuoheng/machine/listener/DefaultDrcListener.java b/src/main/java/com/tuoheng/machine/listener/DefaultDrcListener.java
index cc19125..30151ce 100644
--- a/src/main/java/com/tuoheng/machine/listener/DefaultDrcListener.java
+++ b/src/main/java/com/tuoheng/machine/listener/DefaultDrcListener.java
@@ -1,5 +1,9 @@
package com.tuoheng.machine.listener;
+import com.tuoheng.machine.events.AirportEvent;
+import com.tuoheng.machine.status.AirportState;
+import lombok.extern.slf4j.Slf4j;
+
import com.tuoheng.machine.events.DrcEvent;
import com.tuoheng.machine.platform.strategy.PlatformListener;
import com.tuoheng.machine.status.DrcState;
@@ -13,29 +17,30 @@ import org.springframework.statemachine.transition.Transition;
* 默认DRC状态监听器
* 提供基础的状态变化监听功能，各平台可以继承并定制
*/
+@Slf4j
public abstract class DefaultDrcListener implements PlatformListener {
+
@Override
public void stateChanged(State from, State to) {
if (from != null && to != null) {
- System.out.println(String.format("[%s] 状态变化: %s -> %s",
- getName(), from.getId(), to.getId()));
+ log.debug("[{}] 状态变化: {} -> {}", getName(), from.getId(), to.getId());
}
}
@Override
public void stateEntered(State state) {
- System.out.println(String.format("[%s] 进入状态: %s", getName(), state.getId()));
+ log.debug("[{}] 进入状态: {}", getName(), state.getId());
}
@Override
public void stateExited(State state) {
- System.out.println(String.format("[%s] 退出状态: %s", getName(), state.getId()));
+ log.debug("[{}] 退出状态: {}", getName(), state.getId());
}
@Override
public void eventNotAccepted(Message event) {
- System.out.println(String.format("[%s] 事件未被接受: %s", getName(), event.getPayload()));
+ log.warn("[{}] 事件未被接受: {}", getName(), event.getPayload());
}
@Override
@@ -46,41 +51,41 @@ public abstract class DefaultDrcListener implements PlatformListener transition) {
if (transition.getSource() != null && transition.getTarget() != null) {
- System.out.println(String.format("[%s] 转换开始: %s -> %s",
- getName(), transition.getSource().getId(), transition.getTarget().getId()));
+ log.debug("[{}] 转换开始: {} -> {}",
+ getName(), transition.getSource().getId(), transition.getTarget().getId());
}
}
@Override
public void transitionEnded(Transition transition) {
if (transition.getSource() != null && transition.getTarget() != null) {
- System.out.println(String.format("[%s] 转换结束: %s -> %s",
- getName(), transition.getSource().getId(), transition.getTarget().getId()));
+ log.debug("[{}] 转换结束: {} -> {}",
+ getName(), transition.getSource().getId(), transition.getTarget().getId());
}
}
@Override
public void stateMachineStarted(StateMachine stateMachine) {
String machineId = (String) stateMachine.getExtendedState().getVariables().get("machineId");
- System.out.println(String.format("[%s] 状态机启动: %s", getName(), machineId));
+ log.info("[{}] 状态机启动: {}", getName(), machineId);
}
@Override
public void stateMachineStopped(StateMachine stateMachine) {
String machineId = (String) stateMachine.getExtendedState().getVariables().get("machineId");
- System.out.println(String.format("[%s] 状态机停止: %s", getName(), machineId));
+ log.info("[{}] 状态机停止: {}", getName(), machineId);
}
@Override
public void stateMachineError(StateMachine stateMachine, Exception exception) {
String machineId = (String) stateMachine.getExtendedState().getVariables().get("machineId");
- System.err.println(String.format("[%s] 状态机错误: %s, 异常: %s",
- getName(), machineId, exception.getMessage()));
+ log.error("[{}] 状态机错误: {}, 异常信息: {}",
+ getName(), machineId, exception.getMessage());
}
@Override
public void extendedStateChanged(Object key, Object value) {
- System.out.println(String.format("[%s] 扩展状态变化: %s = %s", getName(), key, value));
+ log.info("[{}] 扩展状态变化: {} = {}", getName(), key, value);
}
@Override
diff --git a/src/main/java/com/tuoheng/machine/listener/DefaultDroneListener.java b/src/main/java/com/tuoheng/machine/listener/DefaultDroneListener.java
index 6dae4b1..675b3eb 100644
--- a/src/main/java/com/tuoheng/machine/listener/DefaultDroneListener.java
+++ b/src/main/java/com/tuoheng/machine/listener/DefaultDroneListener.java
@@ -1,5 +1,9 @@
package com.tuoheng.machine.listener;
+import com.tuoheng.machine.events.DrcEvent;
+import com.tuoheng.machine.status.DrcState;
+import lombok.extern.slf4j.Slf4j;
+
import com.tuoheng.machine.events.DroneEvent;
import com.tuoheng.machine.platform.strategy.PlatformListener;
import com.tuoheng.machine.status.DroneState;
@@ -13,29 +17,29 @@ import org.springframework.statemachine.transition.Transition;
* 默认无人机状态监听器
* 提供基础的状态变化监听功能，各平台可以继承并定制
*/
+@Slf4j
public abstract class DefaultDroneListener implements PlatformListener {
@Override
public void stateChanged(State from, State to) {
if (from != null && to != null) {
- System.out.println(String.format("[%s] 状态变化: %s -> %s",
- getName(), from.getId(), to.getId()));
+ log.debug("[{}] 状态变化: {} -> {}", getName(), from.getId(), to.getId());
}
}
@Override
public void stateEntered(State state) {
- System.out.println(String.format("[%s] 进入状态: %s", getName(), state.getId()));
+ log.debug("[{}] 进入状态: {}", getName(), state.getId());
}
@Override
public void stateExited(State state) {
- System.out.println(String.format("[%s] 退出状态: %s", getName(), state.getId()));
+ log.debug("[{}] 退出状态: {}", getName(), state.getId());
}
@Override
public void eventNotAccepted(Message event) {
- System.out.println(String.format("[%s] 事件未被接受: %s", getName(), event.getPayload()));
+ log.warn("[{}] 事件未被接受: {}", getName(), event.getPayload());
}
@Override
@@ -46,41 +50,41 @@ public abstract class DefaultDroneListener implements PlatformListener transition) {
if (transition.getSource() != null && transition.getTarget() != null) {
- System.out.println(String.format("[%s] 转换开始: %s -> %s",
- getName(), transition.getSource().getId(), transition.getTarget().getId()));
+ log.debug("[{}] 转换开始: {} -> {}",
+ getName(), transition.getSource().getId(), transition.getTarget().getId());
}
}
@Override
public void transitionEnded(Transition transition) {
if (transition.getSource() != null && transition.getTarget() != null) {
- System.out.println(String.format("[%s] 转换结束: %s -> %s",
- getName(), transition.getSource().getId(), transition.getTarget().getId()));
+ log.debug("[{}] 转换结束: {} -> {}",
+ getName(), transition.getSource().getId(), transition.getTarget().getId());
}
}
@Override
public void stateMachineStarted(StateMachine stateMachine) {
String machineId = (String) stateMachine.getExtendedState().getVariables().get("machineId");
- System.out.println(String.format("[%s] 状态机启动: %s", getName(), machineId));
+ log.info("[{}] 状态机启动: {}", getName(), machineId);
}
@Override
public void stateMachineStopped(StateMachine stateMachine) {
String machineId = (String) stateMachine.getExtendedState().getVariables().get("machineId");
- System.out.println(String.format("[%s] 状态机停止: %s", getName(), machineId));
+ log.info("[{}] 状态机停止: {}", getName(), machineId);
}
@Override
public void stateMachineError(StateMachine stateMachine, Exception exception) {
String machineId = (String) stateMachine.getExtendedState().getVariables().get("machineId");
- System.err.println(String.format("[%s] 状态机错误: %s, 异常: %s",
- getName(), machineId, exception.getMessage()));
+ log.error("[{}] 状态机错误: {}, 异常信息: {}",
+ getName(), machineId, exception.getMessage());
}
@Override
public void extendedStateChanged(Object key, Object value) {
- System.out.println(String.format("[%s] 扩展状态变化: %s = %s", getName(), key, value));
+ log.info("[{}] 扩展状态变化: {} = {}", getName(), key, value);
}
@Override
diff --git a/src/main/java/com/tuoheng/machine/manager/AbstractAirportSystemManager.java b/src/main/java/com/tuoheng/machine/manager/AbstractAirportSystemManager.java
index f637368..b0e9296 100644
--- a/src/main/java/com/tuoheng/machine/manager/AbstractAirportSystemManager.java
+++ b/src/main/java/com/tuoheng/machine/manager/AbstractAirportSystemManager.java
@@ -1,5 +1,7 @@
package com.tuoheng.machine.manager;
+import lombok.extern.slf4j.Slf4j;
+
import com.tuoheng.machine.events.AirportEvent;
import com.tuoheng.machine.events.CoverEvent;
import com.tuoheng.machine.events.DroneEvent;
@@ -19,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired;
* 机巢系统管理器抽象类
* 提供通用的业务编排能力，具体实现可按需扩展
*/
+@Slf4j
public abstract class AbstractAirportSystemManager implements AirportSystemManager {
/**
@@ -68,28 +71,28 @@ public abstract class AbstractAirportSystemManager implements AirportSystemManag
AirportState currentState = airportService.getCurrentState(airportSn);
if (currentState == null) {
- System.out.println(String.format("同步机巢状态失败 - 机巢: %s, 状态机不存在", airportSn));
+ log.error("同步机巢状态失败 - 机巢: {}, 状态机不存在", airportSn);
return false;
}
if (currentState != AirportState.UNKNOWN) {
- System.out.println(String.format("同步机巢状态跳过 - 机巢: %s, 当前状态: %s (非UNKNOWN状态，无需同步)",
- airportSn, currentState));
+ log.debug("同步机巢状态跳过 - 机巢: {}, 当前状态: {} (非UNKNOWN状态，无需同步)",
+ airportSn, currentState);
return false;
}
// 根据目标状态发送相应的事件
AirportEvent event = getAirportEventForState(targetState);
if (event == null) {
- System.out.println(String.format("同步机巢状态失败 - 机巢: %s, 无法为目标状态 %s 找到对应事件",
- airportSn, targetState));
+ log.error("同步机巢状态失败 - 机巢: {}, 无法为目标状态 {} 找到对应事件",
+ airportSn, targetState);
return false;
}
boolean result = airportService.sendEvent(airportSn, event);
if (result) {
- System.out.println(String.format("同步机巢状态成功 - 机巢: %s, 从 UNKNOWN 同步到 %s",
- airportSn, targetState));
+ log.info("同步机巢状态成功 - 机巢: {}, 从 UNKNOWN 同步到 {}",
+ airportSn, targetState);
}
return result;
}
@@ -106,28 +109,28 @@ public abstract class AbstractAirportSystemManager implements AirportSystemManag
CoverState currentState = coverService.getCurrentState(airportSn);
if (currentState == null) {
- System.out.println(String.format("同步舱门状态失败 - 机巢: %s, 状态机不存在", airportSn));
+ log.error("同步舱门状态失败 - 机巢: {}, 状态机不存在", airportSn);
return false;
}
if (currentState != CoverState.UNKNOWN) {
- System.out.println(String.format("同步舱门状态跳过 - 机巢: %s, 当前状态: %s (非UNKNOWN状态，无需同步)",
- airportSn, currentState));
+ log.debug("同步舱门状态跳过 - 机巢: {}, 当前状态: {} (非UNKNOWN状态，无需同步)",
+ airportSn, currentState);
return false;
}
// 根据目标状态发送相应的事件
CoverEvent event = getCoverEventForState(targetState);
if (event == null) {
- System.out.println(String.format("同步舱门状态失败 - 机巢: %s, 无法为目标状态 %s 找到对应事件",
- airportSn, targetState));
+ log.error("同步舱门状态失败 - 机巢: {}, 无法为目标状态 {} 找到对应事件",
+ airportSn, targetState);
return false;
}
boolean result = coverService.sendEvent(airportSn, event);
if (result) {
- System.out.println(String.format("同步舱门状态成功 - 机巢: %s, 从 UNKNOWN 同步到 %s",
- airportSn, targetState));
+ log.info("同步舱门状态成功 - 机巢: {}, 从 UNKNOWN 同步到 {}",
+ airportSn, targetState);
}
return result;
}
@@ -195,28 +198,28 @@ public abstract class AbstractAirportSystemManager implements AirportSystemManag
DroneState currentState = droneService.getCurrentState(droneSn);
if (currentState == null) {
- System.out.println(String.format("同步无人机状态失败 - 无人机: %s, 状态机不存在", droneSn));
+ log.error("同步无人机状态失败 - 无人机: {}, 状态机不存在", droneSn);
return false;
}
if (currentState != DroneState.UNKNOWN) {
- System.out.println(String.format("同步无人机状态跳过 - 无人机: %s, 当前状态: %s (非UNKNOWN状态，无需同步)",
- droneSn, currentState));
+ log.debug("同步无人机状态跳过 - 无人机: {}, 当前状态: {} (非UNKNOWN状态，无需同步)",
+ droneSn, currentState);
return false;
}
// 根据目标状态发送相应的事件
DroneEvent event = getDroneEventForState(targetState);
if (event == null) {
- System.out.println(String.format("同步无人机状态失败 - 无人机: %s, 无法为目标状态 %s 找到对应事件",
- droneSn, targetState));
+ log.error("同步无人机状态失败 - 无人机: {}, 无法为目标状态 {} 找到对应事件",
+ droneSn, targetState);
return false;
}
boolean result = droneService.sendEvent(droneSn, event);
if (result) {
- System.out.println(String.format("同步无人机状态成功 - 无人机: %s, 从 UNKNOWN 同步到 %s",
- droneSn, targetState));
+ log.info("同步无人机状态成功 - 无人机: {}, 从 UNKNOWN 同步到 {}",
+ droneSn, targetState);
}
return result;
}
@@ -233,28 +236,28 @@ public abstract class AbstractAirportSystemManager implements AirportSystemManag
DrcState currentState = drcService.getCurrentState(airportSn);
if (currentState == null) {
- System.out.println(String.format("同步DRC状态失败 - 机巢: %s, 状态机不存在", airportSn));
+ log.error("同步DRC状态失败 - 机巢: {}, 状态机不存在", airportSn);
return false;
}
if (currentState != DrcState.UNKNOWN) {
- System.out.println(String.format("同步DRC状态跳过 - 机巢: %s, 当前状态: %s (非UNKNOWN状态，无需同步)",
- airportSn, currentState));
+ log.debug("同步DRC状态跳过 - 机巢: {}, 当前状态: {} (非UNKNOWN状态，无需同步)",
+ airportSn, currentState);
return false;
}
// 根据目标状态发送相应的事件
DrcEvent event = getDrcEventForState(targetState);
if (event == null) {
- System.out.println(String.format("同步DRC状态失败 - 机巢: %s, 无法为目标状态 %s 找到对应事件",
- airportSn, targetState));
+ log.error("同步DRC状态失败 - 机巢: {}, 无法为目标状态 {} 找到对应事件",
+ airportSn, targetState);
return false;
}
boolean result = drcService.sendEvent(airportSn, event);
if (result) {
- System.out.println(String.format("同步DRC状态成功 - 机巢: %s, 从 UNKNOWN 同步到 %s",
- airportSn, targetState));
+ log.info("同步DRC状态成功 - 机巢: {}, 从 UNKNOWN 同步到 {}",
+ airportSn, targetState);
}
return result;
}
diff --git a/src/main/java/com/tuoheng/machine/manager/AirportSystemManager.java b/src/main/java/com/tuoheng/machine/manager/AirportSystemManager.java
index e13fc05..4c1067e 100644
--- a/src/main/java/com/tuoheng/machine/manager/AirportSystemManager.java
+++ b/src/main/java/com/tuoheng/machine/manager/AirportSystemManager.java
@@ -1,5 +1,7 @@
package com.tuoheng.machine.manager;
+import lombok.extern.slf4j.Slf4j;
+
import com.tuoheng.machine.events.AirportEvent;
import com.tuoheng.machine.events.CoverEvent;
import com.tuoheng.machine.events.DroneEvent;
diff --git a/src/main/java/com/tuoheng/machine/manager/factory/AirportSystemManagerFactory.java b/src/main/java/com/tuoheng/machine/manager/factory/AirportSystemManagerFactory.java
index 2849438..fc144a4 100644
--- a/src/main/java/com/tuoheng/machine/manager/factory/AirportSystemManagerFactory.java
+++ b/src/main/java/com/tuoheng/machine/manager/factory/AirportSystemManagerFactory.java
@@ -3,6 +3,7 @@ package com.tuoheng.machine.manager.factory;
import com.tuoheng.machine.manager.AirportSystemManager;
import com.tuoheng.machine.platform.PlatformType;
import com.tuoheng.machine.repository.AirportPlatformRepository;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -14,6 +15,7 @@ import java.util.concurrent.ConcurrentHashMap;
* 机巢系统管理器工厂
* 根据机巢SN从数据库查询平台类型，返回对应的系统管理器
*/
+@Slf4j
@Component
public class AirportSystemManagerFactory {
@@ -35,8 +37,8 @@ public class AirportSystemManagerFactory {
public void registerManagers(List managers) {
for (AirportSystemManager manager : managers) {
managerMap.put(manager.getPlatformType(), manager);
- System.out.println(String.format("注册系统管理器: %s -> %s",
- manager.getPlatformType().getName(), manager.getClass().getSimpleName()));
+ log.info("注册系统管理器: {} -> {}",
+ manager.getPlatformType().getName(), manager.getClass().getSimpleName());
}
}
diff --git a/src/main/java/com/tuoheng/machine/platform/factory/PlatformStrategyFactory.java b/src/main/java/com/tuoheng/machine/platform/factory/PlatformStrategyFactory.java
index 0c23d16..2c50691 100644
--- a/src/main/java/com/tuoheng/machine/platform/factory/PlatformStrategyFactory.java
+++ b/src/main/java/com/tuoheng/machine/platform/factory/PlatformStrategyFactory.java
@@ -6,6 +6,7 @@ import com.tuoheng.machine.platform.strategy.AirportPlatformStrategy;
import com.tuoheng.machine.platform.strategy.CoverPlatformStrategy;
import com.tuoheng.machine.platform.strategy.DronePlatformStrategy;
import com.tuoheng.machine.platform.strategy.DrcPlatformStrategy;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -17,6 +18,7 @@ import java.util.concurrent.ConcurrentHashMap;
* 平台策略工厂
* 根据机巢/无人机SN从数据库查询平台类型，返回对应的平台策略
*/
+@Slf4j
@Component
public class PlatformStrategyFactory {
@@ -65,29 +67,29 @@ public class PlatformStrategyFactory {
// 注册机巢策略
for (AirportPlatformStrategy strategy : airportStrategies) {
airportStrategyMap.put(strategy.getPlatformType(), strategy);
- System.out.println(String.format("注册机巢平台策略: %s -> %s",
- strategy.getPlatformType().getName(), strategy.getClass().getSimpleName()));
+ log.info("注册机巢平台策略: {} -> {}",
+ strategy.getPlatformType().getName(), strategy.getClass().getSimpleName());
}
// 注册舱门策略
for (CoverPlatformStrategy strategy : coverStrategies) {
coverStrategyMap.put(strategy.getPlatformType(), strategy);
- System.out.println(String.format("注册舱门平台策略: %s -> %s",
- strategy.getPlatformType().getName(), strategy.getClass().getSimpleName()));
+ log.info("注册舱门平台策略: {} -> {}",
+ strategy.getPlatformType().getName(), strategy.getClass().getSimpleName());
}
// 注册无人机策略
for (DronePlatformStrategy strategy : droneStrategies) {
droneStrategyMap.put(strategy.getPlatformType(), strategy);
- System.out.println(String.format("注册无人机平台策略: %s -> %s",
- strategy.getPlatformType().getName(), strategy.getClass().getSimpleName()));
+ log.info("注册无人机平台策略: {} -> {}",
+ strategy.getPlatformType().getName(), strategy.getClass().getSimpleName());
}
// 注册DRC策略
for (DrcPlatformStrategy strategy : drcStrategies) {
drcStrategyMap.put(strategy.getPlatformType(), strategy);
- System.out.println(String.format("注册DRC平台策略: %s -> %s",
- strategy.getPlatformType().getName(), strategy.getClass().getSimpleName()));
+ log.info("注册DRC平台策略: {} -> {}",
+ strategy.getPlatformType().getName(), strategy.getClass().getSimpleName());
}
}
diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/DjiAirportSystemManager.java b/src/main/java/com/tuoheng/machine/platform/impl/dji/DjiAirportSystemManager.java
index f190dac..a984a03 100644
--- a/src/main/java/com/tuoheng/machine/platform/impl/dji/DjiAirportSystemManager.java
+++ b/src/main/java/com/tuoheng/machine/platform/impl/dji/DjiAirportSystemManager.java
@@ -7,12 +7,14 @@ import com.tuoheng.machine.manager.AbstractAirportSystemManager;
import com.tuoheng.machine.platform.PlatformType;
import com.tuoheng.machine.status.AirportState;
import com.tuoheng.machine.status.CoverState;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
/**
* 大疆平台机巢系统管理器实现
*/
@Component
+@Slf4j
public class DjiAirportSystemManager extends AbstractAirportSystemManager {
@Override
@@ -41,7 +43,7 @@ public class DjiAirportSystemManager extends AbstractAirportSystemManager {
@Override
public boolean openDebugMode(String airportSn) {
if (!airportService.isInState(airportSn, AirportState.ONLINE)) {
- System.out.println("机巢未在线，无法开启调试模式");
+ log.warn("机巢未在线，无法开启调试模式");
return false;
}
return airportService.sendEvent(airportSn, AirportEvent.DEBUG_MODE_OPEN);
@@ -55,11 +57,11 @@ public class DjiAirportSystemManager extends AbstractAirportSystemManager {
@Override
public boolean openCover(String airportSn) {
if (!airportService.isInState(airportSn, AirportState.DEBUG_MODE)) {
- System.out.println("必须在调试模式下才能开舱");
+ log.warn("机巢: {} 必须在调试模式下才能开舱", airportSn);
return false;
}
if (coverService.isInState(airportSn, CoverState.OPENED)) {
- System.out.println("舱门已经打开");
+ log.info("舱门已经打开");
return false;
}
return coverService.sendEvent(airportSn, CoverEvent.OPEN);
@@ -73,11 +75,11 @@ public class DjiAirportSystemManager extends AbstractAirportSystemManager {
@Override
public boolean closeCover(String airportSn) {
if (!airportService.isInState(airportSn, AirportState.DEBUG_MODE)) {
- System.out.println("必须在调试模式下才能关舱");
+ log.warn("必须在调试模式下才能关舱");
return false;
}
if (coverService.isInState(airportSn, CoverState.CLOSED)) {
- System.out.println("舱门已经关闭");
+ log.info("机巢: {} 舱门已经关闭", airportSn);
return false;
}
return coverService.sendEvent(airportSn, CoverEvent.CLOSE);
@@ -91,7 +93,7 @@ public class DjiAirportSystemManager extends AbstractAirportSystemManager {
@Override
public boolean rebootAirport(String airportSn) {
if (!airportService.isInState(airportSn, AirportState.DEBUG_MODE)) {
- System.out.println("必须在调试模式下才能重启");
+ log.warn("必须在调试模式下才能重启");
return false;
}
return airportService.sendEvent(airportSn, AirportEvent.AIRPORT_REBOOT);
diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/airport/DjiCloseDebugModeAction.java b/src/main/java/com/tuoheng/machine/platform/impl/dji/action/airport/DjiCloseDebugModeAction.java
index fe11ab7..d083f70 100644
--- a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/airport/DjiCloseDebugModeAction.java
+++ b/src/main/java/com/tuoheng/machine/platform/impl/dji/action/airport/DjiCloseDebugModeAction.java
@@ -1,11 +1,14 @@
package com.tuoheng.machine.platform.impl.dji.action.airport;
+import lombok.extern.slf4j.Slf4j;
+
import com.tuoheng.machine.action.debug.CloseDebugModeAction;
import com.tuoheng.machine.events.AirportEvent;
import com.tuoheng.machine.status.AirportState;
import org.springframework.statemachine.StateContext;
import org.springframework.stereotype.Component;
+@Slf4j
@Component
public class DjiCloseDebugModeAction extends CloseDebugModeAction {
@@ -17,6 +20,6 @@ public class DjiCloseDebugModeAction extends CloseDebugModeAction {
@Override
public void execute(StateContext context) {
String machineId = (String) context.getExtendedState().getVariables().get("machineId");
- System.out.println(String.format("[DJI] 关闭调试模式: %s", machineId));
+ log.info("[DJI] 关闭调试模式: %s", machineId);
}
}
diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/airport/DjiOfflineAction.java b/src/main/java/com/tuoheng/machine/platform/impl/dji/action/airport/DjiOfflineAction.java
index 0bb8efb..6f597f3 100644
--- a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/airport/DjiOfflineAction.java
+++ b/src/main/java/com/tuoheng/machine/platform/impl/dji/action/airport/DjiOfflineAction.java
@@ -1,11 +1,14 @@
package com.tuoheng.machine.platform.impl.dji.action.airport;
+import lombok.extern.slf4j.Slf4j;
+
import com.tuoheng.machine.action.airport.OfflineAction;
import com.tuoheng.machine.events.AirportEvent;
import com.tuoheng.machine.status.AirportState;
import org.springframework.statemachine.StateContext;
import org.springframework.stereotype.Component;
+@Slf4j
@Component
public class DjiOfflineAction extends OfflineAction {
@@ -17,6 +20,6 @@ public class DjiOfflineAction extends OfflineAction {
@Override
public void execute(StateContext context) {
String machineId = (String) context.getExtendedState().getVariables().get("machineId");
- System.out.println(String.format("[DJI] 机巢离线: %s", machineId));
+ log.info("[DJI] 机巢离线: %s", machineId);
}
}
diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/airport/DjiOnlineAction.java b/src/main/java/com/tuoheng/machine/platform/impl/dji/action/airport/DjiOnlineAction.java
index ac786e5..2377d77 100644
--- a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/airport/DjiOnlineAction.java
+++ b/src/main/java/com/tuoheng/machine/platform/impl/dji/action/airport/DjiOnlineAction.java
@@ -1,11 +1,14 @@
package com.tuoheng.machine.platform.impl.dji.action.airport;
+import lombok.extern.slf4j.Slf4j;
+
import com.tuoheng.machine.action.airport.OnlineAction;
import com.tuoheng.machine.events.AirportEvent;
import com.tuoheng.machine.status.AirportState;
import org.springframework.statemachine.StateContext;
import org.springframework.stereotype.Component;
+@Slf4j
@Component
public class DjiOnlineAction extends OnlineAction {
@@ -17,7 +20,7 @@ public class DjiOnlineAction extends OnlineAction {
@Override
public void execute(StateContext context) {
String machineId = (String) context.getExtendedState().getVariables().get("machineId");
- System.out.println(String.format("[DJI] 机巢上线: %s", machineId));
+ log.info("[DJI] 机巢上线: %s", machineId);
// DJI平台特定的上线逻辑
// 例如：初始化DJI SDK连接、注册设备等
}
diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/airport/DjiOpenDebugModeAction.java b/src/main/java/com/tuoheng/machine/platform/impl/dji/action/airport/DjiOpenDebugModeAction.java
index c703130..8a76f69 100644
--- a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/airport/DjiOpenDebugModeAction.java
+++ b/src/main/java/com/tuoheng/machine/platform/impl/dji/action/airport/DjiOpenDebugModeAction.java
@@ -1,11 +1,14 @@
package com.tuoheng.machine.platform.impl.dji.action.airport;
+import lombok.extern.slf4j.Slf4j;
+
import com.tuoheng.machine.action.debug.OpenDebugModeAction;
import com.tuoheng.machine.events.AirportEvent;
import com.tuoheng.machine.status.AirportState;
import org.springframework.statemachine.StateContext;
import org.springframework.stereotype.Component;
+@Slf4j
@Component
public class DjiOpenDebugModeAction extends OpenDebugModeAction {
@@ -17,6 +20,6 @@ public class DjiOpenDebugModeAction extends OpenDebugModeAction {
@Override
public void execute(StateContext context) {
String machineId = (String) context.getExtendedState().getVariables().get("machineId");
- System.out.println(String.format("[DJI] 开启调试模式: %s", machineId));
+ log.info("[DJI] 开启调试模式: %s", machineId);
}
}
diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/airport/DjiRebootAction.java b/src/main/java/com/tuoheng/machine/platform/impl/dji/action/airport/DjiRebootAction.java
index eeb758a..800bf64 100644
--- a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/airport/DjiRebootAction.java
+++ b/src/main/java/com/tuoheng/machine/platform/impl/dji/action/airport/DjiRebootAction.java
@@ -1,11 +1,14 @@
package com.tuoheng.machine.platform.impl.dji.action.airport;
+import lombok.extern.slf4j.Slf4j;
+
import com.tuoheng.machine.action.reboot.RebootAction;
import com.tuoheng.machine.events.AirportEvent;
import com.tuoheng.machine.status.AirportState;
import org.springframework.statemachine.StateContext;
import org.springframework.stereotype.Component;
+@Slf4j
@Component
public class DjiRebootAction extends RebootAction {
@@ -17,6 +20,6 @@ public class DjiRebootAction extends RebootAction {
@Override
public void execute(StateContext context) {
String machineId = (String) context.getExtendedState().getVariables().get("machineId");
- System.out.println(String.format("[DJI] 机巢重启: %s", machineId));
+ log.info("[DJI] 机巢重启: %s", machineId);
}
}
diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/airport/DjiRebootCompletedAction.java b/src/main/java/com/tuoheng/machine/platform/impl/dji/action/airport/DjiRebootCompletedAction.java
index 88359ed..b6ae3de 100644
--- a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/airport/DjiRebootCompletedAction.java
+++ b/src/main/java/com/tuoheng/machine/platform/impl/dji/action/airport/DjiRebootCompletedAction.java
@@ -1,11 +1,14 @@
package com.tuoheng.machine.platform.impl.dji.action.airport;
+import lombok.extern.slf4j.Slf4j;
+
import com.tuoheng.machine.action.reboot.RebootCompletedAction;
import com.tuoheng.machine.events.AirportEvent;
import com.tuoheng.machine.status.AirportState;
import org.springframework.statemachine.StateContext;
import org.springframework.stereotype.Component;
+@Slf4j
@Component
public class DjiRebootCompletedAction extends RebootCompletedAction {
@@ -17,6 +20,6 @@ public class DjiRebootCompletedAction extends RebootCompletedAction {
@Override
public void execute(StateContext context) {
String machineId = (String) context.getExtendedState().getVariables().get("machineId");
- System.out.println(String.format("[DJI] 重启完成: %s", machineId));
+ log.info("[DJI] 重启完成: %s", machineId);
}
}
diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/cover/DjiCloseCoverAction.java b/src/main/java/com/tuoheng/machine/platform/impl/dji/action/cover/DjiCloseCoverAction.java
index 9573547..6fc5dd7 100644
--- a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/cover/DjiCloseCoverAction.java
+++ b/src/main/java/com/tuoheng/machine/platform/impl/dji/action/cover/DjiCloseCoverAction.java
@@ -1,11 +1,14 @@
package com.tuoheng.machine.platform.impl.dji.action.cover;
+import lombok.extern.slf4j.Slf4j;
+
import com.tuoheng.machine.action.cover.CloseCoverAction;
import com.tuoheng.machine.events.CoverEvent;
import com.tuoheng.machine.status.CoverState;
import org.springframework.statemachine.StateContext;
import org.springframework.stereotype.Component;
+@Slf4j
@Component
public class DjiCloseCoverAction extends CloseCoverAction {
@@ -17,6 +20,6 @@ public class DjiCloseCoverAction extends CloseCoverAction {
@Override
public void execute(StateContext context) {
String machineId = (String) context.getExtendedState().getVariables().get("machineId");
- System.out.println(String.format("[DJI] 开始关舱: %s", machineId));
+ log.info("[DJI] 开始关舱: %s", machineId);
}
}
diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/cover/DjiCoverClosedAction.java b/src/main/java/com/tuoheng/machine/platform/impl/dji/action/cover/DjiCoverClosedAction.java
index 9429424..f6c8394 100644
--- a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/cover/DjiCoverClosedAction.java
+++ b/src/main/java/com/tuoheng/machine/platform/impl/dji/action/cover/DjiCoverClosedAction.java
@@ -1,11 +1,14 @@
package com.tuoheng.machine.platform.impl.dji.action.cover;
+import lombok.extern.slf4j.Slf4j;
+
import com.tuoheng.machine.action.cover.CoverClosedAction;
import com.tuoheng.machine.events.CoverEvent;
import com.tuoheng.machine.status.CoverState;
import org.springframework.statemachine.StateContext;
import org.springframework.stereotype.Component;
+@Slf4j
@Component
public class DjiCoverClosedAction extends CoverClosedAction {
@@ -17,6 +20,6 @@ public class DjiCoverClosedAction extends CoverClosedAction {
@Override
public void execute(StateContext context) {
String machineId = (String) context.getExtendedState().getVariables().get("machineId");
- System.out.println(String.format("[DJI] 舱门已关闭: %s", machineId));
+ log.info("[DJI] 舱门已关闭: %s", machineId);
}
}
diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/cover/DjiCoverErrorAction.java b/src/main/java/com/tuoheng/machine/platform/impl/dji/action/cover/DjiCoverErrorAction.java
index 5a91a68..1a27b6d 100644
--- a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/cover/DjiCoverErrorAction.java
+++ b/src/main/java/com/tuoheng/machine/platform/impl/dji/action/cover/DjiCoverErrorAction.java
@@ -1,11 +1,14 @@
package com.tuoheng.machine.platform.impl.dji.action.cover;
+import lombok.extern.slf4j.Slf4j;
+
import com.tuoheng.machine.events.CoverEvent;
import com.tuoheng.machine.platform.strategy.PlatformAction;
import com.tuoheng.machine.status.CoverState;
import org.springframework.statemachine.StateContext;
import org.springframework.stereotype.Component;
+@Slf4j
@Component
public class DjiCoverErrorAction implements PlatformAction {
@@ -17,6 +20,6 @@ public class DjiCoverErrorAction implements PlatformAction context) {
String machineId = (String) context.getExtendedState().getVariables().get("machineId");
- System.out.println(String.format("[DJI] 舱门错误: %s", machineId));
+ log.info("[DJI] 舱门错误: %s", machineId);
}
}
diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/cover/DjiCoverOpenedAction.java b/src/main/java/com/tuoheng/machine/platform/impl/dji/action/cover/DjiCoverOpenedAction.java
index 4d20c54..5d3a796 100644
--- a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/cover/DjiCoverOpenedAction.java
+++ b/src/main/java/com/tuoheng/machine/platform/impl/dji/action/cover/DjiCoverOpenedAction.java
@@ -1,11 +1,14 @@
package com.tuoheng.machine.platform.impl.dji.action.cover;
+import lombok.extern.slf4j.Slf4j;
+
import com.tuoheng.machine.action.cover.CoverOpenedAction;
import com.tuoheng.machine.events.CoverEvent;
import com.tuoheng.machine.status.CoverState;
import org.springframework.statemachine.StateContext;
import org.springframework.stereotype.Component;
+@Slf4j
@Component
public class DjiCoverOpenedAction extends CoverOpenedAction {
@@ -17,6 +20,6 @@ public class DjiCoverOpenedAction extends CoverOpenedAction {
@Override
public void execute(StateContext context) {
String machineId = (String) context.getExtendedState().getVariables().get("machineId");
- System.out.println(String.format("[DJI] 舱门已打开: %s", machineId));
+ log.info("[DJI] 舱门已打开: %s", machineId);
}
}
diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/cover/DjiCoverResetAction.java b/src/main/java/com/tuoheng/machine/platform/impl/dji/action/cover/DjiCoverResetAction.java
index eaee4b4..48b3049 100644
--- a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/cover/DjiCoverResetAction.java
+++ b/src/main/java/com/tuoheng/machine/platform/impl/dji/action/cover/DjiCoverResetAction.java
@@ -1,11 +1,14 @@
package com.tuoheng.machine.platform.impl.dji.action.cover;
+import lombok.extern.slf4j.Slf4j;
+
import com.tuoheng.machine.events.CoverEvent;
import com.tuoheng.machine.platform.strategy.PlatformAction;
import com.tuoheng.machine.status.CoverState;
import org.springframework.statemachine.StateContext;
import org.springframework.stereotype.Component;
+@Slf4j
@Component
public class DjiCoverResetAction implements PlatformAction {
@@ -17,6 +20,6 @@ public class DjiCoverResetAction implements PlatformAction context) {
String machineId = (String) context.getExtendedState().getVariables().get("machineId");
- System.out.println(String.format("[DJI] 舱门重置: %s", machineId));
+ log.info("[DJI] 舱门重置: %s", machineId);
}
}
diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/cover/DjiOpenCoverAction.java b/src/main/java/com/tuoheng/machine/platform/impl/dji/action/cover/DjiOpenCoverAction.java
index 5ae889c..0c7a373 100644
--- a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/cover/DjiOpenCoverAction.java
+++ b/src/main/java/com/tuoheng/machine/platform/impl/dji/action/cover/DjiOpenCoverAction.java
@@ -1,11 +1,14 @@
package com.tuoheng.machine.platform.impl.dji.action.cover;
+import lombok.extern.slf4j.Slf4j;
+
import com.tuoheng.machine.action.cover.OpenCoverAction;
import com.tuoheng.machine.events.CoverEvent;
import com.tuoheng.machine.status.CoverState;
import org.springframework.statemachine.StateContext;
import org.springframework.stereotype.Component;
+@Slf4j
@Component
public class DjiOpenCoverAction extends OpenCoverAction {
@@ -17,7 +20,7 @@ public class DjiOpenCoverAction extends OpenCoverAction {
@Override
public void execute(StateContext context) {
String machineId = (String) context.getExtendedState().getVariables().get("machineId");
- System.out.println(String.format("[DJI] 开始开舱: %s", machineId));
+ log.info("[DJI] 开始开舱: %s", machineId);
// DJI平台特定的开舱逻辑
}
}
diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drc/DjiEnterAction.java b/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drc/DjiEnterAction.java
index 167476f..dc933a1 100644
--- a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drc/DjiEnterAction.java
+++ b/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drc/DjiEnterAction.java
@@ -1,11 +1,14 @@
package com.tuoheng.machine.platform.impl.dji.action.drc;
+import lombok.extern.slf4j.Slf4j;
+
import com.tuoheng.machine.action.drc.EnterAction;
import com.tuoheng.machine.events.DrcEvent;
import com.tuoheng.machine.status.DrcState;
import org.springframework.statemachine.StateContext;
import org.springframework.stereotype.Component;
+@Slf4j
@Component
public class DjiEnterAction extends EnterAction {
@@ -17,6 +20,6 @@ public class DjiEnterAction extends EnterAction {
@Override
public void execute(StateContext context) {
String machineId = (String) context.getExtendedState().getVariables().get("machineId");
- System.out.println(String.format("[DJI] 进入DRC模式: %s", machineId));
+ log.info("[DJI] 进入DRC模式: %s", machineId);
}
}
diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drc/DjiEnteredAction.java b/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drc/DjiEnteredAction.java
index b63c4d2..44856cd 100644
--- a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drc/DjiEnteredAction.java
+++ b/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drc/DjiEnteredAction.java
@@ -1,11 +1,14 @@
package com.tuoheng.machine.platform.impl.dji.action.drc;
+import lombok.extern.slf4j.Slf4j;
+
import com.tuoheng.machine.action.drc.EnteredAction;
import com.tuoheng.machine.events.DrcEvent;
import com.tuoheng.machine.status.DrcState;
import org.springframework.statemachine.StateContext;
import org.springframework.stereotype.Component;
+@Slf4j
@Component
public class DjiEnteredAction extends EnteredAction {
@@ -17,6 +20,6 @@ public class DjiEnteredAction extends EnteredAction {
@Override
public void execute(StateContext context) {
String machineId = (String) context.getExtendedState().getVariables().get("machineId");
- System.out.println(String.format("[DJI] 已进入DRC模式: %s", machineId));
+ log.info("[DJI] 已进入DRC模式: %s", machineId);
}
}
diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drc/DjiExitAction.java b/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drc/DjiExitAction.java
index fdff951..6100bbd 100644
--- a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drc/DjiExitAction.java
+++ b/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drc/DjiExitAction.java
@@ -1,11 +1,14 @@
package com.tuoheng.machine.platform.impl.dji.action.drc;
+import lombok.extern.slf4j.Slf4j;
+
import com.tuoheng.machine.action.drc.ExitAction;
import com.tuoheng.machine.events.DrcEvent;
import com.tuoheng.machine.status.DrcState;
import org.springframework.statemachine.StateContext;
import org.springframework.stereotype.Component;
+@Slf4j
@Component
public class DjiExitAction extends ExitAction {
@@ -17,6 +20,6 @@ public class DjiExitAction extends ExitAction {
@Override
public void execute(StateContext context) {
String machineId = (String) context.getExtendedState().getVariables().get("machineId");
- System.out.println(String.format("[DJI] 退出DRC模式: %s", machineId));
+ log.info("[DJI] 退出DRC模式: %s", machineId);
}
}
diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drc/DjiExitedAction.java b/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drc/DjiExitedAction.java
index d8620d1..77c31b8 100644
--- a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drc/DjiExitedAction.java
+++ b/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drc/DjiExitedAction.java
@@ -1,11 +1,14 @@
package com.tuoheng.machine.platform.impl.dji.action.drc;
+import lombok.extern.slf4j.Slf4j;
+
import com.tuoheng.machine.action.drc.ExitedAction;
import com.tuoheng.machine.events.DrcEvent;
import com.tuoheng.machine.status.DrcState;
import org.springframework.statemachine.StateContext;
import org.springframework.stereotype.Component;
+@Slf4j
@Component
public class DjiExitedAction extends ExitedAction {
@@ -17,6 +20,6 @@ public class DjiExitedAction extends ExitedAction {
@Override
public void execute(StateContext context) {
String machineId = (String) context.getExtendedState().getVariables().get("machineId");
- System.out.println(String.format("[DJI] 已退出DRC模式: %s", machineId));
+ log.info("[DJI] 已退出DRC模式: %s", machineId);
}
}
diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiArriveAction.java b/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiArriveAction.java
index ed91026..be611a0 100644
--- a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiArriveAction.java
+++ b/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiArriveAction.java
@@ -1,11 +1,14 @@
package com.tuoheng.machine.platform.impl.dji.action.drone;
+import lombok.extern.slf4j.Slf4j;
+
import com.tuoheng.machine.action.drone.ArriveAction;
import com.tuoheng.machine.events.DroneEvent;
import com.tuoheng.machine.status.DroneState;
import org.springframework.statemachine.StateContext;
import org.springframework.stereotype.Component;
+@Slf4j
@Component
public class DjiArriveAction extends ArriveAction {
@@ -17,6 +20,6 @@ public class DjiArriveAction extends ArriveAction {
@Override
public void execute(StateContext context) {
String machineId = (String) context.getExtendedState().getVariables().get("machineId");
- System.out.println(String.format("[DJI] 无人机到达目的地: %s", machineId));
+ log.info("[DJI] 无人机到达目的地: %s", machineId);
}
}
diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiCancelPointAction.java b/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiCancelPointAction.java
index 096e1c0..6b3be09 100644
--- a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiCancelPointAction.java
+++ b/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiCancelPointAction.java
@@ -1,11 +1,14 @@
package com.tuoheng.machine.platform.impl.dji.action.drone;
+import lombok.extern.slf4j.Slf4j;
+
import com.tuoheng.machine.action.drone.CancelPointAction;
import com.tuoheng.machine.events.DroneEvent;
import com.tuoheng.machine.status.DroneState;
import org.springframework.statemachine.StateContext;
import org.springframework.stereotype.Component;
+@Slf4j
@Component
public class DjiCancelPointAction extends CancelPointAction {
@@ -17,6 +20,6 @@ public class DjiCancelPointAction extends CancelPointAction {
@Override
public void execute(StateContext context) {
String machineId = (String) context.getExtendedState().getVariables().get("machineId");
- System.out.println(String.format("[DJI] 无人机取消指点: %s", machineId));
+ log.info("[DJI] 无人机取消指点: %s", machineId);
}
}
diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiDroneOfflineAction.java b/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiDroneOfflineAction.java
index 1404aa8..4326ef0 100644
--- a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiDroneOfflineAction.java
+++ b/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiDroneOfflineAction.java
@@ -1,11 +1,14 @@
package com.tuoheng.machine.platform.impl.dji.action.drone;
+import lombok.extern.slf4j.Slf4j;
+
import com.tuoheng.machine.action.drone.OfflineAction;
import com.tuoheng.machine.events.DroneEvent;
import com.tuoheng.machine.status.DroneState;
import org.springframework.statemachine.StateContext;
import org.springframework.stereotype.Component;
+@Slf4j
@Component
public class DjiDroneOfflineAction extends OfflineAction {
@@ -17,6 +20,6 @@ public class DjiDroneOfflineAction extends OfflineAction {
@Override
public void execute(StateContext context) {
String machineId = (String) context.getExtendedState().getVariables().get("machineId");
- System.out.println(String.format("[DJI] 无人机离线: %s", machineId));
+ log.info("[DJI] 无人机离线: %s", machineId);
}
}
diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiEmergencyStopAction.java b/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiEmergencyStopAction.java
index e96b082..61774c1 100644
--- a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiEmergencyStopAction.java
+++ b/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiEmergencyStopAction.java
@@ -1,11 +1,14 @@
package com.tuoheng.machine.platform.impl.dji.action.drone;
+import lombok.extern.slf4j.Slf4j;
+
import com.tuoheng.machine.action.drone.EmergencyStopAction;
import com.tuoheng.machine.events.DroneEvent;
import com.tuoheng.machine.status.DroneState;
import org.springframework.statemachine.StateContext;
import org.springframework.stereotype.Component;
+@Slf4j
@Component
public class DjiEmergencyStopAction extends EmergencyStopAction {
@@ -17,6 +20,6 @@ public class DjiEmergencyStopAction extends EmergencyStopAction {
@Override
public void execute(StateContext context) {
String machineId = (String) context.getExtendedState().getVariables().get("machineId");
- System.out.println(String.format("[DJI] 无人机急停: %s", machineId));
+ log.info("[DJI] 无人机急停: %s", machineId);
}
}
diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiPointFlyingCompletedAction.java b/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiPointFlyingCompletedAction.java
index 805c22d..c47594c 100644
--- a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiPointFlyingCompletedAction.java
+++ b/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiPointFlyingCompletedAction.java
@@ -1,11 +1,14 @@
package com.tuoheng.machine.platform.impl.dji.action.drone;
+import lombok.extern.slf4j.Slf4j;
+
import com.tuoheng.machine.action.drone.PointFlyingCompletedAction;
import com.tuoheng.machine.events.DroneEvent;
import com.tuoheng.machine.status.DroneState;
import org.springframework.statemachine.StateContext;
import org.springframework.stereotype.Component;
+@Slf4j
@Component
public class DjiPointFlyingCompletedAction extends PointFlyingCompletedAction {
@@ -17,6 +20,6 @@ public class DjiPointFlyingCompletedAction extends PointFlyingCompletedAction {
@Override
public void execute(StateContext context) {
String machineId = (String) context.getExtendedState().getVariables().get("machineId");
- System.out.println(String.format("[DJI] 无人机指点飞行完成: %s", machineId));
+ log.info("[DJI] 无人机指点飞行完成: %s", machineId);
}
}
diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiPointPrepareCompletedAction.java b/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiPointPrepareCompletedAction.java
index 66f735b..5798800 100644
--- a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiPointPrepareCompletedAction.java
+++ b/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiPointPrepareCompletedAction.java
@@ -1,11 +1,14 @@
package com.tuoheng.machine.platform.impl.dji.action.drone;
+import lombok.extern.slf4j.Slf4j;
+
import com.tuoheng.machine.action.drone.PointPrepareCompletedAction;
import com.tuoheng.machine.events.DroneEvent;
import com.tuoheng.machine.status.DroneState;
import org.springframework.statemachine.StateContext;
import org.springframework.stereotype.Component;
+@Slf4j
@Component
public class DjiPointPrepareCompletedAction extends PointPrepareCompletedAction {
@@ -17,6 +20,6 @@ public class DjiPointPrepareCompletedAction extends PointPrepareCompletedAction
@Override
public void execute(StateContext context) {
String machineId = (String) context.getExtendedState().getVariables().get("machineId");
- System.out.println(String.format("[DJI] 无人机指点准备完成: %s", machineId));
+ log.info("[DJI] 无人机指点准备完成: %s", machineId);
}
}
diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiPointToFlyingAction.java b/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiPointToFlyingAction.java
index 4413d81..f44bf6e 100644
--- a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiPointToFlyingAction.java
+++ b/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiPointToFlyingAction.java
@@ -1,11 +1,14 @@
package com.tuoheng.machine.platform.impl.dji.action.drone;
+import lombok.extern.slf4j.Slf4j;
+
import com.tuoheng.machine.action.drone.PointToFlyingAction;
import com.tuoheng.machine.events.DroneEvent;
import com.tuoheng.machine.status.DroneState;
import org.springframework.statemachine.StateContext;
import org.springframework.stereotype.Component;
+@Slf4j
@Component
public class DjiPointToFlyingAction extends PointToFlyingAction {
@@ -17,6 +20,6 @@ public class DjiPointToFlyingAction extends PointToFlyingAction {
@Override
public void execute(StateContext context) {
String machineId = (String) context.getExtendedState().getVariables().get("machineId");
- System.out.println(String.format("[DJI] 无人机从指点返回飞行: %s", machineId));
+ log.info("[DJI] 无人机从指点返回飞行: %s", machineId);
}
}
diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiPointToReturnAction.java b/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiPointToReturnAction.java
index 07e3606..d51aabd 100644
--- a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiPointToReturnAction.java
+++ b/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiPointToReturnAction.java
@@ -1,11 +1,14 @@
package com.tuoheng.machine.platform.impl.dji.action.drone;
+import lombok.extern.slf4j.Slf4j;
+
import com.tuoheng.machine.action.drone.PointToReturnAction;
import com.tuoheng.machine.events.DroneEvent;
import com.tuoheng.machine.status.DroneState;
import org.springframework.statemachine.StateContext;
import org.springframework.stereotype.Component;
+@Slf4j
@Component
public class DjiPointToReturnAction extends PointToReturnAction {
@@ -17,6 +20,6 @@ public class DjiPointToReturnAction extends PointToReturnAction {
@Override
public void execute(StateContext context) {
String machineId = (String) context.getExtendedState().getVariables().get("machineId");
- System.out.println(String.format("[DJI] 无人机从指点开始返航: %s", machineId));
+ log.info("[DJI] 无人机从指点开始返航: %s", machineId);
}
}
diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiPrepareCompletedAction.java b/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiPrepareCompletedAction.java
index 75c749e..9c20175 100644
--- a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiPrepareCompletedAction.java
+++ b/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiPrepareCompletedAction.java
@@ -1,11 +1,14 @@
package com.tuoheng.machine.platform.impl.dji.action.drone;
+import lombok.extern.slf4j.Slf4j;
+
import com.tuoheng.machine.action.drone.PrepareCompletedAction;
import com.tuoheng.machine.events.DroneEvent;
import com.tuoheng.machine.status.DroneState;
import org.springframework.statemachine.StateContext;
import org.springframework.stereotype.Component;
+@Slf4j
@Component
public class DjiPrepareCompletedAction extends PrepareCompletedAction {
@@ -17,6 +20,6 @@ public class DjiPrepareCompletedAction extends PrepareCompletedAction {
@Override
public void execute(StateContext context) {
String machineId = (String) context.getExtendedState().getVariables().get("machineId");
- System.out.println(String.format("[DJI] 无人机准备完成: %s", machineId));
+ log.info("[DJI] 无人机准备完成: %s", machineId);
}
}
diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiResumeFlyingAction.java b/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiResumeFlyingAction.java
index e179ff0..6efe0c9 100644
--- a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiResumeFlyingAction.java
+++ b/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiResumeFlyingAction.java
@@ -1,11 +1,14 @@
package com.tuoheng.machine.platform.impl.dji.action.drone;
+import lombok.extern.slf4j.Slf4j;
+
import com.tuoheng.machine.action.drone.ResumeFlyingAction;
import com.tuoheng.machine.events.DroneEvent;
import com.tuoheng.machine.status.DroneState;
import org.springframework.statemachine.StateContext;
import org.springframework.stereotype.Component;
+@Slf4j
@Component
public class DjiResumeFlyingAction extends ResumeFlyingAction {
@@ -17,6 +20,6 @@ public class DjiResumeFlyingAction extends ResumeFlyingAction {
@Override
public void execute(StateContext context) {
String machineId = (String) context.getExtendedState().getVariables().get("machineId");
- System.out.println(String.format("[DJI] 无人机恢复飞行: %s", machineId));
+ log.info("[DJI] 无人机恢复飞行: %s", machineId);
}
}
diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiResumeReturnAction.java b/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiResumeReturnAction.java
index b0c3eaf..d5267ee 100644
--- a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiResumeReturnAction.java
+++ b/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiResumeReturnAction.java
@@ -1,11 +1,14 @@
package com.tuoheng.machine.platform.impl.dji.action.drone;
+import lombok.extern.slf4j.Slf4j;
+
import com.tuoheng.machine.action.drone.ResumeReturnAction;
import com.tuoheng.machine.events.DroneEvent;
import com.tuoheng.machine.status.DroneState;
import org.springframework.statemachine.StateContext;
import org.springframework.stereotype.Component;
+@Slf4j
@Component
public class DjiResumeReturnAction extends ResumeReturnAction {
@@ -17,6 +20,6 @@ public class DjiResumeReturnAction extends ResumeReturnAction {
@Override
public void execute(StateContext context) {
String machineId = (String) context.getExtendedState().getVariables().get("machineId");
- System.out.println(String.format("[DJI] 无人机恢复返航: %s", machineId));
+ log.info("[DJI] 无人机恢复返航: %s", machineId);
}
}
diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiReturnCompletedAction.java b/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiReturnCompletedAction.java
index 345ac06..ee9b148 100644
--- a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiReturnCompletedAction.java
+++ b/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiReturnCompletedAction.java
@@ -1,11 +1,14 @@
package com.tuoheng.machine.platform.impl.dji.action.drone;
+import lombok.extern.slf4j.Slf4j;
+
import com.tuoheng.machine.action.drone.ReturnCompletedAction;
import com.tuoheng.machine.events.DroneEvent;
import com.tuoheng.machine.status.DroneState;
import org.springframework.statemachine.StateContext;
import org.springframework.stereotype.Component;
+@Slf4j
@Component
public class DjiReturnCompletedAction extends ReturnCompletedAction {
@@ -17,6 +20,6 @@ public class DjiReturnCompletedAction extends ReturnCompletedAction {
@Override
public void execute(StateContext context) {
String machineId = (String) context.getExtendedState().getVariables().get("machineId");
- System.out.println(String.format("[DJI] 无人机返航完成: %s", machineId));
+ log.info("[DJI] 无人机返航完成: %s", machineId);
}
}
diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiReturnEmergencyStopAction.java b/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiReturnEmergencyStopAction.java
index 1012d35..0004a9e 100644
--- a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiReturnEmergencyStopAction.java
+++ b/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiReturnEmergencyStopAction.java
@@ -1,11 +1,14 @@
package com.tuoheng.machine.platform.impl.dji.action.drone;
+import lombok.extern.slf4j.Slf4j;
+
import com.tuoheng.machine.action.drone.ReturnEmergencyStopAction;
import com.tuoheng.machine.events.DroneEvent;
import com.tuoheng.machine.status.DroneState;
import org.springframework.statemachine.StateContext;
import org.springframework.stereotype.Component;
+@Slf4j
@Component
public class DjiReturnEmergencyStopAction extends ReturnEmergencyStopAction {
@@ -17,6 +20,6 @@ public class DjiReturnEmergencyStopAction extends ReturnEmergencyStopAction {
@Override
public void execute(StateContext context) {
String machineId = (String) context.getExtendedState().getVariables().get("machineId");
- System.out.println(String.format("[DJI] 无人机返航急停: %s", machineId));
+ log.info("[DJI] 无人机返航急停: %s", machineId);
}
}
diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiStartFlyingAction.java b/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiStartFlyingAction.java
index dde1ed6..3562939 100644
--- a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiStartFlyingAction.java
+++ b/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiStartFlyingAction.java
@@ -1,11 +1,14 @@
package com.tuoheng.machine.platform.impl.dji.action.drone;
+import lombok.extern.slf4j.Slf4j;
+
import com.tuoheng.machine.action.drone.StartFlyingAction;
import com.tuoheng.machine.events.DroneEvent;
import com.tuoheng.machine.status.DroneState;
import org.springframework.statemachine.StateContext;
import org.springframework.stereotype.Component;
+@Slf4j
@Component
public class DjiStartFlyingAction extends StartFlyingAction {
@@ -17,6 +20,6 @@ public class DjiStartFlyingAction extends StartFlyingAction {
@Override
public void execute(StateContext context) {
String machineId = (String) context.getExtendedState().getVariables().get("machineId");
- System.out.println(String.format("[DJI] 无人机开始飞行: %s", machineId));
+ log.info("[DJI] 无人机开始飞行: %s", machineId);
}
}
diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiStartPointingAction.java b/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiStartPointingAction.java
index 9eb3d12..96d69f1 100644
--- a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiStartPointingAction.java
+++ b/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiStartPointingAction.java
@@ -1,11 +1,14 @@
package com.tuoheng.machine.platform.impl.dji.action.drone;
+import lombok.extern.slf4j.Slf4j;
+
import com.tuoheng.machine.action.drone.StartPointingAction;
import com.tuoheng.machine.events.DroneEvent;
import com.tuoheng.machine.status.DroneState;
import org.springframework.statemachine.StateContext;
import org.springframework.stereotype.Component;
+@Slf4j
@Component
public class DjiStartPointingAction extends StartPointingAction {
@@ -17,6 +20,6 @@ public class DjiStartPointingAction extends StartPointingAction {
@Override
public void execute(StateContext context) {
String machineId = (String) context.getExtendedState().getVariables().get("machineId");
- System.out.println(String.format("[DJI] 无人机开始指点操作: %s", machineId));
+ log.info("[DJI] 无人机开始指点操作: %s", machineId);
}
}
diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiStartPrepareAction.java b/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiStartPrepareAction.java
index 6c82c24..6647737 100644
--- a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiStartPrepareAction.java
+++ b/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiStartPrepareAction.java
@@ -1,11 +1,14 @@
package com.tuoheng.machine.platform.impl.dji.action.drone;
+import lombok.extern.slf4j.Slf4j;
+
import com.tuoheng.machine.action.drone.StartPrepareAction;
import com.tuoheng.machine.events.DroneEvent;
import com.tuoheng.machine.status.DroneState;
import org.springframework.statemachine.StateContext;
import org.springframework.stereotype.Component;
+@Slf4j
@Component
public class DjiStartPrepareAction extends StartPrepareAction {
@@ -17,6 +20,6 @@ public class DjiStartPrepareAction extends StartPrepareAction {
@Override
public void execute(StateContext context) {
String machineId = (String) context.getExtendedState().getVariables().get("machineId");
- System.out.println(String.format("[DJI] 无人机开始准备: %s", machineId));
+ log.info("[DJI] 无人机开始准备: %s", machineId);
}
}
diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiStartReturnAction.java b/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiStartReturnAction.java
index 3cac2f7..9e1083e 100644
--- a/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiStartReturnAction.java
+++ b/src/main/java/com/tuoheng/machine/platform/impl/dji/action/drone/DjiStartReturnAction.java
@@ -1,11 +1,14 @@
package com.tuoheng.machine.platform.impl.dji.action.drone;
+import lombok.extern.slf4j.Slf4j;
+
import com.tuoheng.machine.action.drone.StartReturnAction;
import com.tuoheng.machine.events.DroneEvent;
import com.tuoheng.machine.status.DroneState;
import org.springframework.statemachine.StateContext;
import org.springframework.stereotype.Component;
+@Slf4j
@Component
public class DjiStartReturnAction extends StartReturnAction {
@@ -17,6 +20,6 @@ public class DjiStartReturnAction extends StartReturnAction {
@Override
public void execute(StateContext context) {
String machineId = (String) context.getExtendedState().getVariables().get("machineId");
- System.out.println(String.format("[DJI] 无人机开始返航: %s", machineId));
+ log.info("[DJI] 无人机开始返航: %s", machineId);
}
}
diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/guard/airport/DjiCanCloseDebugModeGuard.java b/src/main/java/com/tuoheng/machine/platform/impl/dji/guard/airport/DjiCanCloseDebugModeGuard.java
index 24c0075..1221a89 100644
--- a/src/main/java/com/tuoheng/machine/platform/impl/dji/guard/airport/DjiCanCloseDebugModeGuard.java
+++ b/src/main/java/com/tuoheng/machine/platform/impl/dji/guard/airport/DjiCanCloseDebugModeGuard.java
@@ -1,11 +1,14 @@
package com.tuoheng.machine.platform.impl.dji.guard.airport;
+import lombok.extern.slf4j.Slf4j;
+
import com.tuoheng.machine.guard.debug.CanCloseDebugModeGuard;
import com.tuoheng.machine.events.AirportEvent;
import com.tuoheng.machine.status.AirportState;
import org.springframework.statemachine.StateContext;
import org.springframework.stereotype.Component;
+@Slf4j
@Component
public class DjiCanCloseDebugModeGuard extends CanCloseDebugModeGuard {
@@ -16,7 +19,7 @@ public class DjiCanCloseDebugModeGuard extends CanCloseDebugModeGuard {
@Override
public boolean evaluate(StateContext context) {
- System.out.println("[DJI] 检查是否可以关闭调试模式");
+ log.info("[DJI] 检查是否可以关闭调试模式");
return true;
}
}
diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/guard/airport/DjiCanOfflineGuard.java b/src/main/java/com/tuoheng/machine/platform/impl/dji/guard/airport/DjiCanOfflineGuard.java
index 01d66dd..c865d1c 100644
--- a/src/main/java/com/tuoheng/machine/platform/impl/dji/guard/airport/DjiCanOfflineGuard.java
+++ b/src/main/java/com/tuoheng/machine/platform/impl/dji/guard/airport/DjiCanOfflineGuard.java
@@ -1,11 +1,14 @@
package com.tuoheng.machine.platform.impl.dji.guard.airport;
+import lombok.extern.slf4j.Slf4j;
+
import com.tuoheng.machine.guard.airport.CanOfflineGuard;
import com.tuoheng.machine.events.AirportEvent;
import com.tuoheng.machine.status.AirportState;
import org.springframework.statemachine.StateContext;
import org.springframework.stereotype.Component;
+@Slf4j
@Component
public class DjiCanOfflineGuard extends CanOfflineGuard {
@@ -16,7 +19,7 @@ public class DjiCanOfflineGuard extends CanOfflineGuard {
@Override
public boolean evaluate(StateContext context) {
- System.out.println("[DJI] 检查机巢是否可以离线");
+ log.info("[DJI] 检查机巢是否可以离线");
return true;
}
}
diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/guard/airport/DjiCanOnlineGuard.java b/src/main/java/com/tuoheng/machine/platform/impl/dji/guard/airport/DjiCanOnlineGuard.java
index b792820..a72d74f 100644
--- a/src/main/java/com/tuoheng/machine/platform/impl/dji/guard/airport/DjiCanOnlineGuard.java
+++ b/src/main/java/com/tuoheng/machine/platform/impl/dji/guard/airport/DjiCanOnlineGuard.java
@@ -1,5 +1,7 @@
package com.tuoheng.machine.platform.impl.dji.guard.airport;
+import lombok.extern.slf4j.Slf4j;
+
import com.tuoheng.machine.guard.airport.CanOnlineGuard;
import com.tuoheng.machine.events.AirportEvent;
import com.tuoheng.machine.status.AirportState;
@@ -9,6 +11,7 @@ import org.springframework.stereotype.Component;
/**
* DJI平台 - 机巢上线Guard
*/
+@Slf4j
@Component
public class DjiCanOnlineGuard extends CanOnlineGuard {
@@ -20,7 +23,7 @@ public class DjiCanOnlineGuard extends CanOnlineGuard {
@Override
public boolean evaluate(StateContext context) {
// DJI平台特定的上线检查逻辑
- System.out.println("[DJI] 检查机巢是否可以上线");
+ log.info("[DJI] 检查机巢是否可以上线");
// 这里可以添加DJI平台特定的检查逻辑，例如：
// - 检查DJI设备连接状态
// - 检查DJI固件版本
diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/guard/airport/DjiIsDebugModeGuard.java b/src/main/java/com/tuoheng/machine/platform/impl/dji/guard/airport/DjiIsDebugModeGuard.java
index 2d1306e..495529f 100644
--- a/src/main/java/com/tuoheng/machine/platform/impl/dji/guard/airport/DjiIsDebugModeGuard.java
+++ b/src/main/java/com/tuoheng/machine/platform/impl/dji/guard/airport/DjiIsDebugModeGuard.java
@@ -1,11 +1,14 @@
package com.tuoheng.machine.platform.impl.dji.guard.airport;
+import lombok.extern.slf4j.Slf4j;
+
import com.tuoheng.machine.guard.debug.IsDebugModeGuard;
import com.tuoheng.machine.events.AirportEvent;
import com.tuoheng.machine.status.AirportState;
import org.springframework.statemachine.StateContext;
import org.springframework.stereotype.Component;
+@Slf4j
@Component
public class DjiIsDebugModeGuard extends IsDebugModeGuard {
@@ -16,7 +19,7 @@ public class DjiIsDebugModeGuard extends IsDebugModeGuard {
@Override
public boolean evaluate(StateContext context) {
- System.out.println("[DJI] 检查是否处于调试模式");
+ log.info("[DJI] 检查是否处于调试模式");
return true;
}
}
diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/guard/airport/DjiIsNotDebugModeGuard.java b/src/main/java/com/tuoheng/machine/platform/impl/dji/guard/airport/DjiIsNotDebugModeGuard.java
index e83b1cb..4bc16e9 100644
--- a/src/main/java/com/tuoheng/machine/platform/impl/dji/guard/airport/DjiIsNotDebugModeGuard.java
+++ b/src/main/java/com/tuoheng/machine/platform/impl/dji/guard/airport/DjiIsNotDebugModeGuard.java
@@ -1,11 +1,14 @@
package com.tuoheng.machine.platform.impl.dji.guard.airport;
+import lombok.extern.slf4j.Slf4j;
+
import com.tuoheng.machine.guard.debug.IsNotDebugModeGuard;
import com.tuoheng.machine.events.AirportEvent;
import com.tuoheng.machine.status.AirportState;
import org.springframework.statemachine.StateContext;
import org.springframework.stereotype.Component;
+@Slf4j
@Component
public class DjiIsNotDebugModeGuard extends IsNotDebugModeGuard {
@@ -16,7 +19,7 @@ public class DjiIsNotDebugModeGuard extends IsNotDebugModeGuard {
@Override
public boolean evaluate(StateContext context) {
- System.out.println("[DJI] 检查是否不在调试模式");
+ log.info("[DJI] 检查是否不在调试模式");
return true;
}
}
diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/guard/airport/DjiIsRebootCompletedGuard.java b/src/main/java/com/tuoheng/machine/platform/impl/dji/guard/airport/DjiIsRebootCompletedGuard.java
index d5ca806..44be09e 100644
--- a/src/main/java/com/tuoheng/machine/platform/impl/dji/guard/airport/DjiIsRebootCompletedGuard.java
+++ b/src/main/java/com/tuoheng/machine/platform/impl/dji/guard/airport/DjiIsRebootCompletedGuard.java
@@ -1,11 +1,14 @@
package com.tuoheng.machine.platform.impl.dji.guard.airport;
+import lombok.extern.slf4j.Slf4j;
+
import com.tuoheng.machine.guard.reboot.IsRebootCompletedGuard;
import com.tuoheng.machine.events.AirportEvent;
import com.tuoheng.machine.status.AirportState;
import org.springframework.statemachine.StateContext;
import org.springframework.stereotype.Component;
+@Slf4j
@Component
public class DjiIsRebootCompletedGuard extends IsRebootCompletedGuard {
@@ -16,7 +19,7 @@ public class DjiIsRebootCompletedGuard extends IsRebootCompletedGuard {
@Override
public boolean evaluate(StateContext context) {
- System.out.println("[DJI] 检查重启是否完成");
+ log.info("[DJI] 检查重启是否完成");
return true;
}
}
diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/guard/cover/DjiCanCloseCoverGuard.java b/src/main/java/com/tuoheng/machine/platform/impl/dji/guard/cover/DjiCanCloseCoverGuard.java
index f8fa5bf..422a311 100644
--- a/src/main/java/com/tuoheng/machine/platform/impl/dji/guard/cover/DjiCanCloseCoverGuard.java
+++ b/src/main/java/com/tuoheng/machine/platform/impl/dji/guard/cover/DjiCanCloseCoverGuard.java
@@ -1,11 +1,14 @@
package com.tuoheng.machine.platform.impl.dji.guard.cover;
+import lombok.extern.slf4j.Slf4j;
+
import com.tuoheng.machine.guard.cover.CanCloseCoverGuard;
import com.tuoheng.machine.events.CoverEvent;
import com.tuoheng.machine.status.CoverState;
import org.springframework.statemachine.StateContext;
import org.springframework.stereotype.Component;
+@Slf4j
@Component
public class DjiCanCloseCoverGuard extends CanCloseCoverGuard {
@@ -16,7 +19,7 @@ public class DjiCanCloseCoverGuard extends CanCloseCoverGuard {
@Override
public boolean evaluate(StateContext context) {
- System.out.println("[DJI] 检查舱门是否可以关闭");
+ log.info("[DJI] 检查舱门是否可以关闭");
return true;
}
}
diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/guard/cover/DjiCanOpenCoverGuard.java b/src/main/java/com/tuoheng/machine/platform/impl/dji/guard/cover/DjiCanOpenCoverGuard.java
index d5fd30f..b5593dd 100644
--- a/src/main/java/com/tuoheng/machine/platform/impl/dji/guard/cover/DjiCanOpenCoverGuard.java
+++ b/src/main/java/com/tuoheng/machine/platform/impl/dji/guard/cover/DjiCanOpenCoverGuard.java
@@ -1,11 +1,14 @@
package com.tuoheng.machine.platform.impl.dji.guard.cover;
+import lombok.extern.slf4j.Slf4j;
+
import com.tuoheng.machine.guard.cover.CanOpenCoverGuard;
import com.tuoheng.machine.events.CoverEvent;
import com.tuoheng.machine.status.CoverState;
import org.springframework.statemachine.StateContext;
import org.springframework.stereotype.Component;
+@Slf4j
@Component
public class DjiCanOpenCoverGuard extends CanOpenCoverGuard {
@@ -16,7 +19,7 @@ public class DjiCanOpenCoverGuard extends CanOpenCoverGuard {
@Override
public boolean evaluate(StateContext context) {
- System.out.println("[DJI] 检查舱门是否可以打开");
+ log.info("[DJI] 检查舱门是否可以打开");
return true;
}
}
diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/guard/cover/DjiIsCoverClosedGuard.java b/src/main/java/com/tuoheng/machine/platform/impl/dji/guard/cover/DjiIsCoverClosedGuard.java
index 727c17a..67098e2 100644
--- a/src/main/java/com/tuoheng/machine/platform/impl/dji/guard/cover/DjiIsCoverClosedGuard.java
+++ b/src/main/java/com/tuoheng/machine/platform/impl/dji/guard/cover/DjiIsCoverClosedGuard.java
@@ -1,11 +1,14 @@
package com.tuoheng.machine.platform.impl.dji.guard.cover;
+import lombok.extern.slf4j.Slf4j;
+
import com.tuoheng.machine.guard.cover.IsCoverClosedGuard;
import com.tuoheng.machine.events.CoverEvent;
import com.tuoheng.machine.status.CoverState;
import org.springframework.statemachine.StateContext;
import org.springframework.stereotype.Component;
+@Slf4j
@Component
public class DjiIsCoverClosedGuard extends IsCoverClosedGuard {
@@ -16,7 +19,7 @@ public class DjiIsCoverClosedGuard extends IsCoverClosedGuard {
@Override
public boolean evaluate(StateContext context) {
- System.out.println("[DJI] 检查舱门是否已关闭");
+ log.info("[DJI] 检查舱门是否已关闭");
return true;
}
}
diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/guard/cover/DjiIsCoverOpenedGuard.java b/src/main/java/com/tuoheng/machine/platform/impl/dji/guard/cover/DjiIsCoverOpenedGuard.java
index f9f8b4a..20e98ee 100644
--- a/src/main/java/com/tuoheng/machine/platform/impl/dji/guard/cover/DjiIsCoverOpenedGuard.java
+++ b/src/main/java/com/tuoheng/machine/platform/impl/dji/guard/cover/DjiIsCoverOpenedGuard.java
@@ -1,11 +1,14 @@
package com.tuoheng.machine.platform.impl.dji.guard.cover;
+import lombok.extern.slf4j.Slf4j;
+
import com.tuoheng.machine.guard.cover.IsCoverOpenedGuard;
import com.tuoheng.machine.events.CoverEvent;
import com.tuoheng.machine.status.CoverState;
import org.springframework.statemachine.StateContext;
import org.springframework.stereotype.Component;
+@Slf4j
@Component
public class DjiIsCoverOpenedGuard extends IsCoverOpenedGuard {
@@ -16,7 +19,7 @@ public class DjiIsCoverOpenedGuard extends IsCoverOpenedGuard {
@Override
public boolean evaluate(StateContext context) {
- System.out.println("[DJI] 检查舱门是否已打开");
+ log.info("[DJI] 检查舱门是否已打开");
return true;
}
}
diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/guard/drc/DjiCanEnterGuard.java b/src/main/java/com/tuoheng/machine/platform/impl/dji/guard/drc/DjiCanEnterGuard.java
index 543f0c7..59ad46d 100644
--- a/src/main/java/com/tuoheng/machine/platform/impl/dji/guard/drc/DjiCanEnterGuard.java
+++ b/src/main/java/com/tuoheng/machine/platform/impl/dji/guard/drc/DjiCanEnterGuard.java
@@ -1,5 +1,7 @@
package com.tuoheng.machine.platform.impl.dji.guard.drc;
+import lombok.extern.slf4j.Slf4j;
+
import com.tuoheng.machine.events.DrcEvent;
import com.tuoheng.machine.guard.drc.CanEnterGuard;
import com.tuoheng.machine.status.DrcState;
@@ -9,6 +11,7 @@ import org.springframework.stereotype.Component;
/**
* DJI平台：检查是否可以进入DRC模式
*/
+@Slf4j
@Component
public class DjiCanEnterGuard extends CanEnterGuard {
diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/guard/drc/DjiCanExitGuard.java b/src/main/java/com/tuoheng/machine/platform/impl/dji/guard/drc/DjiCanExitGuard.java
index 801819c..ead88ee 100644
--- a/src/main/java/com/tuoheng/machine/platform/impl/dji/guard/drc/DjiCanExitGuard.java
+++ b/src/main/java/com/tuoheng/machine/platform/impl/dji/guard/drc/DjiCanExitGuard.java
@@ -1,5 +1,7 @@
package com.tuoheng.machine.platform.impl.dji.guard.drc;
+import lombok.extern.slf4j.Slf4j;
+
import com.tuoheng.machine.events.DrcEvent;
import com.tuoheng.machine.guard.drc.CanExitGuard;
import com.tuoheng.machine.status.DrcState;
@@ -9,6 +11,7 @@ import org.springframework.stereotype.Component;
/**
* DJI平台：检查是否可以退出DRC模式
*/
+@Slf4j
@Component
public class DjiCanExitGuard extends CanExitGuard {
diff --git a/src/main/java/com/tuoheng/machine/platform/impl/dji/guard/drone/DjiCanPointGuard.java b/src/main/java/com/tuoheng/machine/platform/impl/dji/guard/drone/DjiCanPointGuard.java
index ebbc627..8bfe1b6 100644
--- a/src/main/java/com/tuoheng/machine/platform/impl/dji/guard/drone/DjiCanPointGuard.java
+++ b/src/main/java/com/tuoheng/machine/platform/impl/dji/guard/drone/DjiCanPointGuard.java
@@ -1,5 +1,7 @@
package com.tuoheng.machine.platform.impl.dji.guard.drone;
+import lombok.extern.slf4j.Slf4j;
+
import com.tuoheng.machine.events.DroneEvent;
import com.tuoheng.machine.guard.drone.CanPointGuard;
import com.tuoheng.machine.status.DroneState;
@@ -10,6 +12,7 @@ import org.springframework.stereotype.Component;
* DJI平台：检查无人机是否可以进行指点操作
* 注意：返航中不可以指点
*/
+@Slf4j
@Component
public class DjiCanPointGuard extends CanPointGuard {
@@ -24,7 +27,7 @@ public class DjiCanPointGuard extends CanPointGuard {
// 返航中不能指点
if (currentState == DroneState.RETURNING) {
- System.out.println("[DJI] 返航中不能进行指点操作");
+ log.info("[DJI] 返航中不能进行指点操作");
return false;
}
diff --git a/src/main/java/com/tuoheng/machine/repository/AirportPlatformRepository.java b/src/main/java/com/tuoheng/machine/repository/AirportPlatformRepository.java
index bbd26eb..ab44206 100644
--- a/src/main/java/com/tuoheng/machine/repository/AirportPlatformRepository.java
+++ b/src/main/java/com/tuoheng/machine/repository/AirportPlatformRepository.java
@@ -1,6 +1,7 @@
package com.tuoheng.machine.repository;
import com.tuoheng.machine.platform.PlatformType;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Repository;
import java.util.Map;
@@ -10,6 +11,7 @@ import java.util.concurrent.ConcurrentHashMap;
* 机巢平台映射仓储
* 模拟数据库查询，存储机巢SN到平台类型的映射关系
*/
+@Slf4j
@Repository
public class AirportPlatformRepository {
@@ -49,7 +51,7 @@ public class AirportPlatformRepository {
*/
public void savePlatformMapping(String airportSn, PlatformType platformType) {
airportPlatformMap.put(airportSn, platformType);
- System.out.println(String.format("保存平台映射: %s -> %s", airportSn, platformType.getName()));
+ log.info("保存平台映射: {} -> {}", airportSn, platformType.getName());
}
/**
@@ -59,7 +61,7 @@ public class AirportPlatformRepository {
*/
public void deletePlatformMapping(String airportSn) {
airportPlatformMap.remove(airportSn);
- System.out.println(String.format("删除平台映射: %s", airportSn));
+ log.info("删除平台映射: {}", airportSn);
}
/**
diff --git a/src/main/java/com/tuoheng/machine/service/AirportMachineService.java b/src/main/java/com/tuoheng/machine/service/AirportMachineService.java
index a0040c6..5d700a9 100644
--- a/src/main/java/com/tuoheng/machine/service/AirportMachineService.java
+++ b/src/main/java/com/tuoheng/machine/service/AirportMachineService.java
@@ -3,6 +3,7 @@ package com.tuoheng.machine.service;
import com.tuoheng.machine.events.AirportEvent;
import com.tuoheng.machine.redis.RedisStateStore;
import com.tuoheng.machine.status.AirportState;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.statemachine.StateMachine;
import org.springframework.statemachine.config.StateMachineFactory;
@@ -15,6 +16,7 @@ import java.util.concurrent.ConcurrentHashMap;
* 机巢状态机管理器
* 负责管理多个机巢的状态机实例
*/
+@Slf4j
@Component
public class AirportMachineService {
@@ -45,7 +47,7 @@ public class AirportMachineService {
// 不从 Redis 恢复旧状态，等待第一次心跳同步真实状态
// 这样可以避免服务器重启期间丢失心跳导致的状态不一致问题
stateMachine.start();
- System.out.println(String.format("创建并启动状态机: %s, 初始状态: UNKNOWN (等待心跳同步)", id));
+ log.info("创建并启动状态机: {}, 初始状态: UNKNOWN (等待心跳同步)", id);
return stateMachine;
});
}
@@ -69,7 +71,7 @@ public class AirportMachineService {
public AirportState getCurrentState(String airportSn) {
StateMachine stateMachine = stateMachineMap.get(airportSn);
if (stateMachine == null) {
- System.out.println("状态机不存在: " + airportSn);
+ log.warn("状态机不存在: {}", airportSn);
return null;
}
return stateMachine.getState().getId();
@@ -112,11 +114,11 @@ public class AirportMachineService {
if (result) {
// 持久化最新状态
redisStateStore.saveAirportState(airportSn, stateMachine.getState().getId());
- System.out.println(String.format("事件发送成功 - 机巢: %s, 事件: %s, 当前状态: %s",
- airportSn, event, getCurrentStates(airportSn)));
+ log.info("事件发送成功 - 机巢: {}, 事件: {}, 当前状态: {}",
+ airportSn, event, getCurrentStates(airportSn));
} else {
- System.out.println(String.format("事件发送失败 - 机巢: %s, 事件: %s, 当前状态: %s",
- airportSn, event, getCurrentStates(airportSn)));
+ log.warn("事件发送失败 - 机巢: {}, 事件: {}, 当前状态: {}",
+ airportSn, event, getCurrentStates(airportSn));
}
return result;
@@ -131,7 +133,7 @@ public class AirportMachineService {
StateMachine stateMachine = stateMachineMap.remove(airportSn);
if (stateMachine != null) {
stateMachine.stop();
- System.out.println("停止并移除状态机: " + airportSn);
+ log.info("停止并移除状态机: {}", airportSn);
}
}
@@ -186,6 +188,6 @@ public class AirportMachineService {
public void restartStateMachine(String airportSn) {
removeStateMachine(airportSn);
getOrCreateStateMachine(airportSn);
- System.out.println("重启状态机: " + airportSn);
+ log.info("重启状态机: {}", airportSn);
}
}
diff --git a/src/main/java/com/tuoheng/machine/service/CoverMachineService.java b/src/main/java/com/tuoheng/machine/service/CoverMachineService.java
index da31118..e6ac9c7 100644
--- a/src/main/java/com/tuoheng/machine/service/CoverMachineService.java
+++ b/src/main/java/com/tuoheng/machine/service/CoverMachineService.java
@@ -1,5 +1,7 @@
package com.tuoheng.machine.service;
+import lombok.extern.slf4j.Slf4j;
+
import com.tuoheng.machine.events.CoverEvent;
import com.tuoheng.machine.redis.RedisStateStore;
import com.tuoheng.machine.status.CoverState;
@@ -14,6 +16,7 @@ import java.util.concurrent.ConcurrentHashMap;
/**
* 舱门状态机管理器
*/
+@Slf4j
@Component
public class CoverMachineService {
@@ -32,7 +35,7 @@ public class CoverMachineService {
// 不从 Redis 恢复旧状态，等待第一次心跳同步真实状态
// 这样可以避免服务器重启期间丢失心跳导致的状态不一致问题
stateMachine.start();
- System.out.println(String.format("创建并启动舱门状态机: %s, 初始状态: UNKNOWN (等待心跳同步)", id));
+ log.info("创建并启动舱门状态机: %s, 初始状态: UNKNOWN (等待心跳同步)", id);
return stateMachine;
});
}
@@ -52,11 +55,11 @@ public class CoverMachineService {
if (result) {
// 持久化最新状态
redisStateStore.saveCoverState(airportSn, stateMachine.getState().getId());
- System.out.println(String.format("舱门事件发送成功 - 机巢: %s, 事件: %s, 当前状态: %s",
- airportSn, event, getCurrentState(airportSn)));
+ log.info("舱门事件发送成功 - 机巢: {}, 事件: {}, 当前状态: {}",
+ airportSn, event, getCurrentState(airportSn));
} else {
- System.out.println(String.format("舱门事件发送失败 - 机巢: %s, 事件: %s, 当前状态: %s",
- airportSn, event, getCurrentState(airportSn)));
+ log.error("舱门事件发送失败 - 机巢: {}, 事件: {}, 当前状态: {}",
+ airportSn, event, getCurrentState(airportSn));
}
return result;
@@ -74,7 +77,7 @@ public class CoverMachineService {
StateMachine stateMachine = stateMachineMap.remove(airportSn);
if (stateMachine != null) {
stateMachine.stop();
- System.out.println("停止并移除舱门状态机: " + airportSn);
+ log.info("停止并移除舱门状态机: {}", airportSn);
}
}
}
diff --git a/src/main/java/com/tuoheng/machine/service/DrcMachineService.java b/src/main/java/com/tuoheng/machine/service/DrcMachineService.java
index acf76ab..ec5c336 100644
--- a/src/main/java/com/tuoheng/machine/service/DrcMachineService.java
+++ b/src/main/java/com/tuoheng/machine/service/DrcMachineService.java
@@ -1,5 +1,7 @@
package com.tuoheng.machine.service;
+import lombok.extern.slf4j.Slf4j;
+
import com.tuoheng.machine.events.DrcEvent;
import com.tuoheng.machine.redis.RedisStateStore;
import com.tuoheng.machine.status.DrcState;
@@ -15,6 +17,7 @@ import java.util.concurrent.ConcurrentHashMap;
* DRC状态机管理器
* 负责管理多个机巢的DRC状态机实例
*/
+@Slf4j
@Component
public class DrcMachineService {
@@ -45,7 +48,7 @@ public class DrcMachineService {
// 不从 Redis 恢复旧状态，等待第一次心跳同步真实状态
// 这样可以避免服务器重启期间丢失心跳导致的状态不一致问题
stateMachine.start();
- System.out.println(String.format("创建并启动DRC状态机: %s, 初始状态: UNKNOWN (等待心跳同步)", id));
+ log.info("创建并启动DRC状态机: %s, 初始状态: UNKNOWN (等待心跳同步)", id);
return stateMachine;
});
}
@@ -69,7 +72,7 @@ public class DrcMachineService {
public DrcState getCurrentState(String airportSn) {
StateMachine stateMachine = stateMachineMap.get(airportSn);
if (stateMachine == null) {
- System.out.println("DRC状态机不存在: " + airportSn);
+ log.info("DRC状态机不存在: {}", airportSn);
return null;
}
return stateMachine.getState().getId();
@@ -112,11 +115,11 @@ public class DrcMachineService {
if (result) {
// 持久化最新状态
redisStateStore.saveDrcState(airportSn, stateMachine.getState().getId());
- System.out.println(String.format("DRC事件发送成功 - 机巢: %s, 事件: %s, 当前状态: %s",
- airportSn, event, getCurrentStates(airportSn)));
+ log.info("DRC事件发送成功 - 机巢: {}, 事件: {}, 当前状态: {}",
+ airportSn, event, getCurrentStates(airportSn));
} else {
- System.out.println(String.format("DRC事件发送失败 - 机巢: %s, 事件: %s, 当前状态: %s",
- airportSn, event, getCurrentStates(airportSn)));
+ log.error("DRC事件发送失败 - 机巢: {}, 事件: {}, 当前状态: {}",
+ airportSn, event, getCurrentStates(airportSn));
}
return result;
@@ -131,7 +134,7 @@ public class DrcMachineService {
StateMachine stateMachine = stateMachineMap.remove(airportSn);
if (stateMachine != null) {
stateMachine.stop();
- System.out.println("停止并移除DRC状态机: " + airportSn);
+ log.info("停止并移除DRC状态机: {}", airportSn);
}
}
@@ -186,6 +189,6 @@ public class DrcMachineService {
public void restartStateMachine(String airportSn) {
removeStateMachine(airportSn);
getOrCreateStateMachine(airportSn);
- System.out.println("重启DRC状态机: " + airportSn);
+ log.info("重启DRC状态机: {}", airportSn);
}
}
diff --git a/src/main/java/com/tuoheng/machine/service/DroneMachineService.java b/src/main/java/com/tuoheng/machine/service/DroneMachineService.java
index 5ed33fb..9ac2c1b 100644
--- a/src/main/java/com/tuoheng/machine/service/DroneMachineService.java
+++ b/src/main/java/com/tuoheng/machine/service/DroneMachineService.java
@@ -1,5 +1,7 @@
package com.tuoheng.machine.service;
+import lombok.extern.slf4j.Slf4j;
+
import com.tuoheng.machine.events.DroneEvent;
import com.tuoheng.machine.redis.RedisStateStore;
import com.tuoheng.machine.status.DroneState;
@@ -15,6 +17,7 @@ import java.util.concurrent.ConcurrentHashMap;
* 无人机状态机管理器
* 负责管理多个无人机的状态机实例
*/
+@Slf4j
@Component
public class DroneMachineService {
@@ -45,7 +48,7 @@ public class DroneMachineService {
// 不从 Redis 恢复旧状态，等待第一次心跳同步真实状态
// 这样可以避免服务器重启期间丢失心跳导致的状态不一致问题
stateMachine.start();
- System.out.println(String.format("创建并启动状态机: %s, 初始状态: UNKNOWN (等待心跳同步)", id));
+ log.info("创建并启动状态机: %s, 初始状态: UNKNOWN (等待心跳同步)", id);
return stateMachine;
});
}
@@ -69,7 +72,7 @@ public class DroneMachineService {
public DroneState getCurrentState(String droneSn) {
StateMachine stateMachine = stateMachineMap.get(droneSn);
if (stateMachine == null) {
- System.out.println("状态机不存在: " + droneSn);
+ log.info("状态机不存在: {}", droneSn);
return null;
}
return stateMachine.getState().getId();
@@ -112,11 +115,11 @@ public class DroneMachineService {
if (result) {
// 持久化最新状态
redisStateStore.saveDroneState(droneSn, stateMachine.getState().getId());
- System.out.println(String.format("事件发送成功 - 无人机: %s, 事件: %s, 当前状态: %s",
- droneSn, event, getCurrentStates(droneSn)));
+ log.info("事件发送成功 - 无人机: {}, 事件: {}, 当前状态: {}",
+ droneSn, event, getCurrentStates(droneSn));
} else {
- System.out.println(String.format("事件发送失败 - 无人机: %s, 事件: %s, 当前状态: %s",
- droneSn, event, getCurrentStates(droneSn)));
+ log.error("事件发送失败 - 无人机: {}, 事件: {}, 当前状态: {}",
+ droneSn, event, getCurrentStates(droneSn));
}
return result;
@@ -131,7 +134,7 @@ public class DroneMachineService {
StateMachine stateMachine = stateMachineMap.remove(droneSn);
if (stateMachine != null) {
stateMachine.stop();
- System.out.println("停止并移除状态机: " + droneSn);
+ log.info("停止并移除状态机: {}", droneSn);
}
}
@@ -186,6 +189,6 @@ public class DroneMachineService {
public void restartStateMachine(String droneSn) {
removeStateMachine(droneSn);
getOrCreateStateMachine(droneSn);
- System.out.println("重启状态机: " + droneSn);
+ log.info("重启状态机: {}", droneSn);
}
}
\ No newline at end of file