From 4b97aecf414765f9b7058db9dab4cbf9b97eb84f Mon Sep 17 00:00:00 2001
From: Xiajijian <1176061145@qq.com>
Date: Sat, 13 Dec 2025 11:03:47 +0800
Subject: [PATCH] 1. 去掉path1相关业务逻辑。
---
ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java | 82 +++++++++++++++++++++++++++++++++-------
1 files changed, 67 insertions(+), 15 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 eb3795a..b8950f0 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,12 +29,16 @@
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.util.InitializationUtils.divided_23;
+import static com.ard.route.util.InitializationUtils.divided_6;
import static com.ard.route.util.ToolUtils.*;
import static com.ard.route.util.UavRouteReqUtils.fileConversionEntity;
@@ -47,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;
@@ -81,7 +85,23 @@
} catch (IOException | ClassNotFoundException e) {
throw new RuntimeException(e);
}
+ for (RoutePointReq routePointReq : ardRouteInfo.getUavRouteReq().getRoutePointList()) {
+ routePointReq.setHeight(routePointReq.getHeight() + getDoublePoint(ardRouteInfo.getUavRouteReq().getTakeOffRefPoint(),"alt"));
+ // 判断无人机类型
+ if (ardRouteInfo.getUavRouteReq().getDroneType().equals(89)){
+ for (ActionGroupReq actionGroupReq : routePointReq.getActionGroupList()) {
+ for (PointActionReq action : actionGroupReq.getActions()) {
+ action.setZoom(divided_23(action.getZoom()));
+ }
+ }
+ }
+ }
return ardRouteInfo;
+ }
+
+ // 变焦放大缩小
+ public void zoom(){
+
}
/**
@@ -97,6 +117,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 +141,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));
@@ -145,7 +171,6 @@
}
ardRouteInfo.setPath(kmzResult.getPath());
}
- ardRouteInfo.setReadOnly("0");
return ardRouteInfoMapper.updateArdRouteInfo(dataProcessing(ardRouteInfo));
}
@@ -196,9 +221,6 @@
if (information.getPath() != null){
ossService.deleteObject("kmz", subStringMinioUrlName(information.getPath()));
}
- if (information.getPath1() != null){
- ossDockService.deleteObject("kmz", subStringMinioUrlName(information.getPath1()));
- }
}
/**
@@ -229,18 +251,20 @@
ardRouteInfo.setType(templateTypeData(uavRouteReq));
ardRouteInfo.setAircraft(droneTypeData(uavRouteReq));
}
+
// 判断禁飞区
- List<RoutePointReq> routePointList = ardRouteInfo.getUavRouteReq().getRoutePointList();
- for (RoutePointReq routePointReq : routePointList) {
- ArdNoflyDto ardNoflyDto = new ArdNoflyDto();
- ardNoflyDto.setCurrent(new Vertex(routePointReq.getLongitude(), routePointReq.getLatitude()));
- verifyNoFlyZone(ardNoflyDto);
+ try {
+ arrayWithinNoFlyZone(ardRouteInfo.getUavRouteReq().getRoutePointList());
+ } catch (ControlException e) {
+ // 返回包含禁飞区错误信息的特定结果
+ return MinioUploadResult.builder()
+ .originalFilename("禁飞区错误.航线航点在禁飞区！")
+ .build();
}
+
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);
@@ -250,11 +274,39 @@
.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);
+ }
+ }
+
+ /**
* 根据名称查询航线信息
*
* @param name 文件名称
--
Gitblit v1.9.3