From e116a1eff34b9a867b48a8cd6d5078101a2d6f6f Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Wed, 26 Nov 2025 14:39:06 +0800
Subject: [PATCH] 2025-11-26 zwy 直接用航线文件的path1路径
---
ard-sample/src/main/java/com/ard/sample/wayline/service/impl/WaylineJobServiceImpl.java | 24 ++++++++++--------------
1 files changed, 10 insertions(+), 14 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 07f3ba4..ce882fd 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
@@ -212,11 +212,11 @@
// get file url
// URL url = waylineFileService.getObjectUrl(waylineFile.get().getWaylineId());
URL url = null;
- String minioUrl = subStringMinioUrlName(ardRouteOpt.getPath());
+ String minioUrl = subStringMinioUrlName(ardRouteOpt.getPath1());
String md5 = "";
try (InputStream inputStream = _ossService.getObject(kmzPath, minioUrl)) {
md5 = DigestUtils.md5Hex(inputStream);
- url = new URL(ardRouteOpt.getPath());
+ url = new URL(ardRouteOpt.getPath1());
log.info("机场任务航线文件url地址：{}", url);
log.info("机场任务航线文件md5值：{}", md5);
} catch (Exception e) {
@@ -237,8 +237,9 @@
.file(WaylineTaskFileDTO.builder()
// .url(url.toString().replace("https://192.168.10.103:9001", "http://192.168.10.103:9011"))
// .fingerprint(waylineFile.get().getSign())
- .url(url.toString().replace("https://", "http://")
- .replace("9001", "9011"))
+// .replace("https://", "http://")
+// .replace("9001", "9011")
+ .url(url.toString())
.fingerprint(md5)
.build())
// .simulateMission(WaylineSimulateMissionDTO.builder()
@@ -719,11 +720,11 @@
// get file url
URL url = null;
- String minioUrl = subStringMinioUrlName(ardRouteOpt.getPath());
+ String minioUrl = subStringMinioUrlName(ardRouteOpt.getPath1());
String md5 = "";
try (InputStream inputStream = _ossService.getObject(kmzPath, minioUrl)) {
md5 = DigestUtils.md5Hex(inputStream);
- url = new URL(ardRouteOpt.getPath());
+ url = new URL(ardRouteOpt.getPath1());
log.info("机场通过flightTaskResourceGet获取航线文件地址，jobId: " + jobId + " 返回信息为url：" + url.toString() + " md5：" + md5);
// }
// try {
@@ -733,20 +734,15 @@
// 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()
- .url(url.toString().replace("https://", "http://")
- .replace("9001", "9011"))
+ .url(url.toString())
.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