From 50bd5f255da2bc28de8044cea0b2fe16a8c67070 Mon Sep 17 00:00:00 2001 From: yuejiajun <1530620364@qq.com> Date: Sun, 28 Sep 2025 17:33:45 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E7=94=A8=E8=87=AA=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E5=87=BD=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../draft/demo043/ApplicationTest__03.java | 7 +++- .../demo043/core/EnhancedConfigProcessor.java | 4 ++ .../data/03-任务航线/20250923_422dc2.xml | 2 +- .../data/03-任务航线/20250923_4c32c8.xml | 2 +- .../data/03-任务航线/20250923_82c579.xml | 2 +- .../data/03-任务航线/20250923_b43a26.xml | 2 +- .../data/03-任务航线/20250923_c87aa1.xml | 2 +- .../resources/data/03-任务航线/default.json | 42 +++++++++++++------ 8 files changed, 43 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/example/demo/draft/demo043/ApplicationTest__03.java b/src/main/java/com/example/demo/draft/demo043/ApplicationTest__03.java index b549c5a..26696c5 100644 --- a/src/main/java/com/example/demo/draft/demo043/ApplicationTest__03.java +++ b/src/main/java/com/example/demo/draft/demo043/ApplicationTest__03.java @@ -44,8 +44,11 @@ public class ApplicationTest__03 { } // Step.2 - String targetContent = Files.readString(Path.of(processJSONFile), StandardCharsets.UTF_8); - List list = JSON.parseArray(targetContent); +// String targetContent = Files.readString(Path.of(processJSONFile), StandardCharsets.UTF_8); +// List list = JSON.parseArray(targetContent); + + // 通过 ｛｛key｝｝ 限制变量范围 + List list = FormatUtil.loadJSON(processJSONFile); String templateContent = Files.readString(Path.of(inputTemplateData), StandardCharsets.UTF_8); ConfigDocument document = JSON.parseObject(templateContent, ConfigDocument.class); diff --git a/src/main/java/com/example/demo/draft/demo043/core/EnhancedConfigProcessor.java b/src/main/java/com/example/demo/draft/demo043/core/EnhancedConfigProcessor.java index 19454a5..e141b6f 100644 --- a/src/main/java/com/example/demo/draft/demo043/core/EnhancedConfigProcessor.java +++ b/src/main/java/com/example/demo/draft/demo043/core/EnhancedConfigProcessor.java @@ -270,6 +270,10 @@ public class EnhancedConfigProcessor { // 添加上下文和循环索引 params.put("context", context); params.put("loopIndex", loopIndex); + + // 参数 + value = params.get("params").toString(); + params.remove("params"); // 调用工具函数 result = callFormatUtilFunction(functionName, value, params); diff --git a/src/main/resources/data/03-任务航线/20250923_422dc2.xml b/src/main/resources/data/03-任务航线/20250923_422dc2.xml index 122eb51..615bf78 100644 --- a/src/main/resources/data/03-任务航线/20250923_422dc2.xml +++ b/src/main/resources/data/03-任务航线/20250923_422dc2.xml @@ -2,7 +2,7 @@ <任务航线> <航线点型号>WP003 <航线点名称>目标区域 - <航线点坐标>40.0042,116.6074 + <航线点坐标>120.3826,36.0673 <航线点类型>目标点 <准时到达时间>08:45:00 <转弯方式>盘旋 diff --git a/src/main/resources/data/03-任务航线/20250923_4c32c8.xml b/src/main/resources/data/03-任务航线/20250923_4c32c8.xml index 383b3f9..59ba31d 100644 --- a/src/main/resources/data/03-任务航线/20250923_4c32c8.xml +++ b/src/main/resources/data/03-任务航线/20250923_4c32c8.xml @@ -2,7 +2,7 @@ <任务航线> <航线点型号>WP002 <航线点名称>导航点A - <航线点坐标>39.9242,116.5074 + <航线点坐标>121.61,38.92 <航线点类型>航路点 <准时到达时间>08:15:30 <转弯方式>飞越转弯 diff --git a/src/main/resources/data/03-任务航线/20250923_82c579.xml b/src/main/resources/data/03-任务航线/20250923_82c579.xml index 5e2576b..5cac6a0 100644 --- a/src/main/resources/data/03-任务航线/20250923_82c579.xml +++ b/src/main/resources/data/03-任务航线/20250923_82c579.xml @@ -2,7 +2,7 @@ <任务航线> <航线点型号>WP005 <航线点名称>降落点 - <航线点坐标>39.9042,116.4074 + <航线点坐标>119.31,39.95 <航线点类型>降落点 <准时到达时间>09:45:00 <转弯方式>直接进近 diff --git a/src/main/resources/data/03-任务航线/20250923_b43a26.xml b/src/main/resources/data/03-任务航线/20250923_b43a26.xml index 9df08cb..cf18d05 100644 --- a/src/main/resources/data/03-任务航线/20250923_b43a26.xml +++ b/src/main/resources/data/03-任务航线/20250923_b43a26.xml @@ -2,7 +2,7 @@ <任务航线> <航线点型号>WP001 <航线点名称>起飞点 - <航线点坐标>39.9042,116.4074 + <航线点坐标>118.04,24.27 <航线点类型>起飞点 <准时到达时间>08:00:00 <转弯方式>直接转弯 diff --git a/src/main/resources/data/03-任务航线/20250923_c87aa1.xml b/src/main/resources/data/03-任务航线/20250923_c87aa1.xml index 0e0bbfa..d635134 100644 --- a/src/main/resources/data/03-任务航线/20250923_c87aa1.xml +++ b/src/main/resources/data/03-任务航线/20250923_c87aa1.xml @@ -2,7 +2,7 @@ <任务航线> <航线点型号>WP004 <航线点名称>返航点 - <航线点坐标>39.9542,116.4574 + <航线点坐标>110.37,21.27 <航线点类型>返航点 <准时到达时间>09:30:00 <转弯方式>标准转弯 diff --git a/src/main/resources/data/03-任务航线/default.json b/src/main/resources/data/03-任务航线/default.json index 8def441..4d90665 100644 --- a/src/main/resources/data/03-任务航线/default.json +++ b/src/main/resources/data/03-任务航线/default.json @@ -18,11 +18,27 @@ "values": [ { "combined": false, - "value": "39.9242N" + "value": "{{任务航线.北纬}}", + "utilFunction": { + "regexReplace": { + "params": "{{任务航线.航线点坐标}}", + "description": "通过正则表达式获取经纬度", + "pattern": "([0-9]+[\\.]{0,}[0-9]{0,}),([0-9]+[\\.]{0,}[0-9]{0,})", + "replacement": "$2N" + } + } }, { "combined": false, - "value": "116.5074E" + "value": "{{任务航线.东经}}", + "utilFunction": { + "regexReplace": { + "params": "{{任务航线.航线点坐标}}", + "description": "通过正则表达式获取经纬度", + "pattern": "([0-9]+[\\.]{0,}[0-9]{0,}),([0-9]+[\\.]{0,}[0-9]{0,})", + "replacement": "$1E" + } + } } ] }, @@ -32,7 +48,7 @@ "values": [ { "combined": false, - "value": "任务航线.航线点类型" + "value": "{{任务航线.航线点类型}}" } ] }, @@ -42,7 +58,7 @@ "values": [ { "combined": false, - "value": "任务航线.准时到达时间" + "value": "{{任务航线.准时到达时间}}" } ] }, @@ -52,7 +68,7 @@ "values": [ { "combined": false, - "value": "任务航线.转弯方式" + "value": "{{任务航线.转弯方式}}" } ] }, @@ -62,7 +78,7 @@ "values": [ { "combined": false, - "value": "任务航线.转向方式" + "value": "{{任务航线.转向方式}}" } ] }, @@ -73,7 +89,7 @@ { "combined": false, "unit": "deg", - "value": "任务航线.坡度" + "value": "{{任务航线.坡度}}" } ] }, @@ -84,7 +100,7 @@ { "combined": false, "unit": "km/h", - "value": "任务航线.速度" + "value": "{{任务航线.速度}}" } ] }, @@ -95,7 +111,7 @@ { "combined": false, "unit": "m", - "value": "任务航线.高度" + "value": "{{任务航线.高度}}" } ] }, @@ -105,7 +121,7 @@ "values": [ { "combined": false, - "value": "任务航线.高度属性" + "value": "{{任务航线.高度属性}}" } ] }, @@ -116,14 +132,14 @@ { "combined": false, "unit": "m/s", - "value": "任务航线.升降率" + "value": "{{任务航线.升降率}}" } ] } ], "values": [ - "任务航线.航线点型号", - "任务航线.航线点名称" + "{{任务航线.航线点型号}}", + "{{任务航线.航线点名称}}" ] } ],