From ae6cf3e11a1d05b38dc8c18af1d211839b2ff7b6 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Sat, 15 Nov 2025 15:35:22 +0800
Subject: [PATCH] 2025-11-15 zwy 增加循环任务枚举
---
ard-sample/src/main/java/com/ard/sample/wayline/service/impl/WaylineJobServiceImpl.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 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 7439c3a..3a32dd1 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
@@ -199,12 +199,12 @@
// get file url
// URL url = waylineFileService.getObjectUrl(waylineFile.get().getWaylineId());
URL url= null;
- String minioUrl = subStringMinioUrlName(ardRouteOpt.getUpPath());
+ String minioUrl = subStringMinioUrlName(ardRouteOpt.getPath());
String md5 = "";
try (InputStream inputStream = _ossService.getObject(kmzPath,minioUrl))
{
md5 = DigestUtils.md5Hex(inputStream);
- url = new URL(ardRouteOpt.getUpPath());
+ url = new URL(ardRouteOpt.getPath());
}
catch (Exception e) {
return ResponseResult.error("机场任务航线文件地址错误！" + e.getMessage());
@@ -506,7 +506,7 @@
// messageSender.publish(topic, builder.build());
// return;
// }
- // 修改航线文件名称，从ard_route_information航线表中取;
+ // 修改航线文件名称，从ard_route_info航线表中取;
// 换航线表
ArdRouteInfo ardRouteOpt = _ardRouteInfoService.selectArdRouteInfoById(waylineJob.getFileId());
if (ardRouteOpt == null) {
@@ -517,12 +517,12 @@
// get file url
URL url = null;
- String minioUrl = subStringMinioUrlName(ardRouteOpt.getUpPath());
+ String minioUrl = subStringMinioUrlName(ardRouteOpt.getPath());
String md5 = "";
try (InputStream inputStream = _ossService.getObject(kmzPath,minioUrl))
{
md5 = DigestUtils.md5Hex(inputStream);
- url = new URL(ardRouteOpt.getUpPath());
+ url = new URL(ardRouteOpt.getPath());
// }
// try {
// url = waylineFileService.getObjectUrl(waylineFile.get().getWaylineId());
@@ -628,7 +628,7 @@
if (entity == null) {
return null;
}
- // 修改航线文件名称，从ard_route_information航线表中取;
+ // 修改航线文件名称，从ard_route_info航线表中取;
WaylineJobDTO.WaylineJobDTOBuilder builder = WaylineJobDTO.builder()
.jobId(entity.getJobId())
.jobName(entity.getName())
--
Gitblit v1.9.3