From 1d1e36c0d117e26c68cf277652158116a150165e Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Thu, 11 Apr 2024 14:00:45 +0800
Subject: [PATCH] 图斑文件存放地址配置
---
src/main/resources/application-dev.yml | 2 +-
src/main/resources/application-prod.yml | 14 +++++++-------
src/main/java/com/dji/sample/patches/service/impl/ShpToDataSourceServiceImpl.java | 10 +++-------
3 files changed, 11 insertions(+), 15 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 81afe7e..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
@@ -36,10 +36,6 @@
@Autowired
private IWaylineFileService service;
private String head = POLYGON;
- @Value("${patches.url.path.kmz.sourceDir}")
- private String sourceDir;
- @Value("${patches.url.path.kmz.destKMZFile}")
- private String outkmz;
private MultipartFile multipartFile;
String json;
@@ -73,10 +69,10 @@
}
Coordinate[] coordinates = GeoToolsUtil.getRoutePointOrder(list, airportLat, airportLon);
XMLTemplateModel xmlModel = XMLTemplateModel.init(coordinates, list);
- CreateWaylineFileUtils.createWaylineFile(xmlModel,patchesConfigPojo.getWaylines(),patchesConfigPojo.getWaylines(),patchesConfigPojo.getWaylines(),patchesConfigPojo.getWaylines());
+ 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;
}
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 71140ab..2ab7819 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -90,7 +90,7 @@
patches:
url:
path:
- unzip: D:\\tmp\\
+ unzip: src/main/resources/tmp/
kmz:
destKMZFile: src/main/resources/template/kmz/
sourceDir: src/main/resources/template/wpmz/
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index afc5548..25e669e 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -98,10 +98,10 @@
destKMZFile: /home/drone/server/template/kmz/
sourceDir: /home/drone/server/template/wpmz/
#解析图斑航线模板的地址
-xml:
- temple:
- template: /home/drone/server/template/template.xml
- waylines: /home/drone/server/template/waylines.xml
- target:
- template: /home/drone/server/template/wpmz/template.kml
- waylines: /home/drone/server/template/wpmz/waylines.wpml
\ No newline at end of file
+ xml:
+ temple:
+ template: /home/drone/server/template/template.xml
+ waylines: /home/drone/server/template/waylines.xml
+ target:
+ template: /home/drone/server/template/wpmz/template.kml
+ waylines: /home/drone/server/template/wpmz/waylines.wpml
\ No newline at end of file
--
Gitblit v1.9.3