1. 修改发现BUG。

Xiajijian

2025-12-13 d622682904bb0a4b401db317e8d0b9fdf474e54b

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

@@ -3,14 +3,15 @@
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil;
import com.ard.oss.service.impl.OssServiceContext;
import com.ard.ossdock.service.impl.OssDockServiceContext;
import com.ard.route.constant.FileTypeConstants;
import com.ard.route.domain.RoutePointReq;
import com.ard.route.domain.UavRouteReq;
import com.ard.route.domain.WaypointHeadingReq;
import com.ard.route.domain.WaypointTurnReq;
import com.ard.route.domain.kml.*;
import com.ard.route.domain.djuav.RoutePointReq;
import com.ard.route.domain.djuav.UavRouteReq;
import com.ard.route.domain.djuav.WaypointHeadingReq;
import com.ard.route.domain.djuav.WaypointTurnReq;
import com.ard.route.domain.djuav.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;
@@ -24,6 +25,7 @@
import org.apache.commons.compress.archivers.zip.ZipArchiveInputStream;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.mock.web.MockMultipartFile;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
@@ -37,6 +39,7 @@

import static com.ard.route.util.RouteFileUtils.*;
import static com.ard.route.util.ToolUtils.*;
import static com.ard.route.util.UavRouteReqUtils.kmzInfoVoToUavRouteReq;

/**
 * Author:xia
@@ -47,6 +50,9 @@

    @Resource
    private OssServiceContext ossService;

    @Resource
    private OssDockServiceContext ossDockService;

    @Resource
    private IArdRouteInfoService ardRouteInformationService;
@@ -67,7 +73,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;
@@ -86,6 +92,10 @@
                }
            }
            // 删除文件
            if ("100".equals(kmlInfo.getDocument().getKmlMissionConfig().getDroneInfo().getDroneEnumValue())
                    ||"91".equals(kmlInfo.getDocument().getKmlMissionConfig().getDroneInfo().getDroneEnumValue())){
                ossDockService.deleteObject(kmzPath,minioUrlName);
            }
            ossService.deleteObject(kmzPath, minioUrlName);
            return buildKmzMethod(routeInformation.getName(), kmlInfo, wpmlInfo);
        } catch (Exception e) {
@@ -178,54 +188,37 @@

        String kml = XML_HEADER + xStream.toXML(kmlInfo);
        String wpml = XML_HEADER + xStream.toXML(wpmlInfo);

        KmzResultVo result = new KmzResultVo();
        try (ByteArrayOutputStream baos = new ByteArrayOutputStream();
             ZipOutputStream zipOutputStream = new ZipOutputStream(baos)) {
            zipOutputStream.setLevel(0);

        // 判断本地生成kmz文件
        if (isLocal) {
            try (FileOutputStream fileOutputStream = new FileOutputStream(localFilePath + fileName + ".kmz");
                 ZipOutputStream zipOutputStream = new ZipOutputStream(fileOutputStream)) {
                zipOutputStream.setLevel(0); // 0 表示不压缩，存储方式
            // 创建 wpmz 目录中的 template.kml 文件条目
            buildZipFile("wpmz/template.kml", zipOutputStream, kml);
            // 创建 wpmz 目录中的 waylines.wpml 文件条目
            buildZipFile("wpmz/waylines.wpml", zipOutputStream, wpml);

                // 创建KMZ文件内容
                buildZipFile("wpmz/template.kml", zipOutputStream, kml);
                buildZipFile("wpmz/waylines.wpml", zipOutputStream, wpml);
            zipOutputStream.finish();
            zipOutputStream.flush();

            } catch (Exception e) {
                throw new RuntimeException(e);
            // 创建MultipartFile对象
            MultipartFile multipartFile = new MockMultipartFile(
                    fileName + ".kmz",
                    fileName + ".kmz",
                    "application/vnd.google-earth.kmz",
                    new ByteArrayInputStream(baos.toByteArray())
            );
            // 通过无人机类型，判断上传文件
            if ("100".equals(kmlInfo.getDocument().getKmlMissionConfig().getDroneInfo().getDroneEnumValue())
                    ||"91".equals(kmlInfo.getDocument().getKmlMissionConfig().getDroneInfo().getDroneEnumValue())){
                String kmzFilePathDock = ossDockService.upload(kmzPath,multipartFile);
                result.setPathDock(kmzFilePathDock);
            }
            result.setUpPath(localFilePath + fileName + ".kmz");
            String kmzFilePath = ossService.upload(kmzPath,multipartFile);
            result.setPath(kmzFilePath);
            return result;
        }else {
            try (ByteArrayOutputStream baos = new ByteArrayOutputStream();
                 ZipOutputStream zipOutputStream = new ZipOutputStream(baos)) {
                zipOutputStream.setLevel(0);

                // 创建 wpmz 目录中的 template.kml 文件条目
                buildZipFile("wpmz/template.kml", zipOutputStream, kml);

                // 创建 wpmz 目录中的 waylines.wpml 文件条目
                buildZipFile("wpmz/waylines.wpml", zipOutputStream, wpml);

                zipOutputStream.finish();
                zipOutputStream.flush();

                // 获取文件大小
                Double fileSize = (double) baos.size(); // 字节数

                // 创建MultipartFile对象
                MultipartFile multipartFile = new MockMultipartFile(
                        fileName + ".kmz",
                        fileName + ".kmz",
                        "application/vnd.google-earth.kmz",
                        new ByteArrayInputStream(baos.toByteArray())
                );
                String kmzFilePath = ossService.upload(kmzPath,multipartFile);
                result.setUpPath(kmzFilePath);
                return result;
            } catch (Exception e) {
                throw new RuntimeException("KMZ文件生成或上传失败", e);
            }
        } catch (Exception e) {
            throw new RuntimeException("KMZ文件生成或上传失败", e);
        }
    }

@@ -233,8 +226,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;
@@ -253,42 +246,12 @@
        return null;
    }

    /**
     * KmzInfoVo实体类转换为UavRouteReq实体类
     */
    @Override
    public KmzResultVo updateKmzNew(UavRouteReq uavRouteReq, String oldFile, String newFile) {
        KmzResultVo result = new KmzResultVo();
        // 校验修改的文件是否存在
        ArdRouteInfo routeInformation = ardRouteInformationService.selectArdRouteInfoByName(oldFile);
        if ( routeInformation == null ){
            result.setData("修改航线文件失败，请检查文件是否存在");
            return result;
        }

        // 获取文件
        String minioUrl = subStringMinioUrlName(routeInformation.getUpPath());
        try (InputStream inputStream = ossService.getObject(kmzPath,minioUrl);
             ArchiveInputStream archiveInputStream = new ZipArchiveInputStream(inputStream)){
            ArchiveEntry entry;
            KmlInfo kmlInfo = new KmlInfo();
            KmlInfo wpmlInfo = new KmlInfo();
            KmlParams kmlParams = new KmlParams();
            while (!Objects.isNull(entry = archiveInputStream.getNextEntry())) {
                String name = entry.getName();
                if (name.toLowerCase().endsWith(".kml")) {
                    kmlInfo = RouteFileUtils.parseKml(archiveInputStream);
                    buildKmlParams(kmlParams, kmlInfo);
                    this.handleRouteUpdate(kmlInfo, uavRouteReq, FileTypeConstants.KML, kmlParams);
                } else if (name.toLowerCase().endsWith(".wpml")) {
                    wpmlInfo = RouteFileUtils.parseKml(archiveInputStream);
                    this.handleRouteUpdate(wpmlInfo, uavRouteReq, FileTypeConstants.WPML, kmlParams);
                }
            }
            // 删除文件
            ossService.deleteObject(kmzPath, minioUrl);
            return buildKmzMethod(newFile, kmlInfo, wpmlInfo);
        } catch (Exception e) {
            result.setData("更新航线kmz文件失败");
            return result;
        }
    public UavRouteReq kmzInfoVoToUavRouteReq(KmzInfoVo kmzInfoVo) {
        return kmzInfoVoToUavRouteReq(kmzInfoVo);
    }

}