From aae8b5dc994fffdc211b1f0fc860840cb0d4687a Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Tue, 25 Nov 2025 14:34:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-sample/src/main/java/com/ard/sample/wayline/service/impl/WaylineJobServiceImpl.java | 64 +++++++++++++++++++++++---------
1 files changed, 46 insertions(+), 18 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 6393940..44014f4 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
@@ -231,11 +231,11 @@
// .fingerprint(waylineFile.get().getSign())
.fingerprint(md5)
.build())
- .simulateMission(WaylineSimulateMissionDTO.builder()
- .isEnable(1)
- .latitude(46.558831038)
- .longitude(125.148072319)
- .build())
+// .simulateMission(WaylineSimulateMissionDTO.builder()
+// .isEnable(1)
+// .latitude(46.558831038)
+// .longitude(125.148072319)
+// .build())
.build();
String topic = TopicConst.THING_MODEL_PRE + TopicConst.PRODUCT +
@@ -303,7 +303,10 @@
try (InputStream inputStream = _ossService.getObject(kmzPath, minioUrl)) {
md5 = DigestUtils.md5Hex(inputStream);
url = new URL(ardRouteOpt.getPath());
+ log.info("机场任务航线文件url地址：{}", url);
+ log.info("机场任务航线文件md5值：{}", md5);
} catch (Exception e) {
+ log.error("机场任务航线文件地址错误！{}", e.getMessage());
return ResponseResult.error("机场任务航线文件地址错误！" + e.getMessage());
}
@@ -319,12 +322,21 @@
// .fingerprint(waylineFile.get().getSign())
.fingerprint(md5)
.build())
- .simulateMission(WaylineSimulateMissionDTO.builder()
- .isEnable(1)
- .latitude(46.558831038)
- .longitude(125.148072319)
- .build())
+// .simulateMission(WaylineSimulateMissionDTO.builder()
+// .isEnable(1)
+// .latitude(46.558831038)
+// .longitude(125.148072319)
+// .build())
.build();
+
+ // 下发参数打印
+ try{
+ String json = objectMapper.writeValueAsString(flightTask);
+ log.info("机场下发航线任务的参数flightTask：{}", json);
+ }
+ catch (Exception e){
+ log.error("机场下发航线任务的参数flightTask异常：{}", e.getMessage());
+ }
String topic = TopicConst.THING_MODEL_PRE + TopicConst.PRODUCT +
waylineJob.getDockSn() + TopicConst.SERVICES_SUF;
@@ -337,7 +349,11 @@
.build();
ServiceReply serviceReply = messageSender.publishWithReply(topic, response);
+
log.info("下发任务结果： {}", serviceReply.getResult());
+ log.info("机场任务航线文件url地址：{}", url);
+ log.info("机场任务航线文件md5值：{}", md5);
+
if (ResponseResult.CODE_SUCCESS != serviceReply.getResult()) {
log.info("Prepare task ====> Error code: {}", serviceReply.getResult());
this.updateJob(WaylineJobDTO.builder()
@@ -436,14 +452,14 @@
public void cancelFlightTask(Collection<String> jobIds) {
List<WaylineJobDTO> waylineJobs = getJobsByConditions(jobIds, WaylineJobStatusEnum.PENDING);
- Set<String> waylineJobIds = waylineJobs.stream().map(WaylineJobDTO::getJobId).collect(Collectors.toSet());
- // Check if the task status is correct.
- boolean isErr = !jobIds.removeAll(waylineJobIds) || !jobIds.isEmpty();
- if (isErr) {
- throw new IllegalArgumentException("任务开始后，无法取消。" + Arrays.toString(jobIds.toArray()));
-// throw new IllegalArgumentException("These tasks have an incorrect status and cannot be canceled. "
-// + Arrays.toString(jobIds.toArray()));
- }
+// Set<String> waylineJobIds = waylineJobs.stream().map(WaylineJobDTO::getJobId).collect(Collectors.toSet());
+// // Check if the task status is correct.
+// boolean isErr = !jobIds.removeAll(waylineJobIds) || !jobIds.isEmpty();
+// if (isErr) {
+// throw new IllegalArgumentException("任务开始后，无法取消。" + Arrays.toString(jobIds.toArray()));
+//// throw new IllegalArgumentException("These tasks have an incorrect status and cannot be canceled. "
+//// + Arrays.toString(jobIds.toArray()));
+// }
// Group job id by dock sn.
Map<String, List<String>> dockJobs = waylineJobs.stream()
@@ -632,6 +648,8 @@
});
String jobId = jobIdMap.get(MapKeyConst.FLIGHT_ID);
+ log.info("机场通过flightTaskResourceGet获取航线文件地址，jobId: " + jobId);
+
CommonTopicResponse.CommonTopicResponseBuilder<RequestsReply> builder = CommonTopicResponse.<RequestsReply>builder()
.tid(receiver.getTid())
.bid(receiver.getBid())
@@ -673,6 +691,7 @@
try (InputStream inputStream = _ossService.getObject(kmzPath, minioUrl)) {
md5 = DigestUtils.md5Hex(inputStream);
url = new URL(ardRouteOpt.getPath());
+ log.info("机场通过flightTaskResourceGet获取航线文件地址，jobId: " + jobId + " 返回信息为url：" + url.toString() + " md5：" + md5);
// }
// try {
// url = waylineFileService.getObjectUrl(waylineFile.get().getWaylineId());
@@ -692,6 +711,15 @@
return;
}
+ // 下发参数打印
+ try{
+ String json = objectMapper.writeValueAsString(builder.build());
+ log.info("机场通过flighttask_resource_get获取航线文件的参数flightTask：{}", json);
+ }
+ catch (Exception e){
+ log.error("机场通过flighttask_resource_get获取航线文件的参数flightTask异常：{}", e.getMessage());
+ }
+
messageSender.publish(topic, builder.build());
}
--
Gitblit v1.9.3