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

Xiajijian

2025-12-13 4b97aecf414765f9b7058db9dab4cbf9b97eb84f

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

@@ -15,7 +15,6 @@
import com.ard.framework.web.service.TokenService;
import com.ard.oss.model.MinioUploadResult;
import com.ard.oss.service.impl.OssServiceContext;
import com.ard.ossdock.service.impl.OssDockServiceContext;
import com.ard.route.domain.djuav.ActionGroupReq;
import com.ard.route.domain.djuav.PointActionReq;
import com.ard.route.domain.djuav.RoutePointReq;
@@ -38,6 +37,7 @@

import javax.annotation.Resource;

import static com.ard.route.util.InitializationUtils.divided_23;
import static com.ard.route.util.InitializationUtils.divided_6;
import static com.ard.route.util.ToolUtils.*;
import static com.ard.route.util.UavRouteReqUtils.fileConversionEntity;
@@ -59,8 +59,6 @@
    @Autowired
    private OssServiceContext ossService;

    @Autowired
    private OssDockServiceContext ossDockService;

    @Autowired
    private UavRouteService routeService;
@@ -93,12 +91,17 @@
            if (ardRouteInfo.getUavRouteReq().getDroneType().equals(89)){
                for (ActionGroupReq actionGroupReq : routePointReq.getActionGroupList()) {
                    for (PointActionReq action : actionGroupReq.getActions()) {
                        action.setZoom(divided_6(action.getZoom()));
                        action.setZoom(divided_23(action.getZoom()));
                    }
                }
            }
        }
        return ardRouteInfo;
    }

    // 变焦放大缩小
    public void zoom(){

    }

    /**
@@ -218,9 +221,6 @@
        if (information.getPath() != null){
            ossService.deleteObject("kmz", subStringMinioUrlName(information.getPath()));
        }
        if (information.getPath1() != null){
            ossDockService.deleteObject("kmz", subStringMinioUrlName(information.getPath1()));
        }
    }

    /**
@@ -263,10 +263,8 @@
            }

            String url = ossService.upload("kmz",file);
            String urlDock = ossDockService.upload("kmz",file);
            ardRouteInfo.setName(file.getOriginalFilename());
            ardRouteInfo.setPath(url);
            ardRouteInfo.setPath1(urlDock);
            ardRouteInfo.setGroupId("0");     // 默认分组
            ardRouteInfo.setReadOnly("1");   // 默认只读
            insertRouteInfomation(ardRouteInfo);
@@ -356,16 +354,6 @@
        } catch (IOException | ClassNotFoundException e) {
            throw new RuntimeException(e);
        }

        // 判断禁飞区
        try {
            arrayWithinNoFlyZone(route.getUavRouteReq().getRoutePointList());
        } catch (ControlException e) {
            log.error("禁飞区错误.航线航点在禁飞区！", e);
            // 返回包含禁飞区错误信息的特定结果
            return false;
        }

        // 1.2通过minio获取航线信息
        // 2.将航线信息转换成对应实体类
        WayLineUploadDTO wayLineUploadDTO = buildWayLineUploadDTO(route);