From 0083a82a5c090e2d75c6cafa5a686632b381c586 Mon Sep 17 00:00:00 2001
From: Xiajijian <1176061145@qq.com>
Date: Fri, 12 Dec 2025 08:57:37 +0800
Subject: [PATCH] 1. 测试航线修改发现bug。
---
ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java | 42 +++++++++++++++++++++++++++++-------------
1 files changed, 29 insertions(+), 13 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 b48775c..905d321 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
@@ -81,6 +81,9 @@
} catch (IOException | ClassNotFoundException e) {
throw new RuntimeException(e);
}
+ for (RoutePointReq routePointReq : ardRouteInfo.getUavRouteReq().getRoutePointList()) {
+ routePointReq.setHeight(routePointReq.getHeight() + getDoublePoint(ardRouteInfo.getUavRouteReq().getTakeOffRefPoint(),"alt"));
+ }
return ardRouteInfo;
}
@@ -97,6 +100,12 @@
}else if ("0".equals(ardRouteInfo.getOrderByTime())) {
ardRouteInfo.setOrderByTime("ASC");
}
+// List<ArdRouteInfo> list = ardRouteInfoMapper.selectArdRouteInfoList(ardRouteInfo);
+// for (ArdRouteInfo routeInfo : list) {
+// for (RoutePointReq routePointReq : routeInfo.getUavRouteReq().getRoutePointList()) {
+// routePointReq.setHeight(routePointReq.getHeight() + getDoublePoint(ardRouteInfo.getUavRouteReq().getTakeOffRefPoint(),"alt"));
+// }
+// }
return ardRouteInfoMapper.selectArdRouteInfoList(ardRouteInfo);
}
@@ -115,7 +124,7 @@
ardRouteInfo.setGroupId("0");
}
ardRouteInfo.getUavRouteReq().setDroneType(subStringDroneType(ardRouteInfo.getAircraft()));
- KmzResultVo kmzResult = routeService.buildKmz(ardRouteInfo.getUavRouteReq(), ardRouteInfo.getName());
+ KmzResultVo kmzResult = routeService.buildKmz(ardRouteInfo.getUavRouteReq(),ardRouteInfo.getName());
ardRouteInfo.setPath(kmzResult.getPath());
ardRouteInfo.setReadOnly("0");
ardRouteInfoMapper.insertArdRouteInfo(dataProcessing(ardRouteInfo));
@@ -221,22 +230,29 @@
@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.setPath1(urlDock);
- information.setGroupId("0"); // 默认分组
- information.setReadOnly("1"); // 默认只读
// 增加航线实体类信息
UavRouteReq uavRouteReq = fileConversionEntity(file);
+ ArdRouteInfo ardRouteInfo = new ArdRouteInfo();
if (uavRouteReq != null){
- information.setUavRouteReq(uavRouteReq);
- information.setType(templateTypeData(uavRouteReq));
- information.setAircraft(droneTypeData(uavRouteReq));
+ ardRouteInfo.setUavRouteReq(uavRouteReq);
+ ardRouteInfo.setType(templateTypeData(uavRouteReq));
+ ardRouteInfo.setAircraft(droneTypeData(uavRouteReq));
}
- insertRouteInfomation(information);
+ // 判断禁飞区
+// List<RoutePointReq> routePointList = ardRouteInfo.getUavRouteReq().getRoutePointList();
+// for (RoutePointReq routePointReq : routePointList) {
+// ArdNoflyDto ardNoflyDto = new ArdNoflyDto();
+// ardNoflyDto.setCurrent(new Vertex(routePointReq.getLongitude(), routePointReq.getLatitude()));
+// verifyNoFlyZone(ardNoflyDto);
+// }
+ String url = ossService.upload("kmz",file);
+ String urlDock = ossDockService.upload("kmz",file);
+ ardRouteInfo.setName(file.getOriginalFilename());
+ ardRouteInfo.setPath(url);
+ ardRouteInfo.setPath1(urlDock);
+ ardRouteInfo.setGroupId("0"); // 默认分组
+ ardRouteInfo.setReadOnly("1"); // 默认只读
+ insertRouteInfomation(ardRouteInfo);
return MinioUploadResult.builder()
.url(url)
.newFileName(FileUtils.getName(url))
--
Gitblit v1.9.3