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/java/com/dji/sample/patches/service/impl/ShpToDataSourceServiceImpl.java | 10 +++-------
1 files changed, 3 insertions(+), 7 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;
}
--
Gitblit v1.9.3