Merge remote-tracking branch 'origin/dev' into dev

zhaowenyu

2025-11-15 1e2f717393e4053a3b8de11cbf67cd98a8c77ec1

 ard-route/src/main/java/com/ard/route/service/impl/UavRouteServiceImpl.java

@@ -10,7 +10,7 @@
import com.ard.route.domain.WaypointTurnReq;
import com.ard.route.domain.kml.*;
import com.ard.route.domain.route.ArdRouteInfo;
import com.ard.route.domain.vo.KmzInfoVO;
import com.ard.route.domain.vo.KmzInfoVo;
import com.ard.route.domain.vo.KmzResultVo;
import com.ard.route.enums.kml.ExitOnRCLostEnums;
import com.ard.route.service.IArdRouteInfoService;
@@ -67,7 +67,7 @@
        }

        // 获取文件
        String minioUrlName = subStringMinioUrlName(routeInformation.getUpPath());
        String minioUrlName = subStringMinioUrlName(routeInformation.getPath());
        try (InputStream inputStream = ossService.getObject(kmzPath,minioUrlName);
             ArchiveInputStream archiveInputStream = new ZipArchiveInputStream(inputStream)){
            ArchiveEntry entry;
@@ -194,7 +194,7 @@
            } catch (Exception e) {
                throw new RuntimeException(e);
            }
            result.setUpPath(localFilePath + fileName + ".kmz");
            result.setPath(localFilePath + fileName + ".kmz");
            return result;
        }else {
            try (ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -221,7 +221,7 @@
                        new ByteArrayInputStream(baos.toByteArray())
                );
                String kmzFilePath = ossService.upload(kmzPath,multipartFile);
                result.setUpPath(kmzFilePath);
                result.setPath(kmzFilePath);
                return result;
            } catch (Exception e) {
                throw new RuntimeException("KMZ文件生成或上传失败", e);
@@ -233,8 +233,8 @@
     * 解析kmz文件
     */
    @Override
    public KmzInfoVO parseKmz(String fileUrl){
        KmzInfoVO kmzInfoVO = new KmzInfoVO();
    public KmzInfoVo parseKmz(String fileUrl){
        KmzInfoVo kmzInfoVO = new KmzInfoVo();
        try (InputStream inputStream = ossService.getObject(kmzPath,fileUrl);
             ArchiveInputStream archiveInputStream = new ZipArchiveInputStream(inputStream)){
            ArchiveEntry entry;
@@ -264,7 +264,7 @@
        }

        // 获取文件
        String minioUrl = subStringMinioUrlName(routeInformation.getUpPath());
        String minioUrl = subStringMinioUrlName(routeInformation.getPath());
        try (InputStream inputStream = ossService.getObject(kmzPath,minioUrl);
             ArchiveInputStream archiveInputStream = new ZipArchiveInputStream(inputStream)){
            ArchiveEntry entry;