From 066f132c523fb2d8dbcaf20ea900db061b068910 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Mon, 06 May 2024 14:40:38 +0800
Subject: [PATCH] 图斑航线按机场范围生成
---
src/main/java/com/dji/sample/territory/service/impl/TbDkjbxxServiceImpl.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/dji/sample/territory/service/impl/TbDkjbxxServiceImpl.java b/src/main/java/com/dji/sample/territory/service/impl/TbDkjbxxServiceImpl.java
index 894b616..679665a 100644
--- a/src/main/java/com/dji/sample/territory/service/impl/TbDkjbxxServiceImpl.java
+++ b/src/main/java/com/dji/sample/territory/service/impl/TbDkjbxxServiceImpl.java
@@ -8,6 +8,7 @@
import com.dji.sample.patches.model.entity.LotInfo;
import com.dji.sample.patches.utils.GeoToolsUtil;
import com.dji.sample.patches.utils.MultipartFileTOFileUtil;
+import com.dji.sample.patches.utils.PointPO;
import com.dji.sample.patches.xml.mode.XMLTemplateModel;
import com.dji.sample.patches.xml.utils.CreateWaylineFileUtils;
import com.dji.sample.territory.dao.ITbDkjbxxMapper;
@@ -33,6 +34,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
@@ -98,7 +101,7 @@
public MultipartFile listFile(String workspaceId, String waylineName, double airportLat, double airportLon) throws IOException {
List<TbDkjbxxEntity> list = iTbDkjbxxMapper.selectList(null);
List<LotInfo> info = dbConvertToEntity(list);
- Coordinate[] coordinates = GeoToolsUtil.getRoutePointOrder(info, airportLat, airportLon);
+ List<PointPO> coordinates = GeoToolsUtil.getRoutePointOrder(info, airportLat, airportLon);
// 创建XML模板模型
XMLTemplateModel xmlModel = XMLTemplateModel.init(coordinates, info);
CreateWaylineFileUtils.createWaylineFile(xmlModel, patchesConfigPojo.getTemplate(), patchesConfigPojo.getTargetTemplate(), patchesConfigPojo.getWaylines(), patchesConfigPojo.getTargetWaylines());
@@ -106,8 +109,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 +121,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 +132,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();
--
Gitblit v1.9.3