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

fit:增加航线类型

This commit is contained in:
gyb 2026-01-30 15:55:03 +08:00
parent b03e858b3b
commit b0e873e9d4
5 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/ruoyi/airline/domain/model/AirlineFile.java
View File

@ -45,7 +45,7 @@ public class AirlineFile extends BaseEntity {
/** /**
* 航线类型：1,航点航线;2,指点航线;3,指面航线 * 航线类型：1,航点航线;2,指点航线;3,指面航线
*/ */
private Integer type; private String type;
/** /**
* 文件备注 * 文件备注
@ -111,7 +111,7 @@ public class AirlineFile extends BaseEntity {
"id=" + id + "id=" + id +
", fileName='" + fileName + '\'' + ", fileName='" + fileName + '\'' +
", fileUrl='" + fileUrl + '\'' + ", fileUrl='" + fileUrl + '\'' +
", type=" + type + ", type=" + type + '\'' +
", note='" + note + '\'' + ", note='" + note + '\'' +
", distance=" + distance + ", distance=" + distance +
", linePointDtoList=" + linePointDtoList + ", linePointDtoList=" + linePointDtoList +

2
src/main/java/com/ruoyi/airline/mapper/entity/AirlineFileEntity.java
View File

@ -54,7 +54,7 @@ public class AirlineFileEntity extends BaseEntity {
/** /**
* 航线类型：1,航点航线;2,指点航线;3,指面航线 * 航线类型：1,航点航线;2,指点航线;3,指面航线
*/ */
private Integer type; private String type;
/** /**
* 数据来源 * 数据来源

4
src/main/java/com/ruoyi/airline/service/dto/AirlineFileDTO.java
View File

@ -46,7 +46,7 @@ public class AirlineFileDTO extends BaseEntity {
/** /**
* 航线类型：1,航点航线;2,指点航线;3,指面航线 * 航线类型：1,航点航线;2,指点航线;3,指面航线
*/ */
private Integer type; private String type;
/** /**
* 文件备注 * 文件备注
@ -115,7 +115,7 @@ public class AirlineFileDTO extends BaseEntity {
"id=" + id + "id=" + id +
", fileName='" + fileName + '\'' + ", fileName='" + fileName + '\'' +
", fileUrl='" + fileUrl + '\'' + ", fileUrl='" + fileUrl + '\'' +
", type=" + type + ", type=" + type + '\'' +
", note='" + note + '\'' + ", note='" + note + '\'' +
", distance=" + distance + ", distance=" + distance +
", linePointDtoList=" + linePointDtoList + ", linePointDtoList=" + linePointDtoList +

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

@ -100,8 +100,9 @@ public class AirlineFileServiceImpl implements IAirlineFileService {
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.setAirVendor(kmlInfo.getDocument().getKmlMissionConfig().getDroneInfo().getDroneEnumValue()); dto.setAirVendor(kmlInfo.getDocument().getKmlMissionConfig().getDroneInfo().getDroneEnumValue());
dto.setAirType(kmlInfo.getDocument().getKmlMissionConfig().getDroneInfo().getDroneEnumValue()); dto.setAirType(kmlInfo.getDocument().getKmlMissionConfig().getDroneInfo().getDroneSubEnumValue());
return dto; return dto;
} }
} else if ("waypoints".equals(fileExtension)) { } else if ("waypoints".equals(fileExtension)) {
@ -180,7 +181,7 @@ public class AirlineFileServiceImpl implements IAirlineFileService {
List<AirlineFile> airlineFiles = iAirlineFileDomain.selectFileNameLikeByGroupId(name, groupId); List<AirlineFile> airlineFiles = iAirlineFileDomain.selectFileNameLikeByGroupId(name, groupId);
String newFileName = name; String newFileName = name;
if (airlineFiles != null && airlineFiles.size() > 0) { if (airlineFiles != null && !airlineFiles.isEmpty()) {
List<String> fileNames = airlineFiles.stream().map(AirlineFile::getName).toList(); List<String> fileNames = airlineFiles.stream().map(AirlineFile::getName).toList();
newFileName = FileUtils.generateUniqueFileName(name, fileNames); newFileName = FileUtils.generateUniqueFileName(name, fileNames);
} }

2
src/main/resources/db/migration/V1__Create_airline_tables.sql
View File

@ -6,7 +6,7 @@ CREATE TABLE IF NOT EXISTS airline_file (
air_type VARCHAR(255) COMMENT '飞行器类型', air_type VARCHAR(255) COMMENT '飞行器类型',
file_name VARCHAR(255) COMMENT '文件名称', file_name VARCHAR(255) COMMENT '文件名称',
file_url VARCHAR(255) COMMENT '文件地址', file_url VARCHAR(255) COMMENT '文件地址',
type INT(11) COMMENT '航线类型：1,航点航线;2,指点航线;3,指面航线', type VARCHAR(64) COMMENT '航线类型',
source VARCHAR(255) COMMENT '数据来源', source VARCHAR(255) COMMENT '数据来源',
status INT(11) DEFAULT 1 COMMENT '1 启用 0 停用。默认启用。', status INT(11) DEFAULT 1 COMMENT '1 启用 0 停用。默认启用。',
file_md5 VARCHAR(255) COMMENT '航线文件对应的 MD5指纹', file_md5 VARCHAR(255) COMMENT '航线文件对应的 MD5指纹',