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

bug：bug修复

This commit is contained in:
gyb 2026-02-12 16:40:04 +08:00
parent 7252f19a4b
commit fc0e317432
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -71,9 +71,13 @@ public class AirlineFileServiceImpl implements IAirlineFileService {
if (originalFilename != null && originalFilename.lastIndexOf('.') > 0) { if (originalFilename != null && originalFilename.lastIndexOf('.') > 0) {
fileExtension = originalFilename.substring(originalFilename.lastIndexOf('.') + 1).toLowerCase(); fileExtension = originalFilename.substring(originalFilename.lastIndexOf('.') + 1).toLowerCase();
} }
int pos = originalFilename.lastIndexOf("."); int pos = 0;
if (originalFilename != null) {
pos = originalFilename.lastIndexOf(".");
}
String fileNameWithoutExtension = pos > 0 ? originalFilename.substring(0, pos) : originalFilename; String fileNameWithoutExtension = pos > 0 ? originalFilename.substring(0, pos) : originalFilename;
String newFileName = getNewFileNameLikeByGroupId(fileNameWithoutExtension, groupId); String newFileName = getNewFileNameLikeByGroupId(fileNameWithoutExtension, groupId);
log.info("filename :{}, new filename :{}",fileNameWithoutExtension, newFileName);
try { try {
if ("zip".equals(fileExtension) || "kmz".equals(fileExtension)) { if ("zip".equals(fileExtension) || "kmz".equals(fileExtension)) {
// 处理ZIP/KMZ文件 // 处理ZIP/KMZ文件
@ -109,12 +113,10 @@ public class AirlineFileServiceImpl implements IAirlineFileService {
// 直接处理Waypoints文件 // 直接处理Waypoints文件
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", Arrays.toString(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(""); dto.setAirVendor("");
dto.setAirType(""); dto.setAirType("");