From b3b96cfd900c3dee5dc84e53d5677fc6642f85e6 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Thu, 18 Dec 2025 09:55:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java | 148 ++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 114 insertions(+), 34 deletions(-)
diff --git a/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java b/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java
index 3e110ea..97f5cd3 100644
--- a/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java
+++ b/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java
@@ -12,9 +12,9 @@
import com.ard.data.noflyzone.domain.Vertex;
import com.ard.data.noflyzone.service.IArdNoFlyZoneService;
import com.ard.data.noflyzone.utils.NoFlyZoneUtils;
+import com.ard.framework.web.service.TokenService;
import com.ard.oss.model.MinioUploadResult;
import com.ard.oss.service.impl.OssServiceContext;
-import com.ard.ossdock.service.impl.OssDockServiceContext;
import com.ard.route.domain.djuav.ActionGroupReq;
import com.ard.route.domain.djuav.PointActionReq;
import com.ard.route.domain.djuav.RoutePointReq;
@@ -29,13 +29,18 @@
import com.ard.work.domain.dto.state.PointData;
import com.ard.work.domain.dto.wayline.*;
import com.ard.work.service.ITyService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
+import static com.ard.route.enums.kml.DroneEnumValueEnums.M350_RTK;
+import static com.ard.route.util.InitializationUtils.divided_23;
import static com.ard.route.util.ToolUtils.*;
+import static com.ard.route.util.UavRouteReqUtils.fileConversionEntity;
/**
* 航线(kmz)Service业务层处理
@@ -46,14 +51,14 @@
@Service
public class ArdRouteInfoServiceImpl implements IArdRouteInfoService {
+ private static final Logger log = LoggerFactory.getLogger(TokenService.class);
+
@Autowired
private ArdRouteInfoMapper ardRouteInfoMapper;
@Autowired
private OssServiceContext ossService;
- @Autowired
- private OssDockServiceContext ossDockService;
@Autowired
private UavRouteService routeService;
@@ -80,7 +85,20 @@
} catch (IOException | ClassNotFoundException e) {
throw new RuntimeException(e);
}
+
+ // 主逻辑优化
+ double altitudeOffset = getDoublePoint(ardRouteInfo.getUavRouteReq().getTakeOffRefPoint(), "alt");
+
+ for (RoutePointReq routePointReq : ardRouteInfo.getUavRouteReq().getRoutePointList()) {
+ // 调整航点高度
+ adjustRoutePointHeight(routePointReq, altitudeOffset);
+ }
return ardRouteInfo;
+ }
+
+ // 提取航点高度调整逻辑到方法中
+ private void adjustRoutePointHeight(RoutePointReq routePointReq, double altitudeOffset) {
+ routePointReq.setHeight(routePointReq.getHeight() + altitudeOffset);
}
/**
@@ -113,20 +131,23 @@
if (ardRouteInfo.getGroupId() == null){
ardRouteInfo.setGroupId("0");
}
- // 航线数据
- byte[] routeData;
- try {
- routeData = serialize(ardRouteInfo.getUavRouteReq());
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
ardRouteInfo.getUavRouteReq().setDroneType(subStringDroneType(ardRouteInfo.getAircraft()));
- ardRouteInfo.setRouteData(routeData);
- KmzResultVo kmzResult = routeService.buildKmz(ardRouteInfo.getUavRouteReq(), ardRouteInfo.getName());
+ KmzResultVo kmzResult = routeService.buildKmz(ardRouteInfo.getUavRouteReq(),ardRouteInfo.getName());
+ if (M350_RTK.getValue().equals(ardRouteInfo.getUavRouteReq().getDroneType())) {
+ // 变焦数值加工
+ for (RoutePointReq routePointReq : ardRouteInfo.getUavRouteReq().getRoutePointList()) {
+ for (ActionGroupReq actionGroupReq : routePointReq.getActionGroupList()) {
+ for (PointActionReq action : actionGroupReq.getActions()) {
+ if (action.getZoom() != null){
+ action.setZoom(divided_23(action.getZoom()));
+ }
+ }
+ }
+ }
+ }
ardRouteInfo.setPath(kmzResult.getPath());
ardRouteInfo.setReadOnly("0");
- ardRouteInfo.setPointCount(getPointCount(ardRouteInfo));
- ardRouteInfoMapper.insertArdRouteInfo(ardRouteInfo);
+ ardRouteInfoMapper.insertArdRouteInfo(dataProcessing(ardRouteInfo));
return kmzResult.getPath();
}
@@ -144,23 +165,40 @@
KmzResultVo kmzResult;
// 获取源文件名字
ArdRouteInfo route = ardRouteInfoMapper.selectArdRouteInfoById(ardRouteInfo.getId());
- if (route.getName().equals(ardRouteInfo.getName())) {
- kmzResult = routeService.updateKmz(ardRouteInfo.getUavRouteReq(), ardRouteInfo.getName());
- }else {
- kmzResult = routeService.updateKmzNew(ardRouteInfo.getUavRouteReq(), route.getName(), ardRouteInfo.getName());
- }
+ // 先删除航线
+ delOssService(route);
+ // 再生成航线
+ kmzResult = routeService.buildKmz(ardRouteInfo.getUavRouteReq(), ardRouteInfo.getName());
if ("更新航线kmz文件失败".equals(kmzResult.getData())) {
return 0;
}
ardRouteInfo.setPath(kmzResult.getPath());
}
- ardRouteInfo.setPointCount(getPointCount(ardRouteInfo));
- return ardRouteInfoMapper.updateArdRouteInfo(ardRouteInfo);
+ return ardRouteInfoMapper.updateArdRouteInfo(dataProcessing(ardRouteInfo));
}
+ // 新增信息加工
+ private ArdRouteInfo dataProcessing(ArdRouteInfo ardRouteInfo) {
+ // 航线数据
+ byte[] routeData = null;
+ try {
+ if (ardRouteInfo.getUavRouteReq() != null){
+ routeData = serialize(ardRouteInfo.getUavRouteReq());
+ }
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ ardRouteInfo.setRouteData(routeData);
+ ardRouteInfo.setPointCount(getPointCount(ardRouteInfo));
+ return ardRouteInfo;
+ }
+
+ // 获取行点总数
private Integer getPointCount(ArdRouteInfo ardRouteInfo) {
- if (ardRouteInfo.getUavRouteReq().getRoutePointList() != null) {
- return ardRouteInfo.getUavRouteReq().getRoutePointList().size();
+ if (ardRouteInfo.getUavRouteReq() != null){
+ if (ardRouteInfo.getUavRouteReq().getRoutePointList() != null) {
+ return ardRouteInfo.getUavRouteReq().getRoutePointList().size();
+ }
}
return 0;
}
@@ -176,9 +214,16 @@
// 删除航线(kmz)文件
for (String id : ids) {
ArdRouteInfo information = ardRouteInfoMapper.selectArdRouteInfoById(id);
- ossService.deleteObject("kmz", subStringMinioUrlName(information.getPath()));
+ delOssService(information);
}
return ardRouteInfoMapper.deleteArdRouteInfoByIds(ids);
+ }
+
+ // 删除minio文件
+ private void delOssService(ArdRouteInfo information){
+ if (information.getPath() != null){
+ ossService.deleteObject("kmz", subStringMinioUrlName(information.getPath()));
+ }
}
/**
@@ -201,23 +246,55 @@
@Override
public MinioUploadResult uploadArdRouteInfo(MultipartFile file) {
try {
- String url = ossService.upload("kmz",file);
- String urlDock = ossDockService.upload("kmz",file);
- ArdRouteInfo information = new ArdRouteInfo();
- information.setName(file.getOriginalFilename());
- information.setPath(url);
- information.setPath2(urlDock);
- information.setGroupId("0"); // 默认分组
- information.setReadOnly("1"); // 默认只读
// 增加航线实体类信息
- insertRouteInfomation(information);
+ UavRouteReq uavRouteReq = fileConversionEntity(file);
+ ArdRouteInfo ardRouteInfo = new ArdRouteInfo();
+ if (uavRouteReq != null){
+ ardRouteInfo.setUavRouteReq(uavRouteReq);
+ ardRouteInfo.setType(templateTypeData(uavRouteReq));
+ ardRouteInfo.setAircraft(droneTypeData(uavRouteReq));
+ }
+ String url = ossService.upload("kmz",file);
+ ardRouteInfo.setName(file.getOriginalFilename());
+ ardRouteInfo.setPath(url);
+ ardRouteInfo.setGroupId("0"); // 默认分组
+ ardRouteInfo.setReadOnly("1"); // 默认只读
+ insertRouteInfomation(ardRouteInfo);
return MinioUploadResult.builder()
.url(url)
.newFileName(FileUtils.getName(url))
.originalFilename(file.getOriginalFilename())
.build();
}catch (Exception e){
+ log.error("上传航线文件失败", e);
return null;
+ }
+ }
+
+ /**
+ * 判断一组数组，是否包含禁飞区
+ */
+ private void arrayWithinNoFlyZone(List<RoutePointReq> routePointList) {
+ if (routePointList == null || routePointList.isEmpty()) {
+ return;
+ }
+ // 检查第一个航点
+ ArdNoflyDto firstDto = new ArdNoflyDto();
+ firstDto.setTarget(new Vertex(
+ routePointList.get(0).getLongitude(),
+ routePointList.get(0).getLatitude()));
+ verifyNoFlyZone(firstDto);
+
+ // 检查后续航点及与前一个航点的线段
+ for (int i = 1; i < routePointList.size(); i++) {
+ ArdNoflyDto dto = new ArdNoflyDto();
+ dto.setCurrent(new Vertex(
+ routePointList.get(i - 1).getLongitude(),
+ routePointList.get(i - 1).getLatitude()));
+ dto.setTarget(new Vertex(
+ routePointList.get(i).getLongitude(),
+ routePointList.get(i).getLatitude()));
+ verifyNoFlyZone(dto);
}
}
@@ -269,6 +346,8 @@
} catch (IOException | ClassNotFoundException e) {
throw new RuntimeException(e);
}
+ // 判断禁飞区
+ arrayWithinNoFlyZone(route.getUavRouteReq().getRoutePointList());
// 1.2通过minio获取航线信息
// 2.将航线信息转换成对应实体类
WayLineUploadDTO wayLineUploadDTO = buildWayLineUploadDTO(route);
@@ -486,7 +565,8 @@
private void insertRouteInfomation(ArdRouteInfo ardRouteInfo){
ardRouteInfo.setId(IdUtils.simpleUUID());
ardRouteInfo.setCreateTime(DateUtils.getNowDate());
- ardRouteInfoMapper.insertArdRouteInfo(ardRouteInfo);
+ ardRouteInfo.setUpdateTime(DateUtils.getNowDate());
+ ardRouteInfoMapper.insertArdRouteInfo(dataProcessing(ardRouteInfo));
}
/**
--
Gitblit v1.9.3