From f98b25a34d04c2acb9bf93e6cbd4e72fa2d81ba0 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Sat, 13 Apr 2024 11:40:29 +0800
Subject: [PATCH] 航线规划修改
---
src/main/java/com/dji/sample/patches/service/impl/ShpToDataSourceServiceImpl.java | 34 ++++++++++++++++++----------------
1 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/dji/sample/patches/service/impl/ShpToDataSourceServiceImpl.java b/src/main/java/com/dji/sample/patches/service/impl/ShpToDataSourceServiceImpl.java
index 21bb3ff..f4da965 100644
--- a/src/main/java/com/dji/sample/patches/service/impl/ShpToDataSourceServiceImpl.java
+++ b/src/main/java/com/dji/sample/patches/service/impl/ShpToDataSourceServiceImpl.java
@@ -1,5 +1,6 @@
package com.dji.sample.patches.service.impl;
+import com.dji.sample.patches.config.pojo.PatchesConfigPojo;
import com.dji.sample.patches.dao.ShpToDataSourceMapper;
import com.dji.sample.patches.model.entity.LotInfo;
import com.dji.sample.patches.service.ShpToDataSourceService;
@@ -15,10 +16,12 @@
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
+
import java.io.File;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
+
import static com.dji.sample.patches.utils.FormatConversionUtil.getCentros;
import static com.dji.sample.patches.utils.MultipartFileTOFileUtil.convert;
import static com.dji.sample.patches.utils.ZipUtil.*;
@@ -32,18 +35,17 @@
@Autowired
private IWaylineFileService service;
- String head = POLYGON;
- @Value("${Patches.url.path.kmz.sourceDir}")
- String sourceDir ;
- @Value("${Patches.url.path.kmz.destKMZFile}")
- String outkmz;
- MultipartFile multipartFile;
+ private String head = POLYGON;
+ private MultipartFile multipartFile;
String json;
- public MultipartFile insertGeo(MultipartFile file, String workspaceId,String waylineName, double airportLat, double airportLon) throws Exception {
+
+ @Autowired
+ private PatchesConfigPojo patchesConfigPojo;
+
+ public MultipartFile insertGeo(MultipartFile file, String workspaceId, String waylineName, double airportLat, double airportLon) throws Exception {
List<LotInfo> list = new ArrayList<>();
- MultipartFileTOFileUtil multipartFileTOFileUtil = new MultipartFileTOFileUtil();
- File file1 = multipartFileTOFileUtil.multipartFile2File(file);
+ File file1 = MultipartFileTOFileUtil.multipartFile2File(file, patchesConfigPojo.getUnzip());
List<String> s = ShapeFileUtil.shpToGeoJson(file1);
String[] arr1 = FormatConversionUtil.formatConversion(s);
for (int i = 0; i < arr1.length; i++) {
@@ -58,23 +60,23 @@
lotInfo.setDkfw(json);
lotInfo.setDkbh("dkbh" + i);
list.add(lotInfo);
- String strs=getCentros(list);
- String end =strs.replaceAll("\\(","").replaceAll(", NaN\\)","");
- String[] points=end.split(",");
+ String strs = getCentros(list);
+ String end = strs.replaceAll("\\(", "").replaceAll(", NaN\\)", "");
+ String[] points = end.split(",");
lotInfo.setXzb(Double.valueOf(points[0]));
lotInfo.setYzb(Double.valueOf(points[1]));
mapper.insert(lotInfo);
}
Coordinate[] coordinates = GeoToolsUtil.getRoutePointOrder(list, airportLat, airportLon);
XMLTemplateModel xmlModel = XMLTemplateModel.init(coordinates, list);
- CreateWaylineFileUtils.createWaylineFile(xmlModel);
+ CreateWaylineFileUtils.createWaylineFile(xmlModel,patchesConfigPojo.getTemplate(),patchesConfigPojo.getTargetTemplate(),patchesConfigPojo.getWaylines(),patchesConfigPojo.getTargetWaylines());
// 压缩文件夹中的内容
- String destKMZFile = outkmz+waylineName+".kmz"; // 输出的KMZ文件路径
- zipFolder(sourceDir, destKMZFile);
+ String destKMZFile = patchesConfigPojo.getDestKMZFile() + waylineName + ".kmz"; // 输出的KMZ文件路径
+ zipFolder(patchesConfigPojo.getSourceDir(), destKMZFile);
multipartFile = convert(new File(destKMZFile));
return multipartFile;
}
- }
+}
--
Gitblit v1.9.3