From d622682904bb0a4b401db317e8d0b9fdf474e54b Mon Sep 17 00:00:00 2001
From: Xiajijian <1176061145@qq.com>
Date: Sat, 13 Dec 2025 09:00:17 +0800
Subject: [PATCH] 1. 修改发现BUG。
---
ard-route/src/main/java/com/ard/route/service/impl/UavRouteServiceImpl.java | 15 +++++++++++++++
ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java | 10 ----------
ard-route/src/main/java/com/ard/route/domain/vo/KmzResultVo.java | 3 +++
ard-system/src/main/resources/mapper/data/ArdTileMapper.xml | 6 +++---
4 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/ard-route/src/main/java/com/ard/route/domain/vo/KmzResultVo.java b/ard-route/src/main/java/com/ard/route/domain/vo/KmzResultVo.java
index 8ef3508..1df779f 100644
--- a/ard-route/src/main/java/com/ard/route/domain/vo/KmzResultVo.java
+++ b/ard-route/src/main/java/com/ard/route/domain/vo/KmzResultVo.java
@@ -8,6 +8,9 @@
/** 文件路径 */
private String path;
+ /** 文件路径 */
+ private String pathDock;
+
/** 返回数据 */
private String data;
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 1c9f028..522afd6 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
@@ -356,16 +356,6 @@
} catch (IOException | ClassNotFoundException e) {
throw new RuntimeException(e);
}
-
- // 判断禁飞区
- try {
- arrayWithinNoFlyZone(route.getUavRouteReq().getRoutePointList());
- } catch (ControlException e) {
- log.error("禁飞区错误.航线航点在禁飞区！", e);
- // 返回包含禁飞区错误信息的特定结果
- return false;
- }
-
// 1.2通过minio获取航线信息
// 2.将航线信息转换成对应实体类
WayLineUploadDTO wayLineUploadDTO = buildWayLineUploadDTO(route);
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 10f613c..648be05 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,6 +3,7 @@
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;
@@ -24,6 +25,7 @@
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;
@@ -48,6 +50,9 @@
@Resource
private OssServiceContext ossService;
+
+ @Resource
+ private OssDockServiceContext ossDockService;
@Resource
private IArdRouteInfoService ardRouteInformationService;
@@ -87,6 +92,10 @@
}
}
// 删除文件
+ 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) {
@@ -199,6 +208,12 @@
"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;
diff --git a/ard-system/src/main/resources/mapper/data/ArdTileMapper.xml b/ard-system/src/main/resources/mapper/data/ArdTileMapper.xml
index 73cec37..2ed3409 100644
--- a/ard-system/src/main/resources/mapper/data/ArdTileMapper.xml
+++ b/ard-system/src/main/resources/mapper/data/ArdTileMapper.xml
@@ -9,10 +9,10 @@
<result property="tilesName" column="tiles_name" />
<result property="tilesHeight" column="tiles_height" />
<result property="tileAddress" column="tile_address" />
- <result property="maximumScreenSpaceError" column="screen_space_error" />
+ <result property="maximumScreenSpaceError" column="maximum_screen_space_error" />
<result property="maximumMemoryUsage" column="maximum_memory_usage" />
- <result property="cullRequestsWhileMovingMultiplier" column="automatic_super_cleaning_model" />
- <result property="dynamicScreenSpaceErrorDensity" column="loading_speed" />
+ <result property="cullRequestsWhileMovingMultiplier" column="cull_requests_while_moving_multiplier" />
+ <result property="dynamicScreenSpaceErrorDensity" column="dynamic_screen_space_error_density" />
<result property="userId" column="user_id" />
<result property="deptId" column="dept_id" />
<result property="defaultLoading" column="default_loading" />
--
Gitblit v1.9.3