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

fix:增加自动航线名称的逻辑

This commit is contained in:
高大 2026-01-28 09:11:59 +08:00
parent 99e961c476
commit a01ec7becd
7 changed files with 38 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/ruoyi/airline/controller/AirlineFileController.java
View File

@ -7,20 +7,16 @@ import com.ruoyi.airline.service.dto.AirlineFileDTO;
import com.ruoyi.common.core.exception.base.BaseException;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.TableDataInfo;
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.security.annotation.RequiresPermissions;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
import java.util.List;
/**
* 航线文件Controller
@ -56,7 +52,6 @@ public class AirlineFileController extends BaseController {
}
/**
* 长江口
* <p>

7
src/main/java/com/ruoyi/airline/controller/AirlineFileGroupInfoController.java
View File

@ -10,14 +10,12 @@ import com.ruoyi.common.core.exception.base.BaseException;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.TableDataInfo;
import com.ruoyi.common.security.annotation.RequiresPermissions;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
import java.util.List;
/**
@ -76,12 +74,11 @@ public class AirlineFileGroupInfoController extends BaseController {
* <p>
* kmz类似zip，一般情况下内部包含kml和wpml两个文件
*
*
* @param file
*/
@PostMapping("/parseAndUpload")
@PostMapping("/parseAndUpload/{groupId}")
@Operation(summary = " kmz航线文件，并转换成waypoint上传 ,仅仅返航URL")
public AjaxResult parseAndUpload(@RequestParam("file") MultipartFile file, Long groupId) throws BaseException {
public AjaxResult parseAndUpload(@RequestParam("file") MultipartFile file, @PathVariable("groupId")Long groupId) throws BaseException {
AirlineFileDTO dto = iAirlineFileService.parseAndUplload(file);
AirlineFileDTO result = iAirlineFileService.save(dto);
AirlineFileGroupInfoDTO infoDTO = new AirlineFileGroupInfoDTO();

2
src/main/java/com/ruoyi/airline/domain/api/IAirlineFileDomain.java
View File

@ -17,4 +17,6 @@ public interface IAirlineFileDomain {
List<AirlineFile> selectFileListByIds(List<Long> ids);
Long save(AirlineFile model);
List<AirlineFile> selectFileNameLike(String name);
}

5
src/main/java/com/ruoyi/airline/domain/impl/AirlineFileDomainImpl.java
View File

@ -33,4 +33,9 @@ public class AirlineFileDomainImpl implements IAirlineFileDomain {
airlineFileMapper.save(entity);
return entity.getId();
}
@Override
public List<AirlineFile> selectFileNameLike(String name) {
return AirlineFileDomainConvert.toModelList(airlineFileMapper.selectFileNameLike(name));
}
}

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

@ -16,4 +16,6 @@ public interface AirlineFileMapper {
Long save(AirlineFileEntity entity);
List<AirlineFileEntity> selectFileListByIds(List<Long> ids);
List<AirlineFileEntity> selectFileNameLike(String name);
}

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

@ -12,6 +12,7 @@ import com.ruoyi.airline.service.dto.AirLinePointDTO;
import com.ruoyi.airline.service.dto.AirlineFileDTO;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.exception.base.BaseException;
import com.ruoyi.common.core.utils.file.FileUtils;
import com.ruoyi.system.api.RemoteFileService;
import org.apache.commons.compress.archivers.ArchiveEntry;
import org.apache.commons.compress.archivers.ArchiveInputStream;
@ -23,6 +24,7 @@ import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.UUID;
@ -81,9 +83,19 @@ public class AirlineFileServiceImpl implements IAirlineFileService {
String globalHeight = kmlInfo.getDocument().getFolder().getGlobalHeight();
R<String> fileUrl = remoteFileService.uploadFileByData(UUID.randomUUID().toString(), "waypoints", WayPointUitls.kmz2waypoint(kmlInfo));
AirlineFileDTO dto = new AirlineFileDTO();
// 去除文件名中的后缀名
String fileName = file.getName();
int pos = fileName.lastIndexOf(".");
String fileNameWithoutExtension = pos > 0 ? fileName.substring(0, pos) : fileName;
List<AirlineFile> airlineFiles =iAirlineFileDomain.selectFileNameLike(fileNameWithoutExtension);
List<String> fileNames = airlineFiles.stream().map(AirlineFile::getName).toList();
String newFileName = FileUtils.generateUniqueFileName(fileNameWithoutExtension, fileNames);
dto.setFileName(newFileName);
dto.setFileUrl(fileUrl.getData());
dto.setAirVendor("");
dto.setAirType("");
dto.setAirVendor(kmlInfo.getDocument().getKmlMissionConfig().getDroneInfo().getDroneEnumValue());
dto.setAirType(kmlInfo.getDocument().getKmlMissionConfig().getDroneInfo().getDroneEnumValue());
return dto;
} catch (IOException e) {

6
src/main/resources/mapper/airline/AirlineFileMapper.xml
View File

@ -39,4 +39,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</foreach>
</select>
<!-- 根据航线名称模糊查询航线文件 -->
<select id="selectFileNameLike" parameterType="java.lang.String" resultMap="AirlineFileResult">
select id, name, air_vendor, air_type, file_name, file_url, type, source, status, file_md5, create_by, create_time, update_by, update_time, remark
from airline_file
where name like concat(#{name}, '%')
</select>
</mapper>