1. 去掉path1相关业务逻辑。

Xiajijian

2025-12-13 4b97aecf414765f9b7058db9dab4cbf9b97eb84f

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

@@ -3,6 +3,7 @@
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.djuav.RoutePointReq;
import com.ard.route.domain.djuav.UavRouteReq;
@@ -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,7 +39,7 @@

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

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

    @Resource
    private OssServiceContext ossService;

//    @Resource
//    private OssDockServiceContext ossDockService;

    @Resource
    private IArdRouteInfoService ardRouteInformationService;
@@ -87,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) {
@@ -199,6 +208,12 @@
                    "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);
//            }
            String kmzFilePath = ossService.upload(kmzPath,multipartFile);
            result.setPath(kmzFilePath);
            return result;
@@ -236,7 +251,7 @@
     */
    @Override
    public UavRouteReq kmzInfoVoToUavRouteReq(KmzInfoVo kmzInfoVo) {
        return kmzInfoVOToUavRouteReq(kmzInfoVo);
        return kmzInfoVoToUavRouteReq(kmzInfoVo);
    }

}