From 9f3cd3d14b2025c79296ff6cbc49d7efe3302ec5 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Wed, 05 Nov 2025 16:58:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInformationServiceImpl.java | 37 ++++++++++++++++++++++++++++++++++---
1 files changed, 34 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 b9d2823..d7b9899 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,12 +7,17 @@
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;
/**
@@ -29,6 +34,9 @@
@Autowired
private OssServiceContext ossService;
+
+ @Autowired
+ private UavRouteService routeService;
/**
* 查询航线(kmz)
@@ -59,10 +67,21 @@
* @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.getUavRouteReq() != null){
+
+ }
+ 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();
}
/**
@@ -88,7 +107,7 @@
// 删除航线(kmz)文件
for (String id : ids) {
ArdRouteInformation information = ardRouteInformationMapper.selectArdRouteInformationById(id);
- ossService.deleteObject("kmz", information.getUpPath());
+ ossService.deleteObject("kmz", information.getMinioUpPath());
}
return ardRouteInformationMapper.deleteArdRouteInformationByIds(ids);
}
@@ -117,6 +136,7 @@
ArdRouteInformation information = new ArdRouteInformation();
information.setFileName(file.getOriginalFilename());
information.setFileNameNew(getFileNameWithoutExtension(url));
+ information.setMinioUpPath(extractFilePath(url));
information.setUpPath(url);
information.setUpFileSize((double) file.getSize());
insertArdRouteInformation(information);
@@ -130,4 +150,15 @@
}
}
+ /**
+ * 根据文件名称查询航线信息
+ *
+ * @param name 文件名称
+ * @return 结果
+ */
+ @Override
+ public ArdRouteInformation selectArdRouteInformationByName(String name) {
+ return ardRouteInformationMapper.selectArdRouteInformationByName(name);
+ }
+
}
--
Gitblit v1.9.3