From 2d623bef90f62d1a1ffff84736ec83d7846cd1cd Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Wed, 26 Nov 2025 14:31:32 +0800
Subject: [PATCH] 2025-11-26 zwy 不替换http路径，直接用航线文件的path
---
ard-sample/src/main/java/com/ard/sample/wayline/service/impl/WaylineJobServiceImpl.java | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/ard-sample/src/main/java/com/ard/sample/wayline/service/impl/WaylineJobServiceImpl.java b/ard-sample/src/main/java/com/ard/sample/wayline/service/impl/WaylineJobServiceImpl.java
index 5714a29..64faa90 100644
--- a/ard-sample/src/main/java/com/ard/sample/wayline/service/impl/WaylineJobServiceImpl.java
+++ b/ard-sample/src/main/java/com/ard/sample/wayline/service/impl/WaylineJobServiceImpl.java
@@ -235,8 +235,11 @@
.outOfControlAction(waylineJob.getOutOfControlAction())
.rthMode(waylineJob.getRthMode())
.file(WaylineTaskFileDTO.builder()
- .url(url.toString().replace("https//192.168.10.103:9001", "http//192.168.10.103:9002"))
+// .url(url.toString().replace("https://192.168.10.103:9001", "http://192.168.10.103:9011"))
// .fingerprint(waylineFile.get().getSign())
+// .replace("https://", "http://")
+// .replace("9001", "9011")
+ .url(url.toString())
.fingerprint(md5)
.build())
// .simulateMission(WaylineSimulateMissionDTO.builder()
@@ -728,9 +731,11 @@
// url = waylineFileService.getObjectUrl(waylineFile.get().getWaylineId());
// url = new URL(ardRouteOpt.getUpPath());
- Map<String, Object> jsonResourceGet = new HashMap<>();
- jsonResourceGet.put("url", url.toString().replace("https//192.168.10.103:9001", "http//192.168.10.103:9002"));
- jsonResourceGet.put("fingerprint", md5);
+// Map<String, Object> jsonResourceGet = new HashMap<>();
+// jsonResourceGet.put("url", url.toString().replace("https//192.168.10.103:9001", "http//192.168.10.103:9002"));
+// jsonResourceGet.put("fingerprint", md5);
+// .replace("https://", "http://")
+// .replace("9001", "9011")
builder.data(RequestsReply.success(WaylineTaskCreateDTO.builder()
.file(WaylineTaskFileDTO.builder()
@@ -738,12 +743,6 @@
.fingerprint(md5)
.build())
.build()));
-
-// WaylineTaskFileDTO.builder()
-// .url(url.toString())
-//// .fingerprint(waylineFile.get().getSign())
-// .fingerprint(md5)
-// .build()
} catch (NullPointerException | IOException e) {
e.printStackTrace();
--
Gitblit v1.9.3