From 1837824a37c1a9e6c77280862abed282e7ca61b9 Mon Sep 17 00:00:00 2001
From: Xiajijian <1176061145@qq.com>
Date: Wed, 24 Dec 2025 13:51:09 +0800
Subject: [PATCH] 1. 开始航线增肌航线id用于判断是否是单次执行航线业务。 2. 增加判断无人机，禁飞区逻辑。
---
ard-route/src/main/java/com/ard/route/service/impl/UavRouteServiceImpl.java | 17 +----------------
1 files changed, 1 insertions(+), 16 deletions(-)
diff --git a/ard-route/src/main/java/com/ard/route/service/impl/UavRouteServiceImpl.java b/ard-route/src/main/java/com/ard/route/service/impl/UavRouteServiceImpl.java
index 648be05..82fa244 100644
--- a/ard-route/src/main/java/com/ard/route/service/impl/UavRouteServiceImpl.java
+++ b/ard-route/src/main/java/com/ard/route/service/impl/UavRouteServiceImpl.java
@@ -3,7 +3,6 @@
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil;
import com.ard.oss.service.impl.OssServiceContext;
-import com.ard.ossdock.service.impl.OssDockServiceContext;
import com.ard.route.constant.FileTypeConstants;
import com.ard.route.domain.djuav.RoutePointReq;
import com.ard.route.domain.djuav.UavRouteReq;
@@ -25,7 +24,6 @@
import org.apache.commons.compress.archivers.zip.ZipArchiveInputStream;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.mock.web.MockMultipartFile;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
@@ -39,7 +37,6 @@
import static com.ard.route.util.RouteFileUtils.*;
import static com.ard.route.util.ToolUtils.*;
-import static com.ard.route.util.UavRouteReqUtils.kmzInfoVoToUavRouteReq;
/**
* Author:xia
@@ -50,9 +47,6 @@
@Resource
private OssServiceContext ossService;
-
- @Resource
- private OssDockServiceContext ossDockService;
@Resource
private IArdRouteInfoService ardRouteInformationService;
@@ -92,10 +86,6 @@
}
}
// 删除文件
- if ("100".equals(kmlInfo.getDocument().getKmlMissionConfig().getDroneInfo().getDroneEnumValue())
- ||"91".equals(kmlInfo.getDocument().getKmlMissionConfig().getDroneInfo().getDroneEnumValue())){
- ossDockService.deleteObject(kmzPath,minioUrlName);
- }
ossService.deleteObject(kmzPath, minioUrlName);
return buildKmzMethod(routeInformation.getName(), kmlInfo, wpmlInfo);
} catch (Exception e) {
@@ -208,12 +198,7 @@
"application/vnd.google-earth.kmz",
new ByteArrayInputStream(baos.toByteArray())
);
- // 通过无人机类型，判断上传文件
- if ("100".equals(kmlInfo.getDocument().getKmlMissionConfig().getDroneInfo().getDroneEnumValue())
- ||"91".equals(kmlInfo.getDocument().getKmlMissionConfig().getDroneInfo().getDroneEnumValue())){
- String kmzFilePathDock = ossDockService.upload(kmzPath,multipartFile);
- result.setPathDock(kmzFilePathDock);
- }
+ // 上传文件
String kmzFilePath = ossService.upload(kmzPath,multipartFile);
result.setPath(kmzFilePath);
return result;
--
Gitblit v1.9.3