blame | history | patch | commit | commitdiff | ignore whitespace
rain
2024-04-26 3d37a280c2bbefc5769053ec7298a0211ab79b8d 
 src/main/java/com/dji/sample/territory/service/impl/TbDkjbxxServiceImpl.java


@@ -33,6 +33,8 @@




import static com.dji.sample.patches.utils.MultipartFileTOFileUtil.convert;


import static com.dji.sample.patches.utils.ZipUtil.zipFolder;


import static com.dji.sample.territory.utils.CoordinateSystemUtil.*;






/**


 * @PROJECT_NAME: drone


@@ -106,8 +108,7 @@


        String destKMZFile = patchesConfigPojo.getDestKMZFile() + waylineName + ".kmz"; // 输出的KMZ文件路径


        zipFolder(patchesConfigPojo.getSourceDir(), destKMZFile);


        // 将压缩文件转换为MultipartFile对象


        MultipartFile multipartFile = convert(new File(destKMZFile));


        return multipartFile;


        return convert(new File(destKMZFile));


    }




    /**


@@ -119,6 +120,7 @@


    private List<LotInfo> dbConvertToEntity(List<TbDkjbxxEntity> list) {


        List<LotInfo> infos = new ArrayList<>();


        for (TbDkjbxxEntity file : list) {


            double[] coordinates = extractCoordinates(pointCGCStoWGS(file.getXzb(), file.getYzb()));


            // 使用Builder模式构建LotInfo对象


            LotInfo.LotInfoBuilder builder = LotInfo.builder();


            if (file != null) {


@@ -129,12 +131,12 @@


                        .dkmc(file.getDkmc())


                        .dkbh(file.getDkbh())


                        .xmc(file.getXmc())


                        .xzb(file.getXzb())


                        .xzb(coordinates[0])


                        .sfbhzdk(file.getSfbhzdk())


                        .sjlx(file.getSjlx())


                        .dkfw(file.getDkfw())


                        .dkfw(poylonCGCStoWGS(file.getDkfw()))


                        .xzqdm(file.getXzqdm())


                        .yzb(file.getYzb())


                        .yzb(coordinates[1])


                        .kzxx(file.getKzxx())


                        .dklx(file.getDklx())


                        .build();