From 8c94d8fb9b374cec4626ec01440fa077e62fa67e Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: Mon, 22 Dec 2025 09:18:39 +0800
Subject: [PATCH] 优化
---
ard-work/src/main/java/com/ard/work/service/impl/TyServiceImpl.java | 50 +++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 43 insertions(+), 7 deletions(-)
diff --git a/ard-work/src/main/java/com/ard/work/service/impl/TyServiceImpl.java b/ard-work/src/main/java/com/ard/work/service/impl/TyServiceImpl.java
index 84dfaab..a2eba51 100644
--- a/ard-work/src/main/java/com/ard/work/service/impl/TyServiceImpl.java
+++ b/ard-work/src/main/java/com/ard/work/service/impl/TyServiceImpl.java
@@ -14,7 +14,7 @@
import com.ard.work.component.netty.command.control.SpeedControlCmd;
import com.ard.work.component.netty.command.manual.*;
import com.ard.work.component.netty.command.notice.BoxPowerStatusReplyCmd;
-import com.ard.work.component.netty.command.notice.FlyWayEndReplyCmd;
+import com.ard.work.component.netty.command.notice.WayLineFinishedReplyCmd;
import com.ard.work.component.netty.command.notice.UavReadyReplyCmd;
import com.ard.work.component.netty.command.real.SignalInfoCmd;
import com.ard.work.component.netty.command.real.UavStateCmd;
@@ -26,10 +26,10 @@
import com.ard.work.component.netty.handler.ErrorCodeEnum;
import com.ard.work.component.netty.protobuf.TelemetryDataPB;
import com.ard.work.component.websocket.utils.WebSocketUtil;
+import com.ard.work.config.RouteStateMachineService;
import com.ard.work.domain.cache.UavSignalInfoCache;
import com.ard.work.domain.cache.UavStateCache;
import com.ard.work.domain.cache.UavTelemetryDataCache;
-import com.ard.work.domain.cache.UavWaylineCache;
import com.ard.work.domain.dto.BoxHistoryDTO;
import com.ard.work.domain.dto.BoxPhotosDTO;
import com.ard.work.domain.dto.BoxSettingsDTO;
@@ -49,17 +49,21 @@
import com.ard.work.domain.dto.wayline.*;
import com.ard.work.domain.entity.ArdDroneInfo;
import com.ard.work.domain.entity.ArdServerInfo;
+import com.ard.work.domain.enums.RouteEvent;
import com.ard.work.domain.message.ServerReplyMessage;
import com.ard.work.domain.message.UavControlType;
import com.ard.work.domain.receiver.*;
import com.ard.work.service.IArdDroneInfoService;
+import com.ard.work.service.IArdFlightTaskPartService;
import com.ard.work.service.IArdServerInfoService;
import com.ard.work.service.ITyService;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@@ -78,6 +82,10 @@
private IArdDroneInfoService ardDroneService;
@Resource
private TyClient tyClient;
+ @Autowired
+ private RouteStateMachineService stateMachineService;
+ @Autowired
+ private IArdFlightTaskPartService ardFlightTaskPartService;
/**
* 获取边缘服务器token信息
@@ -948,7 +956,9 @@
case (byte) 0xA9:
// 处理无人机遥测消息
UavTelemetryDataCmd uavTelemetryDataCmd = (UavTelemetryDataCmd) tyCommand;
- UavTelemetryDataCache.put(uavTelemetryDataCmd.getTelemetryData());
+ TelemetryData telemetryData = uavTelemetryDataCmd.getTelemetryData();
+ telemetryData.setTimestamp(System.currentTimeMillis());//由于六合提供的状态时间戳不准，先以接收状态作为时间戳
+ UavTelemetryDataCache.put(telemetryData);
//logPrint("无人机遥测", uavTelemetryDataCmd.getTelemetryData().getBoxSn());
//WebSocketUtil.sendMessageAll(uavTelemetryDataCmd.getTelemetryData());
break;
@@ -974,10 +984,6 @@
if (tyCommand instanceof CameraModeReplyCmd) {
CameraModeReplyCmd cameraModeReplyCommand = (CameraModeReplyCmd) tyCommand;
logPrint("无人机设置相机模式", cameraModeReplyCommand.getResult(), cameraModeReplyCommand.getErrorCode());
- }
- if (tyCommand instanceof FlyWayEndReplyCmd) {
- FlyWayEndReplyCmd flyWayEndReplyCmd = (FlyWayEndReplyCmd) tyCommand;
- logPrint("无人机飞行结束", flyWayEndReplyCmd.getResult(), flyWayEndReplyCmd.getErrorCode());
}
//格式化存储卡
if (tyCommand instanceof FormatSdCardReplyCmd) {
@@ -1044,23 +1050,53 @@
}
//开始航线回复
if (tyCommand instanceof WayLineBeginReplyCmd) {
+
WayLineBeginReplyCmd wayLineBeginReplyCmd = (WayLineBeginReplyCmd) tyCommand;
logPrint("开始航线", wayLineBeginReplyCmd.getResult(), wayLineBeginReplyCmd.getErrorCode());
+ if (wayLineBeginReplyCmd.getResult() == 0) {
+ byte[] boxSnBytes = tyCommand.getBoxSn();
+ String boxSn = new String(boxSnBytes);
+ stateMachineService.sendEvent(boxSn, RouteEvent.START_SUCCESS);
+ }
}
//暂停航线回复
if (tyCommand instanceof WayLinePauseReplyCmd) {
WayLinePauseReplyCmd wayLinePauseReplyCmd = (WayLinePauseReplyCmd) tyCommand;
logPrint("暂停航线", wayLinePauseReplyCmd.getResult(), wayLinePauseReplyCmd.getErrorCode());
+ if (wayLinePauseReplyCmd.getResult() == 0) {
+ byte[] boxSnBytes = tyCommand.getBoxSn();
+ String boxSn = new String(boxSnBytes);
+ stateMachineService.sendEvent(boxSn, RouteEvent.PAUSE_SUCCESS);
+ }
}
//恢复航线回复
if (tyCommand instanceof WayLineResumeReplyCmd) {
WayLineResumeReplyCmd wayLineResumeReplyCmd = (WayLineResumeReplyCmd) tyCommand;
logPrint("恢复航线", wayLineResumeReplyCmd.getResult(), wayLineResumeReplyCmd.getErrorCode());
+ if (wayLineResumeReplyCmd.getResult() == 0) {
+ byte[] boxSnBytes = tyCommand.getBoxSn();
+ String boxSn = new String(boxSnBytes);
+ stateMachineService.sendEvent(boxSn, RouteEvent.RESUME_SUCCESS);
+ }
}
//结束航线回复
if (tyCommand instanceof WayLineEndReplyCmd) {
WayLineEndReplyCmd wayLineEndReplyCmd = (WayLineEndReplyCmd) tyCommand;
logPrint("结束航线", wayLineEndReplyCmd.getResult(), wayLineEndReplyCmd.getErrorCode());
+ if (wayLineEndReplyCmd.getResult() == 0) {
+ byte[] boxSnBytes = tyCommand.getBoxSn();
+ String boxSn = new String(boxSnBytes);
+ stateMachineService.sendEvent(boxSn, RouteEvent.STOP_SUCCESS);
+ }
+ }
+ if (tyCommand instanceof WayLineFinishedReplyCmd) {
+ WayLineFinishedReplyCmd wayLineFinishedReplyCmd = (WayLineFinishedReplyCmd) tyCommand;
+ logPrint("航线执行完成", wayLineFinishedReplyCmd.getResult(), wayLineFinishedReplyCmd.getErrorCode());
+ if (wayLineFinishedReplyCmd.getResult() == 0) {
+ byte[] boxSnBytes = tyCommand.getBoxSn();
+ String boxSn = new String(boxSnBytes);
+ stateMachineService.sendEvent(boxSn, RouteEvent.RESET_ROUTE);
+ }
}
//设置返航高度回复
if (tyCommand instanceof ReturnHeightSettingReplyCmd) {
--
Gitblit v1.9.3