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 | 29 ++++++++++++++---------------
1 files changed, 14 insertions(+), 15 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 22581c7..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
@@ -1,8 +1,8 @@
package com.ard.sample.wayline.service.impl;
import com.ard.oss.service.impl.OssServiceContext;
-import com.ard.route.domain.route.ArdRouteInformation;
-import com.ard.route.service.IArdRouteInformationService;
+import com.ard.route.domain.route.ArdRouteInfo;
+import com.ard.route.service.IArdRouteInfoService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -27,7 +27,6 @@
import com.ard.sample.wayline.model.enums.WaylineMethodEnum;
import com.ard.sample.wayline.model.enums.WaylineTaskTypeEnum;
import com.ard.sample.wayline.model.param.CreateJobParam;
-import com.ard.sample.wayline.service.IWaylineFileService;
import com.ard.sample.wayline.service.IWaylineJobService;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -45,7 +44,6 @@
import javax.annotation.Resource;
import java.io.IOException;
import java.io.InputStream;
-import java.net.MalformedURLException;
import java.net.URL;
import java.sql.SQLException;
import java.time.Instant;
@@ -55,6 +53,7 @@
import java.util.stream.Collectors;
import static com.ard.route.util.ToolUtils.kmzPath;
+import static com.ard.route.util.ToolUtils.subStringMinioUrlName;
/**
* @author sean
@@ -73,7 +72,7 @@
// private IWaylineFileService waylineFileService;
@Autowired
- private IArdRouteInformationService _ardRouteInformationService;
+ private IArdRouteInfoService _ardRouteInfoService;
@Resource
private OssServiceContext _ossService;
@@ -192,7 +191,7 @@
// return ResponseResult.error("机场任务航线不存在！");
// }
// 换航线表
- ArdRouteInformation ardRouteOpt = _ardRouteInformationService.selectArdRouteInformationById(waylineJob.getFileId());
+ ArdRouteInfo ardRouteOpt = _ardRouteInfoService.selectArdRouteInfoById(waylineJob.getFileId());
if (ardRouteOpt == null) {
return ResponseResult.error("机场任务航线不存在！");
}
@@ -200,12 +199,12 @@
// get file url
// URL url = waylineFileService.getObjectUrl(waylineFile.get().getWaylineId());
URL url= null;
- String minioUrl = ardRouteOpt.getMinioUpPath();
+ 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());
@@ -507,9 +506,9 @@
// messageSender.publish(topic, builder.build());
// return;
// }
- // 修改航线文件名称，从ard_route_information航线表中取;
+ // 修改航线文件名称，从ard_route_info航线表中取;
// 换航线表
- ArdRouteInformation ardRouteOpt = _ardRouteInformationService.selectArdRouteInformationById(waylineJob.getFileId());
+ ArdRouteInfo ardRouteOpt = _ardRouteInfoService.selectArdRouteInfoById(waylineJob.getFileId());
if (ardRouteOpt == null) {
builder.data(RequestsReply.error(CommonErrorEnum.ILLEGAL_ARGUMENT));
messageSender.publish(topic, builder.build());
@@ -518,12 +517,12 @@
// get file url
URL url = null;
- String minioUrl = ardRouteOpt.getMinioUpPath();
+ 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());
@@ -629,15 +628,15 @@
if (entity == null) {
return null;
}
- // 修改航线文件名称，从ard_route_information航线表中取;
+ // 修改航线文件名称，从ard_route_info航线表中取;
WaylineJobDTO.WaylineJobDTOBuilder builder = WaylineJobDTO.builder()
.jobId(entity.getJobId())
.jobName(entity.getName())
.fileId(entity.getFileId())
// .fileName(waylineFileService.getWaylineByWaylineId(entity.getFileId())
// .orElse(WaylineFileDTO.builder().build()).getName())
- .fileName(_ardRouteInformationService.selectArdRouteInformationById(entity.getFileId())
- .getFileName())
+ .fileName(_ardRouteInfoService.selectArdRouteInfoById(entity.getFileId())
+ .getName())
.dockSn(entity.getDockSn())
.dockName(deviceService.getDeviceBySn(entity.getDockSn())
.orElse(DeviceDTO.builder().build()).getNickname())
--
Gitblit v1.9.3