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

feat:无人机类型增加类型唯一值

This commit is contained in:
gyb 2026-02-26 18:41:25 +08:00
parent c0d7b808ad
commit 38661172ed
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -98,15 +98,18 @@ public class AirlineFileServiceImpl implements IAirlineFileService {
String globalHeight = kmlInfo.getDocument().getFolder().getGlobalHeight(); String globalHeight = kmlInfo.getDocument().getFolder().getGlobalHeight();
AirlineFileDTO dto = new AirlineFileDTO(); AirlineFileDTO dto = new AirlineFileDTO();
// 去除文件名中的后缀名 // 去除文件名中的后缀名
dto.setName(newFileName); dto.setName(newFileName);
dto.setFileName(originalFilename); dto.setFileName(originalFilename);
R<String> fileUrl = remoteFileService.uploadFileByData(UUID.randomUUID().toString(), "waypoints", WayPointUitls.kmz2waypoint(kmlInfo)); R<String> fileUrl = remoteFileService.uploadFileByData(UUID.randomUUID().toString(), "waypoints", WayPointUitls.kmz2waypoint(kmlInfo));
dto.setFileUrl(fileUrl.getData()); dto.setFileUrl(fileUrl.getData());
dto.setType(kmlInfo.getDocument().getFolder().getTemplateType()); dto.setType(kmlInfo.getDocument().getFolder().getTemplateType());
dto.setAirVendor(kmlInfo.getDocument().getKmlMissionConfig().getDroneInfo().getDroneEnumValue()); // TODO 大疆默认1，后续想办法优化成表格破诶中
dto.setAirType(kmlInfo.getDocument().getKmlMissionConfig().getDroneInfo().getDroneSubEnumValue()); String airVendor = "1";
String airType = kmlInfo.getDocument().getKmlMissionConfig().getDroneInfo().getDroneEnumValue();
String airSubType = kmlInfo.getDocument().getKmlMissionConfig().getDroneInfo().getDroneSubEnumValue();
dto.setAirVendor(airVendor);
// 无人机的领域默认为0
dto.setAirType(String.format("0-%s-%s", airType, airSubType));
return dto; return dto;
} }
} else if ("waypoints".equals(fileExtension)) { } else if ("waypoints".equals(fileExtension)) {
@ -118,8 +121,14 @@ public class AirlineFileServiceImpl implements IAirlineFileService {
// 直接读取文件内容并上传 // 直接读取文件内容并上传
R<String> fileUrl = remoteFileService.uploadFileByData(UUID.randomUUID().toString(), "waypoints", new String(file.getBytes())); R<String> fileUrl = remoteFileService.uploadFileByData(UUID.randomUUID().toString(), "waypoints", new String(file.getBytes()));
dto.setFileUrl(fileUrl.getData()); dto.setFileUrl(fileUrl.getData());
dto.setAirVendor(""); // TODO 拓恒默认0，后续想办法优化成表格破诶中
dto.setAirType(""); String airVendor = "0";
String airType = "0";
String airSubType = "1"; // 默认Fm003，的type为1
dto.setAirVendor(airVendor);
// 无人机的领域默认为0
dto.setAirType(String.format("0-%s-%s", airType, airSubType));
return dto; return dto;
} else { } else {
throw new BaseException("不支持的文件格式，请上传KMZ或Waypoints文件"); throw new BaseException("不支持的文件格式，请上传KMZ或Waypoints文件");