From 04a270ff2b5919127524913ffc45c59c6c6d9201 Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: Wed, 22 Apr 2026 14:22:30 +0800
Subject: [PATCH] 增加部门区域管理业务和无人机实时位置所属区域推送
---
ard-work/src/main/java/com/ard/work/service/impl/TyServiceImpl.java | 30 +++++++++++++++++++++++-------
1 files changed, 23 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 c6a0d66..2fc7464 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
@@ -1,6 +1,7 @@
package com.ard.work.service.impl;
import com.ard.common.exception.ControlException;
+import com.ard.vtdu.config.MediamtxConfig;
import com.ard.work.aspect.annotation.CheckControlRight;
import com.ard.work.aspect.annotation.CheckDroneStatus;
import com.ard.work.aspect.annotation.CheckNoFlyZone;
@@ -85,9 +86,10 @@
private TyClient tyClient;
@Autowired
private RouteStateMachineService stateMachineService;
- @Autowired
- private IArdFlightTaskPartService ardFlightTaskPartService;
-
+ @Resource
+ private UavPositionChangeService uavPositionChangeService;
+ @Resource
+ private UavRegionDetectService uavRegionDetectService;
/**
* 获取边缘服务器token信息
*
@@ -606,6 +608,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;
@@ -633,6 +639,9 @@
/**
* 环绕飞行控制
*/
+// @CheckControlRight(UavControlType.FLY)
+// @CheckTakeoffAltitude
+// @CheckNoFlyZone
@Override
public Boolean FlyRoundControl(FlyRoundControlDTO flyRoundControlDTO) {
String boxSn = flyRoundControlDTO.getBoxSn();
@@ -819,10 +828,8 @@
throw new ControlException("未找到对应的飞行器信息,boxSn:{}" + boxSn);
}
//wayLineUploadDTO.setWayLineData(this.CreatePlanLineData());//设置航线数据
- System.out.println("wayLineUploadDTO:-----------------" + wayLineUploadDTO);
- log.info("打印数据 ++++ wayLineUploadDTO:-----------------" + wayLineUploadDTO);
+ log.info("打印航线上传数据 ++++++++ wayLineUploadDTO:~~~~~~~~~~~~~~~" + wayLineUploadDTO);
WayLineUploadCmd wayLineUploadCmd = new WayLineUploadCmd(wayLineUploadDTO);
- System.out.println("wayLineUploadCmd:-----------------" + wayLineUploadCmd);
this.sendMessage(ardDroneInfo.getServerId(), wayLineUploadCmd);
return true;
}
@@ -974,7 +981,16 @@
// 处理无人机遥测消息
UavTelemetryDataCmd uavTelemetryDataCmd = (UavTelemetryDataCmd) tyCommand;
TelemetryData telemetryData = uavTelemetryDataCmd.getTelemetryData();
- telemetryData.setTimestamp(System.currentTimeMillis());//由于六合提供的状态时间戳不准，先以接收状态作为时间戳
+
+ // 判断是否需要触发区域检测
+ if (uavPositionChangeService.shouldTriggerRegionCheck(telemetryData)) {
+ log.debug("无人机 {} 位置变化，触发区域检测", telemetryData.getBoxSn());
+ // 异步触发区域检测（不阻塞）
+ uavRegionDetectService.detectRegionAsync(telemetryData);
+ } else {
+ log.debug("无人机 {} 位置未变化，跳过区域检测", telemetryData.getBoxSn());
+ }
+
UavTelemetryDataCache.put(telemetryData);
//logPrint("无人机遥测", uavTelemetryDataCmd.getTelemetryData().getBoxSn());
//WebSocketUtil.sendMessageAll(uavTelemetryDataCmd.getTelemetryData());
--
Gitblit v1.9.3