THENG
/
a-tuoheng-airline
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix:优化导入逻辑，支持waypoints解析

This commit is contained in:
高大 2026-01-28 10:28:51 +08:00
parent a01ec7becd
commit 2202f4b034
1 changed files with 62 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/main/java/com/ruoyi/airline/service/impl/AirlineFileServiceImpl.java
View File

@ -1,6 +1,5 @@
package com.ruoyi.airline.service.impl;
import com.ruoyi.airline.api.domain.AirLinePointVO;
import com.ruoyi.airline.domain.api.IAirlineFileDomain;
import com.ruoyi.airline.domain.model.AirlineFile;
import com.ruoyi.airline.domain.model.kml.KmlInfo;
@ -24,7 +23,7 @@ import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Objects;
import java.util.UUID;
@ -66,6 +65,15 @@ public class AirlineFileServiceImpl implements IAirlineFileService {
@Override
public AirlineFileDTO parseAndUplload(MultipartFile file) {
String originalFilename = file.getOriginalFilename();
String fileExtension = "";
if (originalFilename != null && originalFilename.lastIndexOf('.') > 0) {
fileExtension = originalFilename.substring(originalFilename.lastIndexOf('.') + 1).toLowerCase();
}
try {
if ("zip".equals(fileExtension) || "kmz".equals(fileExtension)) {
// 处理ZIP/KMZ文件
KmlInfo kmlInfo = new KmlInfo();
try (ArchiveInputStream archiveInputStream = new ZipArchiveInputStream(file.getInputStream());) {
ArchiveEntry entry;
@ -84,12 +92,10 @@ public class AirlineFileServiceImpl implements IAirlineFileService {
R<String> fileUrl = remoteFileService.uploadFileByData(UUID.randomUUID().toString(), "waypoints", WayPointUitls.kmz2waypoint(kmlInfo));
AirlineFileDTO dto = new AirlineFileDTO();
// 去除文件名中的后缀名
String fileName = file.getName();
int pos = fileName.lastIndexOf(".");
String fileNameWithoutExtension = pos > 0 ? fileName.substring(0, pos) : fileName;
int pos = originalFilename.lastIndexOf(".");
String fileNameWithoutExtension = pos > 0 ? originalFilename.substring(0, pos) : originalFilename;
List<AirlineFile> airlineFiles =iAirlineFileDomain.selectFileNameLike(fileNameWithoutExtension);
List<String> fileNames = airlineFiles.stream().map(AirlineFile::getName).toList();
String newFileName = FileUtils.generateUniqueFileName(fileNameWithoutExtension, fileNames);
dto.setFileName(newFileName);
@ -97,12 +103,33 @@ public class AirlineFileServiceImpl implements IAirlineFileService {
dto.setAirVendor(kmlInfo.getDocument().getKmlMissionConfig().getDroneInfo().getDroneEnumValue());
dto.setAirType(kmlInfo.getDocument().getKmlMissionConfig().getDroneInfo().getDroneEnumValue());
return dto;
}
} else if ("waypoints".equals(fileExtension)) {
// 直接处理Waypoints文件
AirlineFileDTO dto = new AirlineFileDTO();
// 去除文件名中的后缀名
int pos = originalFilename.lastIndexOf(".");
String fileNameWithoutExtension = pos > 0 ? originalFilename.substring(0, pos) : originalFilename;
List<AirlineFile> airlineFiles =iAirlineFileDomain.selectFileNameLike(fileNameWithoutExtension);
List<String> fileNames = airlineFiles.stream().map(AirlineFile::getName).toList();
String newFileName = FileUtils.generateUniqueFileName(fileNameWithoutExtension, fileNames);
dto.setFileName(newFileName);
// 直接读取文件内容并上传
R<String> fileUrl = remoteFileService.uploadFileByData(UUID.randomUUID().toString(), "waypoints", Arrays.toString(file.getBytes()));
dto.setFileUrl(fileUrl.getData());
dto.setAirVendor("");
dto.setAirType("");
return dto;
} else {
throw new BaseException("不支持的文件格式，请上传KMZ或Waypoints文件");
}
} catch (IOException e) {
throw new BaseException("Waypoints文件生成失败");
throw new BaseException("文件处理失败");
} catch (Exception e) {
log.error("kmz航线转换失败", e);
throw new BaseException("kmz航线转换失败");
log.error("航线文件处理失败", e);
throw new BaseException("航线文件处理失败");
}
}