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 | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 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 4237b35..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
@@ -329,6 +329,15 @@
// .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;
CommonTopicResponse<Object> response = CommonTopicResponse.builder()
@@ -340,9 +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()
@@ -699,6 +710,16 @@
messageSender.publish(topic, builder.build());
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