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

zhaowenyu

2025-11-20 62f930cee9ef7031421890cd2c9b636f10ef727a

 ard-work/src/main/java/com/ard/work/service/impl/KmzFileServiceImpl.java

@@ -1,7 +1,7 @@
package com.ard.work.service.impl;

import com.ard.work.component.minio.config.MinioConfig;
import com.ard.work.component.minio.utils.MinioUtil;
import com.ard.common.config.OssConfiguration;
import com.ard.oss.service.impl.OssServiceContext;
import com.ard.work.config.WaylinePlaningConfig;
import com.ard.work.domain.dto.wayline.*;
import com.ard.work.domain.entity.UavWayline;
@@ -36,9 +36,6 @@
public class KmzFileServiceImpl implements IKmzFileService {

    @Resource
    private MinioConfig minioConfig;

    @Resource
    private IGeoToolsService geoToolsService;

    @Resource
@@ -46,6 +43,9 @@

    @Resource
    private UavWaylineMapper uavWaylineMapper;

    @Resource
    private OssServiceContext ossService;

    private Document initWayline(Boolean isTemplate) {
        //创建Document对象
@@ -429,11 +429,7 @@
                InputStream inputStream = new FileInputStream(kmzPath);
                //构建记录
                String objectKey = fileName;
                //若已经存在，则先删除，再添加
                if (MinioUtil.exists(minioConfig.getBucketName(), objectKey))
                    MinioUtil.delete(minioConfig.getBucketName(), objectKey);
                String kmzUrl = MinioUtil.uploadInputStream(minioConfig.getBucketName(), objectKey, inputStream,
                        inputStream.available(), "application/octet-stream");
                String kmzUrl = ossService.upload(OssConfiguration.bucket, objectKey, inputStream);
                // 更新航线kmz地址
                UavWayline uavWayline =  UavWayline.builder()
                        .id(ardWaylineDTO.waylineId)