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

zhaowenyu

2026-04-01 b8b5a3895e741d5348ecdd39ad2e5cbd443f8e89

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

@@ -169,6 +169,11 @@
        if (ardRouteInfo.getGroupId() == null){
            ardRouteInfo.setGroupId("0");
        }
        if ("3".equals(ardRouteInfo.getType())){
            ardRouteInfo.getUavRouteReq().setHeightMode("EGM96");
        }else {
            ardRouteInfo.getUavRouteReq().setHeightMode("relativeToStartPoint");
        }
        ardRouteInfo.getUavRouteReq().setDroneType(subStringDroneType(ardRouteInfo.getAircraft()));
        KmzResultVo kmzResult = routeService.buildKmz(ardRouteInfo.getUavRouteReq(),ardRouteInfo.getName());
        zoomProcessing(ardRouteInfo);
@@ -465,13 +470,6 @@
        // 1.1通过航线数据，转换。
        ArdRouteInfo route = ardRouteInfoMapper.selectArdRouteInfoById(id);
        try {
//            if ("3".equals(route.getType())) {
//                UavRouteReq uavRouteReq = new UavRouteReq();
//                BeanUtils.copyProperties(deserialize(route.getRouteData()), uavRouteReq);
//                route.setUavRouteReq((UavRouteReq) deserialize(route.getRouteData()));
//            }else {
//                route.setUavRouteReq((UavRouteReq) deserialize(route.getRouteData()));
//            }
            route.setUavRouteReq((UavRouteReq) deserialize(route.getRouteData()));
            if (route.getCloudData() != null){
                route.setArdPointCloudList(deserializeLs(route.getCloudData()));