From 5245fffadd41c6e83b24c6706e6feb54a6a0ca7b Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Wed, 10 Apr 2024 15:27:38 +0800
Subject: [PATCH] 修改图斑模块的接口信息，修复航线bug
---
src/main/java/com/dji/sample/patches/service/impl/ShpToDataSourceServiceImpl.java | 88 +++++++++++++++++---------------------------
1 files changed, 34 insertions(+), 54 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 892c234..563642f 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
@@ -11,44 +11,44 @@
import com.dji.sample.patches.utils.ShapeFileUtil;
import com.dji.sample.patches.xml.mode.XMLTemplateModel;
import com.dji.sample.patches.xml.utils.CreateWaylineFileUtils;
+import com.dji.sample.territory.model.entity.TbDkjbxxEntity;
+import com.dji.sample.wayline.service.IWaylineFileService;
import org.locationtech.jts.geom.Coordinate;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.io.FileSystemResource;
-import org.springframework.core.io.Resource;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
+import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
+import javax.sql.DataSource;
import java.io.File;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.sql.Statement;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
-
-import static com.dji.sample.common.error.CommonErrorEnum.ILLEGAL_ARGUMENT;
-import static com.dji.sample.patches.utils.ZipUtil.compressToKMZ;
+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.*;
import static org.locationtech.jts.io.WKTConstants.POLYGON;
@Service
public class ShpToDataSourceServiceImpl implements ShpToDataSourceService {
+
@Autowired
private ShpToDataSourceMapper mapper;
+
+ @Autowired
+ private IWaylineFileService service;
String head = POLYGON;
- double airportLat = 28.624514734; // 机场纬度
- double airportLon = 115.856725497; // 机场经度
+// String sourceDir = "src/main/resources/template/wpmz/"; // 源文件夹路径
+ String sourceDir = "/home/drone/server/template/wpmz/"; // 源文件夹路径
- String kmlFilePath = "src/main/resources/template/wpmz/template.kml"; // KML文件路径
- String wpmlFilePath = "src/main/resources/template/wpmz/waylines.wpml"; // WPML文件路径
- String end = ".kmz";
+ MultipartFile multipartFile;
+
String json;
-
- public List<LotInfo> insertGeo(MultipartFile file, String workspaceId, String waylineName) throws IOException {
+ 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);
@@ -65,48 +65,28 @@
lotInfo.setWorkspaceId(workspaceId);
lotInfo.setDkfw(json);
lotInfo.setDkbh("dkbh" + i);
- mapper.insert(lotInfo);
list.add(lotInfo);
- System.out.println(lotInfo);
+ 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);
- String destinationKMZFilePath = "src/main/resources/template/kmz/" + waylineName + ".kmz";
- try {
- compressToKMZ(kmlFilePath, wpmlFilePath, destinationKMZFilePath);
- System.out.println("Files compressed to KMZ successfully.");
- } catch (IOException e) {
- e.printStackTrace();
- System.out.println("Error compressing files to KMZ: " + e.getMessage());
- }
- return list;
+ // 压缩文件夹中的内容
+// String destKMZFile = "src/main/resources/template/kmz/"+waylineName+".kmz"; // 输出的KMZ文件路径
+ String destKMZFile = "/home/drone/server/template/kmz/"+waylineName+".kmz"; // 输出的KMZ文件路径
+ zipFolder(sourceDir, destKMZFile);
+// multipartFile = convert(new File("src/main/resources/template/kmz/"+waylineName+".kmz"));
+ multipartFile = convert(new File("/home/drone/server/template/kmz/"+waylineName+".kmz"));
+ return multipartFile;
+
}
- public ResponseEntity<Resource> backWayline(String fileName) {
- String name = fileName + end;
- try {
- File kmzFile = new File("src/main/resources/template/kmz/" + name);
- boolean kzm=(kmzFile.exists());
- System.out.println(kzm);
- System.out.println(kmzFile);
- if (!kzm) {
- System.out.println(kzm);
- // 如果文件不存在，返回404 Not Found响应
- return ResponseEntity.status(HttpStatus.NOT_FOUND).body(null);
- }
- HttpHeaders headers = new HttpHeaders();
- headers.add(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + name + "\"");
- headers.add(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_OCTET_STREAM_VALUE);
- return ResponseEntity.ok().headers(headers).contentLength(kmzFile.length()).
- contentType(MediaType.APPLICATION_OCTET_STREAM).body(new FileSystemResource(kmzFile));
- } catch (Exception e) {
- e.printStackTrace();
- return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null);
- }
- }
}
-
--
Gitblit v1.9.3