diff --git a/src/main/java/com/ruoyi/airline/domain/model/AirlineFile.java b/src/main/java/com/ruoyi/airline/domain/model/AirlineFile.java index 960ba39..e730993 100644 --- a/src/main/java/com/ruoyi/airline/domain/model/AirlineFile.java +++ b/src/main/java/com/ruoyi/airline/domain/model/AirlineFile.java @@ -45,7 +45,7 @@ public class AirlineFile extends BaseEntity { /** * 航线类型:1,航点航线;2,指点航线;3,指面航线 */ - private Integer type; + private String type; /** * 文件备注 @@ -111,7 +111,7 @@ public class AirlineFile extends BaseEntity { "id=" + id + ", fileName='" + fileName + '\'' + ", fileUrl='" + fileUrl + '\'' + - ", type=" + type + + ", type=" + type + '\'' + ", note='" + note + '\'' + ", distance=" + distance + ", linePointDtoList=" + linePointDtoList + diff --git a/src/main/java/com/ruoyi/airline/mapper/entity/AirlineFileEntity.java b/src/main/java/com/ruoyi/airline/mapper/entity/AirlineFileEntity.java index 51c4433..1825e7f 100644 --- a/src/main/java/com/ruoyi/airline/mapper/entity/AirlineFileEntity.java +++ b/src/main/java/com/ruoyi/airline/mapper/entity/AirlineFileEntity.java @@ -54,7 +54,7 @@ public class AirlineFileEntity extends BaseEntity { /** * 航线类型:1,航点航线;2,指点航线;3,指面航线 */ - private Integer type; + private String type; /** * 数据来源 diff --git a/src/main/java/com/ruoyi/airline/service/dto/AirlineFileDTO.java b/src/main/java/com/ruoyi/airline/service/dto/AirlineFileDTO.java index dcc7b05..9dd3b43 100644 --- a/src/main/java/com/ruoyi/airline/service/dto/AirlineFileDTO.java +++ b/src/main/java/com/ruoyi/airline/service/dto/AirlineFileDTO.java @@ -46,7 +46,7 @@ public class AirlineFileDTO extends BaseEntity { /** * 航线类型:1,航点航线;2,指点航线;3,指面航线 */ - private Integer type; + private String type; /** * 文件备注 @@ -115,7 +115,7 @@ public class AirlineFileDTO extends BaseEntity { "id=" + id + ", fileName='" + fileName + '\'' + ", fileUrl='" + fileUrl + '\'' + - ", type=" + type + + ", type=" + type + '\'' + ", note='" + note + '\'' + ", distance=" + distance + ", linePointDtoList=" + linePointDtoList + 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 4186e3c..19948c6 100644 --- a/src/main/java/com/ruoyi/airline/service/impl/AirlineFileServiceImpl.java +++ b/src/main/java/com/ruoyi/airline/service/impl/AirlineFileServiceImpl.java @@ -100,8 +100,9 @@ public class AirlineFileServiceImpl implements IAirlineFileService { 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().getDroneEnumValue()); + dto.setAirType(kmlInfo.getDocument().getKmlMissionConfig().getDroneInfo().getDroneSubEnumValue()); return dto; } } else if ("waypoints".equals(fileExtension)) { @@ -180,7 +181,7 @@ public class AirlineFileServiceImpl implements IAirlineFileService { List airlineFiles = iAirlineFileDomain.selectFileNameLikeByGroupId(name, groupId); String newFileName = name; - if (airlineFiles != null && airlineFiles.size() > 0) { + if (airlineFiles != null && !airlineFiles.isEmpty()) { List fileNames = airlineFiles.stream().map(AirlineFile::getName).toList(); newFileName = FileUtils.generateUniqueFileName(name, fileNames); } diff --git a/src/main/resources/db/migration/V1__Create_airline_tables.sql b/src/main/resources/db/migration/V1__Create_airline_tables.sql index dc143f1..74eb508 100644 --- a/src/main/resources/db/migration/V1__Create_airline_tables.sql +++ b/src/main/resources/db/migration/V1__Create_airline_tables.sql @@ -6,7 +6,7 @@ CREATE TABLE IF NOT EXISTS airline_file ( air_type VARCHAR(255) COMMENT '飞行器类型', file_name VARCHAR(255) COMMENT '文件名称', file_url VARCHAR(255) COMMENT '文件地址', - type INT(11) COMMENT '航线类型:1,航点航线;2,指点航线;3,指面航线', + type VARCHAR(64) COMMENT '航线类型', source VARCHAR(255) COMMENT '数据来源', status INT(11) DEFAULT 1 COMMENT '1 启用 0 停用。默认启用。', file_md5 VARCHAR(255) COMMENT '航线文件对应的 MD5指纹',