From 8d9a2d656e4ae007590c622e5f7c228adacdca49 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Fri, 14 Jun 2024 10:11:36 +0800
Subject: [PATCH] 统一风格
---
src/main/java/com/dji/sample/patches/xml/utils/CreateWaylineFileUtils.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 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 a503b0c..e213807 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.*;
@@ -24,7 +23,6 @@
*/
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");
@@ -43,12 +41,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