Xiajijian
2025-12-13 9d770d2770d4332a36ffc0373abfd8939a418fa7
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,8 @@
import javax.annotation.Resource;
import static com.ard.route.enums.kml.DroneEnumValueEnums.M350_RTK;
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 +60,6 @@
    @Autowired
    private OssServiceContext ossService;
    @Autowired
    private OssDockServiceContext ossDockService;
    @Autowired
    private UavRouteService routeService;
@@ -90,10 +89,12 @@
        for (RoutePointReq routePointReq : ardRouteInfo.getUavRouteReq().getRoutePointList()) {
            routePointReq.setHeight(routePointReq.getHeight() + getDoublePoint(ardRouteInfo.getUavRouteReq().getTakeOffRefPoint(),"alt"));
            // 判断无人机类型
            if (ardRouteInfo.getUavRouteReq().getDroneType().equals(89)){
            if (ardRouteInfo.getUavRouteReq().getDroneType().equals(M350_RTK.getValue())){
                for (ActionGroupReq actionGroupReq : routePointReq.getActionGroupList()) {
                    for (PointActionReq action : actionGroupReq.getActions()) {
                        action.setZoom(divided_6(action.getZoom()));
                        if (action.getZoom() != null || action.getZoom() != 0){
                            action.setZoom(divided_23(action.getZoom()));
                        }
                    }
                }
            }
@@ -218,9 +219,6 @@
        if (information.getPath() != null){
            ossService.deleteObject("kmz", subStringMinioUrlName(information.getPath()));
        }
        if (information.getPath1() != null){
            ossDockService.deleteObject("kmz", subStringMinioUrlName(information.getPath1()));
        }
    }
    /**
@@ -263,10 +261,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);