From 38661172ed17aa17f87859a5aebe272572608d5b Mon Sep 17 00:00:00 2001 From: gyb Date: Thu, 26 Feb 2026 18:41:25 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E6=97=A0=E4=BA=BA=E6=9C=BA=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E5=A2=9E=E5=8A=A0=E7=B1=BB=E5=9E=8B=E5=94=AF=E4=B8=80?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/AirlineFileServiceImpl.java | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/ruoyi/airline/service/impl/AirlineFileServiceImpl.java b/src/main/java/com/ruoyi/airline/service/impl/AirlineFileServiceImpl.java index 83e6094..1911b29 100644 --- a/src/main/java/com/ruoyi/airline/service/impl/AirlineFileServiceImpl.java +++ b/src/main/java/com/ruoyi/airline/service/impl/AirlineFileServiceImpl.java @@ -98,15 +98,18 @@ public class AirlineFileServiceImpl implements IAirlineFileService { String globalHeight = kmlInfo.getDocument().getFolder().getGlobalHeight(); AirlineFileDTO dto = new AirlineFileDTO(); // 去除文件名中的后缀名 - - dto.setName(newFileName); dto.setFileName(originalFilename); R fileUrl = remoteFileService.uploadFileByData(UUID.randomUUID().toString(), "waypoints", WayPointUitls.kmz2waypoint(kmlInfo)); dto.setFileUrl(fileUrl.getData()); dto.setType(kmlInfo.getDocument().getFolder().getTemplateType()); - dto.setAirVendor(kmlInfo.getDocument().getKmlMissionConfig().getDroneInfo().getDroneEnumValue()); - dto.setAirType(kmlInfo.getDocument().getKmlMissionConfig().getDroneInfo().getDroneSubEnumValue()); + // TODO 大疆默认1，后续想办法优化成表格破诶中 + 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; } } else if ("waypoints".equals(fileExtension)) { @@ -118,8 +121,14 @@ public class AirlineFileServiceImpl implements IAirlineFileService { // 直接读取文件内容并上传 R fileUrl = remoteFileService.uploadFileByData(UUID.randomUUID().toString(), "waypoints", new String(file.getBytes())); dto.setFileUrl(fileUrl.getData()); - dto.setAirVendor(""); - dto.setAirType(""); + // TODO 拓恒默认0，后续想办法优化成表格破诶中 + 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; } else { throw new BaseException("不支持的文件格式，请上传KMZ或Waypoints文件");