From 44dcd9db97538d3edb60ff3c152b91a7042261ad Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: Sat, 27 Dec 2025 10:26:03 +0800
Subject: [PATCH] 优化
---
ard-work/src/main/java/com/ard/work/service/impl/TyServiceImpl.java | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 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 e7f0880..147f4a8 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
@@ -33,6 +33,7 @@
import com.ard.work.domain.dto.BoxHistoryDTO;
import com.ard.work.domain.dto.BoxPhotosDTO;
import com.ard.work.domain.dto.BoxSettingsDTO;
+import com.ard.work.domain.dto.BoxVideosDTO;
import com.ard.work.domain.dto.camera.*;
import com.ard.work.domain.dto.control.AbsAngleControlDTO;
import com.ard.work.domain.dto.control.AngleControlDTO;
@@ -157,7 +158,7 @@
}
/**
- * 获取盒子图片
+ * 获取任务图片
*
* @return List<BoxPhotosReceiver>
*/
@@ -172,7 +173,22 @@
boxPhotosDTO);
return boxPhotos == null ? null : boxPhotos.getContent();
}
-
+ /**
+ * 获取任务视频
+ *
+ * @return List<BoxVideosReceiver>
+ */
+ @Override
+ public List<BoxVideosReceiver> getBoxVideos(BoxVideosDTO boxVideosDTO) {
+ String boxSn = boxVideosDTO.getBoxSn();
+ ArdDroneInfo ardDroneInfo = ardDroneService.selectArdDroneByboxSn(boxSn);
+ if (ardDroneInfo == null) {
+ throw new ControlException("未找到对应的飞行器信息,boxSn:{}" + boxSn);
+ }
+ TyHttpCommonReceiver<List<BoxVideosReceiver>> boxVideos = tyClient.getBoxVideos(ardDroneInfo.getServerId(),
+ boxVideosDTO);
+ return boxVideos == null ? null : boxVideos.getContent();
+ }
/**
* 修改云盒设置
*/
@@ -590,6 +606,10 @@
if (ardDroneInfo == null) {
throw new ControlException("未找到对应的飞行器信息,boxSn:{}" + boxSn);
}
+ //打点之前先停止打点
+ FlyPointControlCancelCmd flyPointControlCancelCmd = new FlyPointControlCancelCmd(FlyPointControlCancelDTO.builder().boxSn(boxSn).build());
+ this.sendMessage(ardDroneInfo.getServerId(), flyPointControlCancelCmd);
+
FlyPointControlCmd flyPointControlCmd = new FlyPointControlCmd(flyPointControlDTO);
this.sendMessage(ardDroneInfo.getServerId(), flyPointControlCmd);
return true;
@@ -958,7 +978,7 @@
// 处理无人机遥测消息
UavTelemetryDataCmd uavTelemetryDataCmd = (UavTelemetryDataCmd) tyCommand;
TelemetryData telemetryData = uavTelemetryDataCmd.getTelemetryData();
- telemetryData.setTimestamp(System.currentTimeMillis());//由于六合提供的状态时间戳不准，先以接收状态作为时间戳
+ //telemetryData.setTimestamp(System.currentTimeMillis());//由于六合提供的状态时间戳不准，先以接收状态作为时间戳
UavTelemetryDataCache.put(telemetryData);
//logPrint("无人机遥测", uavTelemetryDataCmd.getTelemetryData().getBoxSn());
//WebSocketUtil.sendMessageAll(uavTelemetryDataCmd.getTelemetryData());
--
Gitblit v1.9.3