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

zhaowenyu

2025-12-02 04c90bec00f91e8c403d7acaa338f69e5029617a

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

@@ -36,6 +36,7 @@
import javax.annotation.Resource;

import static com.ard.route.util.ToolUtils.*;
import static com.ard.route.util.UavRouteReqUtils.fileConversionEntity;

/**
 * 航线(kmz)Service业务层处理
@@ -116,6 +117,7 @@
        ardRouteInfo.getUavRouteReq().setDroneType(subStringDroneType(ardRouteInfo.getAircraft()));
        KmzResultVo kmzResult = routeService.buildKmz(ardRouteInfo.getUavRouteReq(), ardRouteInfo.getName());
        ardRouteInfo.setPath(kmzResult.getPath());
        ardRouteInfo.setReadOnly("0");
        ardRouteInfoMapper.insertArdRouteInfo(dataProcessing(ardRouteInfo));
        return kmzResult.getPath();
    }
@@ -143,28 +145,32 @@
            }
            ardRouteInfo.setPath(kmzResult.getPath());
        }
        ardRouteInfo.setReadOnly("0");
        return ardRouteInfoMapper.updateArdRouteInfo(dataProcessing(ardRouteInfo));
    }

    // 新增信息加工
    private ArdRouteInfo dataProcessing(ArdRouteInfo ardRouteInfo) {
        // 航线数据
        byte[] routeData;
        byte[] routeData = null;
        try {
            routeData = serialize(ardRouteInfo.getUavRouteReq());
            if (ardRouteInfo.getUavRouteReq() != null){
                routeData = serialize(ardRouteInfo.getUavRouteReq());
            }
        } catch (IOException e) {
            throw new RuntimeException(e);
        }
        ardRouteInfo.setRouteData(routeData);
        ardRouteInfo.setReadOnly("0");
        ardRouteInfo.setPointCount(getPointCount(ardRouteInfo));
        return ardRouteInfo;
    }

    // 获取行点总数
    private Integer getPointCount(ArdRouteInfo ardRouteInfo) {
        if (ardRouteInfo.getUavRouteReq().getRoutePointList() != null) {
            return ardRouteInfo.getUavRouteReq().getRoutePointList().size();
        if (ardRouteInfo.getUavRouteReq() != null){
            if (ardRouteInfo.getUavRouteReq().getRoutePointList() != null) {
                return ardRouteInfo.getUavRouteReq().getRoutePointList().size();
            }
        }
        return 0;
    }
@@ -223,9 +229,13 @@
            information.setPath1(urlDock);
            information.setGroupId("0");     // 默认分组
            information.setReadOnly("1");   // 默认只读
            // 生成kmz文件实体类加工

            // 增加航线实体类信息
            UavRouteReq uavRouteReq = fileConversionEntity(file);
            if (uavRouteReq != null){
                information.setUavRouteReq(uavRouteReq);
                information.setType(templateTypeData(uavRouteReq));
                information.setAircraft(droneTypeData(uavRouteReq));
            }
            insertRouteInfomation(information);
            return MinioUploadResult.builder()
                    .url(url)
@@ -503,7 +513,7 @@
        ardRouteInfo.setId(IdUtils.simpleUUID());
        ardRouteInfo.setCreateTime(DateUtils.getNowDate());
        ardRouteInfo.setUpdateTime(DateUtils.getNowDate());
        ardRouteInfoMapper.insertArdRouteInfo(ardRouteInfo);
        ardRouteInfoMapper.insertArdRouteInfo(dataProcessing(ardRouteInfo));
    }

    /**