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 | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 50 insertions(+), 9 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 783155b..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
@@ -1,31 +1,55 @@
package com.dji.sample.patches.service.impl;
+import com.dji.sample.common.error.CommonErrorEnum;
+import com.dji.sample.component.mqtt.model.RequestsReply;
import com.dji.sample.patches.dao.ShpToDataSourceMapper;
import com.dji.sample.patches.model.entity.LotInfo;
import com.dji.sample.patches.service.ShpToDataSourceService;
import com.dji.sample.patches.utils.FormatConversionUtil;
+import com.dji.sample.patches.utils.GeoToolsUtil;
import com.dji.sample.patches.utils.MultipartFileTOFileUtil;
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.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.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.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;
+// String sourceDir = "src/main/resources/template/wpmz/"; // 源文件夹路径
+ String sourceDir = "/home/drone/server/template/wpmz/"; // 源文件夹路径
+
+ MultipartFile multipartFile;
+
String json;
- public List<LotInfo> insertGeo(MultipartFile file ,String itemId) throws IOException {
- List<LotInfo> list=new ArrayList<>();
+ 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);
List<String> s = ShapeFileUtil.shpToGeoJson(file1);
@@ -38,14 +62,31 @@
String uuid = UUID.randomUUID().toString();
String bsm = uuid.replaceAll("-", "");
lotInfo.setBsm(bsm);
- lotInfo.setItemId(itemId);
+ lotInfo.setWorkspaceId(workspaceId);
lotInfo.setDkfw(json);
- lotInfo.setDkbh("dkbh"+i);
- mapper.insert(lotInfo);
+ lotInfo.setDkbh("dkbh" + i);
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);
}
- return list;
+ Coordinate[] coordinates = GeoToolsUtil.getRoutePointOrder(list, airportLat, airportLon);
+ XMLTemplateModel xmlModel = XMLTemplateModel.init(coordinates, list);
+ CreateWaylineFileUtils.createWaylineFile(xmlModel);
+ // 压缩文件夹中的内容
+// 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;
+
}
}
+
+
+
--
Gitblit v1.9.3