From 2db1aa88e8ab53096a936163d686b90d8e056a99 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Wed, 21 Aug 2024 23:18:33 +0800
Subject: [PATCH] 国土对接返回信息加密
---
src/main/java/com/dji/sample/patches/xml/utils/CreateWaylineFileUtils.java | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 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 0bd0cb8..7825a9c 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
@@ -21,9 +21,17 @@
* 生成航线文件
* @param xmlModel
*/
- public static void createWaylineFile(XMLTemplateModel xmlModel) {
- 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");
+ public static void createWaylineFile(XMLTemplateModel xmlModel,String templeFilePath,String targetTempleFilePath,String waylineFilePath,String targetWaylineFilePath) {
+
+// 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);
}
/**
@@ -37,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));
// 如果目标文件目录不存在创建
@@ -63,6 +75,7 @@
out.close();
} catch (Exception e) {
log.error("write xml failed:", e);
+ throw new RuntimeException(e);
} finally {
if (out != null) {
try {
--
Gitblit v1.9.3