From ef497a4547843e1ade23d80f40bc682dca952ed0 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Thu, 06 Nov 2025 15:23:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInformationServiceImpl.java | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInformationServiceImpl.java b/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInformationServiceImpl.java
index d9a288a..36dd8dd 100644
--- a/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInformationServiceImpl.java
+++ b/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInformationServiceImpl.java
@@ -7,11 +7,15 @@
import com.ard.oss.model.MinioUploadResult;
import com.ard.oss.service.impl.OssServiceContext;
import com.ard.route.domain.route.ArdRouteInformation;
+import com.ard.route.domain.vo.KmzResultVo;
+import com.ard.route.service.UavRouteService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ard.route.mapper.ArdRouteInformationMapper;
import com.ard.route.service.IArdRouteInformationService;
import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
import static com.ard.route.util.ToolUtils.extractFilePath;
import static com.ard.route.util.ToolUtils.getFileNameWithoutExtension;
@@ -30,6 +34,9 @@
@Autowired
private OssServiceContext ossService;
+
+ @Autowired
+ private UavRouteService routeService;
/**
* 查询航线(kmz)
@@ -60,10 +67,20 @@
* @return 结果
*/
@Override
- public int insertArdRouteInformation(ArdRouteInformation ardRouteInformation) {
+ public String insertArdRouteInformation(ArdRouteInformation ardRouteInformation) {
ardRouteInformation.setId(IdUtils.simpleUUID());
ardRouteInformation.setCreateTime(DateUtils.getNowDate());
- return ardRouteInformationMapper.insertArdRouteInformation(ardRouteInformation);
+ if (ardRouteInformation.getFolderId() == null){
+ ardRouteInformation.setFolderId("0");
+ }
+ KmzResultVo kmzResult = routeService.buildKmz(ardRouteInformation.getUavRouteReq(), ardRouteInformation.getFileName());
+ // 将KmzResult中的信息设置到ardRouteInformation中
+ ardRouteInformation.setFileNameNew(kmzResult.getFileNameNew());
+ ardRouteInformation.setMinioUpPath(kmzResult.getMinioUpPath());
+ ardRouteInformation.setUpPath(kmzResult.getUpPath());
+ ardRouteInformation.setUpFileSize(kmzResult.getUpFileSize());
+ ardRouteInformationMapper.insertArdRouteInformation(ardRouteInformation);
+ return kmzResult.getUpPath();
}
/**
@@ -121,7 +138,7 @@
information.setMinioUpPath(extractFilePath(url));
information.setUpPath(url);
information.setUpFileSize((double) file.getSize());
- insertArdRouteInformation(information);
+ insertRouteInformation(information);
return MinioUploadResult.builder()
.url(url)
.newFileName(FileUtils.getName(url))
@@ -143,4 +160,13 @@
return ardRouteInformationMapper.selectArdRouteInformationByName(name);
}
+ /**
+ * 数据新增航线信息
+ */
+ private void insertRouteInformation(ArdRouteInformation ardRouteInformation){
+ ardRouteInformation.setId(IdUtils.simpleUUID());
+ ardRouteInformation.setCreateTime(DateUtils.getNowDate());
+ ardRouteInformationMapper.insertArdRouteInformation(ardRouteInformation);
+ }
+
}
--
Gitblit v1.9.3