From 39ffdf5754b4ebca682bd3c925f7a500e8a1bbda Mon Sep 17 00:00:00 2001
From: aix <vip_xiaobin810@163.com>
Date: Thu, 08 Aug 2024 16:56:36 +0800
Subject: [PATCH] 国土调查云身份凭证token
---
src/main/java/com/dji/sample/patches/xml/utils/CreateWaylineFileUtils.java | 33 +++++++++++++++------------------
1 files changed, 15 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/dji/sample/patches/xml/utils/CreateWaylineFileUtils.java b/src/main/java/com/dji/sample/patches/xml/utils/CreateWaylineFileUtils.java
index a7f1cfc..20fa4dc 100644
--- a/src/main/java/com/dji/sample/patches/xml/utils/CreateWaylineFileUtils.java
+++ b/src/main/java/com/dji/sample/patches/xml/utils/CreateWaylineFileUtils.java
@@ -3,7 +3,6 @@
import com.dji.sample.patches.xml.mode.XMLTemplateModel;
import freemarker.template.Configuration;
import freemarker.template.Template;
-import org.springframework.beans.factory.annotation.Value;
import lombok.extern.slf4j.Slf4j;
import java.io.*;
@@ -18,27 +17,21 @@
@Slf4j
public class CreateWaylineFileUtils {
- @Value("${xml.temple.template}")
- static String templeFilePath;
- @Value("${xml.temple.waylines}")
- static String waylineFilePath;
-
- @Value("${xml.target.template}")
- static String targetTempleFilePath;
- @Value("${xml.target.waylines}")
- static String targetWaylineFilePath;
/**
* 生成航线文件
* @param xmlModel
*/
- public static void createWaylineFile(XMLTemplateModel xmlModel) {
+ public static void createWaylineFile(XMLTemplateModel xmlModel,String templeFilePath,String targetTempleFilePath,String waylineFilePath,String targetWaylineFilePath) {
-
-// xml2XmlDoc(xmlModel, "home\\drone\\server\\template\\template.xml", "home\\drone\\server\\template\\wpmz\\template.kml");
-// xml2XmlDoc(xmlModel, "home\\drone\\server\\template\\waylines.xml", "home\\drone\\server\\template\\wpmz\\waylines.wpml");
+// xml2XmlDoc(xmlModel, "home\\drone\\server\\template\\template.kml", "home\\drone\\server\\template\\wpmz\\template.kml");
+// xml2XmlDoc(xmlModel, "home\\drone\\server\\template\\waylines.wpml", "home\\drone\\server\\template\\wpmz\\waylines.wpml");
xml2XmlDoc(xmlModel, templeFilePath, targetTempleFilePath);
xml2XmlDoc(xmlModel, waylineFilePath, targetWaylineFilePath);
+ }
+
+ public static void createWaylineFileByPolygon(XMLTemplateModel xmlModel,String templeFilePath,String targetTempleFilePath) {
+ xml2XmlDoc(xmlModel, templeFilePath, targetTempleFilePath);
}
/**
@@ -52,12 +45,16 @@
Writer out = null;
try {
// 将模板文件路径拆分为文件夹路径和文件名称
- String tempLetDir = templetFilePath.substring(0, templetFilePath.lastIndexOf("\\"));
+ String ge = "/";
+ if (templetFilePath.indexOf("\\") >= 0) {
+ ge = "\\";
+ }
+ String tempLetDir = templetFilePath.substring(0, templetFilePath.lastIndexOf(ge));
// 注意：templetFilePath.lastIndexOf("/")中，有的文件分隔符为：\ 要注意文件路径的分隔符
- String templetName = templetFilePath.substring(templetFilePath.lastIndexOf("\\") + 1);
+ String templetName = templetFilePath.substring(templetFilePath.lastIndexOf(ge) + 1);
// 将目标文件保存路径拆分为文件夹路径和文件名称
- String targetDir = targetFilePath.substring(0, targetFilePath.lastIndexOf("\\"));
- String targetName = targetFilePath.substring(targetFilePath.lastIndexOf("\\") + 1);
+ String targetDir = targetFilePath.substring(0, targetFilePath.lastIndexOf(ge));
+ String targetName = targetFilePath.substring(targetFilePath.lastIndexOf(ge) + 1);
Configuration configuration = new Configuration();
configuration.setDefaultEncoding(String.valueOf(StandardCharsets.UTF_8));
// 如果目标文件目录不存在创建
--
Gitblit v1.9.3