From bc2ebb48969794a75e5f13ae3b8554557c3e7dbe Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Wed, 10 Apr 2024 18:20:03 +0800
Subject: [PATCH] 完善图斑线上配置
---
src/main/java/com/dji/sample/patches/utils/MultipartFileTOFileUtil.java | 5 ++
src/main/resources/template/wpmz/waylines.wpml | 80 ++++++++++++++++++++--------------------
src/main/resources/application-dev.yml | 8 ++++
src/main/resources/application-prod.yml | 9 ++++
src/main/java/com/dji/sample/patches/service/impl/ShpToDataSourceServiceImpl.java | 18 ++++----
5 files changed, 69 insertions(+), 51 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 82afe87..21bb3ff 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
@@ -12,6 +12,7 @@
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.Value;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import java.io.File;
@@ -32,9 +33,10 @@
@Autowired
private IWaylineFileService service;
String head = POLYGON;
-// String sourceDir = "src/main/resources/template/wpmz/"; // 源文件夹路径
- String sourceDir = "/home/drone/server/template/wpmz/"; // 源文件夹路径
-
+ @Value("${Patches.url.path.kmz.sourceDir}")
+ String sourceDir ;
+ @Value("${Patches.url.path.kmz.destKMZFile}")
+ String outkmz;
MultipartFile multipartFile;
String json;
@@ -67,15 +69,13 @@
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文件路径
+ String destKMZFile = outkmz+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"));
+ multipartFile = convert(new File(destKMZFile));
return multipartFile;
-
}
-}
+ }
+
diff --git a/src/main/java/com/dji/sample/patches/utils/MultipartFileTOFileUtil.java b/src/main/java/com/dji/sample/patches/utils/MultipartFileTOFileUtil.java
index 2f94bf1..8d59f7f 100644
--- a/src/main/java/com/dji/sample/patches/utils/MultipartFileTOFileUtil.java
+++ b/src/main/java/com/dji/sample/patches/utils/MultipartFileTOFileUtil.java
@@ -2,6 +2,7 @@
import org.apache.http.entity.ContentType;
import org.apache.tomcat.util.http.fileupload.FileItem;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.MediaType;
import org.springframework.mock.web.MockMultipartFile;
import org.springframework.web.multipart.MultipartFile;
@@ -11,12 +12,14 @@
import java.util.UUID;
public class MultipartFileTOFileUtil {
+ @Value("${Patches.url.path.unzip}")
+ String url;
//MultiparFile转File
public File multipartFile2File(MultipartFile multipartFile) {
String tmpFileDir = null;
// 创建临时文件
String randomFileName = UUID.randomUUID().toString();
- tmpFileDir = "D:/tmp/" + randomFileName;
+ tmpFileDir = url+ randomFileName;
File file = new File(tmpFileDir);
InputStream inputStream = null;
FileOutputStream outputStream = null;
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index b86d9c3..36b802b 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -86,3 +86,11 @@
object-dir-prefix:
out-net-file-address: http://dev.jxpskj.com:9000
+#图斑的解压地址和图斑文件转航线文件的地址
+Patches:
+ url:
+ path:
+ unzip: D:/tmp/
+ kmz:
+ destKMZFile: src/main/resources/template/kmz/
+ sourceDir: src/main/resources/template/wpmz/
\ No newline at end of file
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index ed74bbe..205a2f1 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -73,4 +73,11 @@
object-dir-prefix:
out-net-file-address: http://dev.jxpskj.com:9000
-
+#图斑的解压地址和图斑文件转航线文件的地址
+Patches:
+ url:
+ path:
+ unzip: /home/drone/server/temp
+ kmz:
+ destKMZFile: /home/drone/server/template/kmz/
+ sourceDir: /home/drone/server/template/wpmz/
diff --git a/src/main/resources/template/wpmz/waylines.wpml b/src/main/resources/template/wpmz/waylines.wpml
index 35a6b1f..c342f04 100644
--- a/src/main/resources/template/wpmz/waylines.wpml
+++ b/src/main/resources/template/wpmz/waylines.wpml
@@ -27,7 +27,7 @@
<Placemark>
<Point>
<coordinates>
- 115.86,28.6203
+ 115.8576,28.5751
</coordinates>
</Point>
<wpml:index>0</wpml:index>
@@ -85,7 +85,7 @@
<Placemark>
<Point>
<coordinates>
- 115.86,28.6142
+ 115.8576,28.5729
</coordinates>
</Point>
<wpml:index>1</wpml:index>
@@ -143,7 +143,7 @@
<Placemark>
<Point>
<coordinates>
- 115.8664,28.6142
+ 115.8591,28.5729
</coordinates>
</Point>
<wpml:index>2</wpml:index>
@@ -201,7 +201,7 @@
<Placemark>
<Point>
<coordinates>
- 115.8664,28.6203
+ 115.8591,28.5751
</coordinates>
</Point>
<wpml:index>3</wpml:index>
@@ -259,7 +259,7 @@
<Placemark>
<Point>
<coordinates>
- 115.8643,28.6357
+ 115.8834,28.5772
</coordinates>
</Point>
<wpml:index>4</wpml:index>
@@ -317,7 +317,7 @@
<Placemark>
<Point>
<coordinates>
- 115.8643,28.6331
+ 115.8834,28.5721
</coordinates>
</Point>
<wpml:index>5</wpml:index>
@@ -375,7 +375,7 @@
<Placemark>
<Point>
<coordinates>
- 115.867,28.6331
+ 115.8875,28.5721
</coordinates>
</Point>
<wpml:index>6</wpml:index>
@@ -433,7 +433,7 @@
<Placemark>
<Point>
<coordinates>
- 115.867,28.6357
+ 115.8875,28.5772
</coordinates>
</Point>
<wpml:index>7</wpml:index>
@@ -491,7 +491,7 @@
<Placemark>
<Point>
<coordinates>
- 115.841,28.6317
+ 115.86,28.6203
</coordinates>
</Point>
<wpml:index>8</wpml:index>
@@ -549,7 +549,7 @@
<Placemark>
<Point>
<coordinates>
- 115.841,28.6305
+ 115.86,28.6142
</coordinates>
</Point>
<wpml:index>9</wpml:index>
@@ -607,7 +607,7 @@
<Placemark>
<Point>
<coordinates>
- 115.844,28.6305
+ 115.8664,28.6142
</coordinates>
</Point>
<wpml:index>10</wpml:index>
@@ -665,7 +665,7 @@
<Placemark>
<Point>
<coordinates>
- 115.844,28.6317
+ 115.8664,28.6203
</coordinates>
</Point>
<wpml:index>11</wpml:index>
@@ -723,7 +723,7 @@
<Placemark>
<Point>
<coordinates>
- 115.8381,28.6187
+ 115.8643,28.6357
</coordinates>
</Point>
<wpml:index>12</wpml:index>
@@ -781,7 +781,7 @@
<Placemark>
<Point>
<coordinates>
- 115.8381,28.6161
+ 115.8643,28.6331
</coordinates>
</Point>
<wpml:index>13</wpml:index>
@@ -839,7 +839,7 @@
<Placemark>
<Point>
<coordinates>
- 115.8413,28.6161
+ 115.867,28.6331
</coordinates>
</Point>
<wpml:index>14</wpml:index>
@@ -897,7 +897,7 @@
<Placemark>
<Point>
<coordinates>
- 115.8413,28.6187
+ 115.867,28.6357
</coordinates>
</Point>
<wpml:index>15</wpml:index>
@@ -955,7 +955,7 @@
<Placemark>
<Point>
<coordinates>
- 115.8059,28.6239
+ 115.841,28.6317
</coordinates>
</Point>
<wpml:index>16</wpml:index>
@@ -1013,7 +1013,7 @@
<Placemark>
<Point>
<coordinates>
- 115.8059,28.622
+ 115.841,28.6305
</coordinates>
</Point>
<wpml:index>17</wpml:index>
@@ -1071,7 +1071,7 @@
<Placemark>
<Point>
<coordinates>
- 115.8102,28.622
+ 115.844,28.6305
</coordinates>
</Point>
<wpml:index>18</wpml:index>
@@ -1129,7 +1129,7 @@
<Placemark>
<Point>
<coordinates>
- 115.8102,28.6239
+ 115.844,28.6317
</coordinates>
</Point>
<wpml:index>19</wpml:index>
@@ -1187,7 +1187,7 @@
<Placemark>
<Point>
<coordinates>
- 115.8297,28.6659
+ 115.8381,28.6187
</coordinates>
</Point>
<wpml:index>20</wpml:index>
@@ -1245,7 +1245,7 @@
<Placemark>
<Point>
<coordinates>
- 115.8297,28.6604
+ 115.8381,28.6161
</coordinates>
</Point>
<wpml:index>21</wpml:index>
@@ -1303,7 +1303,7 @@
<Placemark>
<Point>
<coordinates>
- 115.837,28.6604
+ 115.8413,28.6161
</coordinates>
</Point>
<wpml:index>22</wpml:index>
@@ -1361,7 +1361,7 @@
<Placemark>
<Point>
<coordinates>
- 115.837,28.6659
+ 115.8413,28.6187
</coordinates>
</Point>
<wpml:index>23</wpml:index>
@@ -1419,7 +1419,7 @@
<Placemark>
<Point>
<coordinates>
- 115.8575,28.6791
+ 115.8059,28.6239
</coordinates>
</Point>
<wpml:index>24</wpml:index>
@@ -1477,7 +1477,7 @@
<Placemark>
<Point>
<coordinates>
- 115.8575,28.6762
+ 115.8059,28.622
</coordinates>
</Point>
<wpml:index>25</wpml:index>
@@ -1535,7 +1535,7 @@
<Placemark>
<Point>
<coordinates>
- 115.8637,28.6762
+ 115.8102,28.622
</coordinates>
</Point>
<wpml:index>26</wpml:index>
@@ -1593,7 +1593,7 @@
<Placemark>
<Point>
<coordinates>
- 115.8637,28.6791
+ 115.8102,28.6239
</coordinates>
</Point>
<wpml:index>27</wpml:index>
@@ -1651,7 +1651,7 @@
<Placemark>
<Point>
<coordinates>
- 115.9122,28.6232
+ 115.8297,28.6659
</coordinates>
</Point>
<wpml:index>28</wpml:index>
@@ -1709,7 +1709,7 @@
<Placemark>
<Point>
<coordinates>
- 115.9122,28.6212
+ 115.8297,28.6604
</coordinates>
</Point>
<wpml:index>29</wpml:index>
@@ -1767,7 +1767,7 @@
<Placemark>
<Point>
<coordinates>
- 115.916,28.6212
+ 115.837,28.6604
</coordinates>
</Point>
<wpml:index>30</wpml:index>
@@ -1825,7 +1825,7 @@
<Placemark>
<Point>
<coordinates>
- 115.916,28.6232
+ 115.837,28.6659
</coordinates>
</Point>
<wpml:index>31</wpml:index>
@@ -1883,7 +1883,7 @@
<Placemark>
<Point>
<coordinates>
- 115.8834,28.5772
+ 115.8575,28.6791
</coordinates>
</Point>
<wpml:index>32</wpml:index>
@@ -1941,7 +1941,7 @@
<Placemark>
<Point>
<coordinates>
- 115.8834,28.5721
+ 115.8575,28.6762
</coordinates>
</Point>
<wpml:index>33</wpml:index>
@@ -1999,7 +1999,7 @@
<Placemark>
<Point>
<coordinates>
- 115.8875,28.5721
+ 115.8637,28.6762
</coordinates>
</Point>
<wpml:index>34</wpml:index>
@@ -2057,7 +2057,7 @@
<Placemark>
<Point>
<coordinates>
- 115.8875,28.5772
+ 115.8637,28.6791
</coordinates>
</Point>
<wpml:index>35</wpml:index>
@@ -2115,7 +2115,7 @@
<Placemark>
<Point>
<coordinates>
- 115.8576,28.5751
+ 115.9122,28.6232
</coordinates>
</Point>
<wpml:index>36</wpml:index>
@@ -2173,7 +2173,7 @@
<Placemark>
<Point>
<coordinates>
- 115.8576,28.5729
+ 115.9122,28.6212
</coordinates>
</Point>
<wpml:index>37</wpml:index>
@@ -2231,7 +2231,7 @@
<Placemark>
<Point>
<coordinates>
- 115.8591,28.5729
+ 115.916,28.6212
</coordinates>
</Point>
<wpml:index>38</wpml:index>
@@ -2289,7 +2289,7 @@
<Placemark>
<Point>
<coordinates>
- 115.8591,28.5751
+ 115.916,28.6232
</coordinates>
</Point>
<wpml:index>39</wpml:index>
--
Gitblit v1.9.3