From 1791d8d45a0f6de527a1e243b9ba806edc0753aa Mon Sep 17 00:00:00 2001
From: Xiajijian <1176061145@qq.com>
Date: Thu, 06 Nov 2025 14:32:14 +0800
Subject: [PATCH] 1.修改文件业务，屏蔽前台接口开关。 2.文件夹业务修改为，分组管理业务。 3.航线(kmz)对象增加分组ID。 4.分组信息删除同时删除分组下航信信息。 5.新增航线(kmz)时，不选分组，将赋值默认分组信息。 6.增加初始化数据类。 7.生成kmz文件，增加默认值管理。
---
ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInformationServiceImpl.java | 76 ++++++++++++++++++++++++++++++++++++-
1 files changed, 73 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 fcb9d7d..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
@@ -2,13 +2,23 @@
import java.util.List;
import com.ard.common.utils.DateUtils;
+import com.ard.common.utils.file.FileUtils;
import com.ard.common.utils.uuid.IdUtils;
+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;
/**
* 航线(kmz)Service业务层处理
@@ -24,6 +34,9 @@
@Autowired
private OssServiceContext ossService;
+
+ @Autowired
+ private UavRouteService routeService;
/**
* 查询航线(kmz)
@@ -54,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();
}
/**
@@ -83,7 +106,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);
}
@@ -99,4 +122,51 @@
return ardRouteInformationMapper.deleteArdRouteInformationById(id);
}
+ /**
+ * 导入航线(kmz)文件
+ *
+ * @param file 文件
+ * @return 结果
+ */
+ @Override
+ public MinioUploadResult uploadArdRouteInformation(MultipartFile file) {
+ try {
+ String url = ossService.upload("kmz",file);
+ ArdRouteInformation information = new ArdRouteInformation();
+ information.setFileName(file.getOriginalFilename());
+ information.setFileNameNew(getFileNameWithoutExtension(url));
+ information.setMinioUpPath(extractFilePath(url));
+ information.setUpPath(url);
+ information.setUpFileSize((double) file.getSize());
+ insertRouteInformation(information);
+ return MinioUploadResult.builder()
+ .url(url)
+ .newFileName(FileUtils.getName(url))
+ .originalFilename(file.getOriginalFilename())
+ .build();
+ }catch (Exception e){
+ return null;
+ }
+ }
+
+ /**
+ * 根据文件名称查询航线信息
+ *
+ * @param name 文件名称
+ * @return 结果
+ */
+ @Override
+ public ArdRouteInformation selectArdRouteInformationByName(String name) {
+ return ardRouteInformationMapper.selectArdRouteInformationByName(name);
+ }
+
+ /**
+ * 数据新增航线信息
+ */
+ private void insertRouteInformation(ArdRouteInformation ardRouteInformation){
+ ardRouteInformation.setId(IdUtils.simpleUUID());
+ ardRouteInformation.setCreateTime(DateUtils.getNowDate());
+ ardRouteInformationMapper.insertArdRouteInformation(ardRouteInformation);
+ }
+
}
--
Gitblit v1.9.3