From 1728457ec067a09c4a5dc8b6ab1921d7f2ad4eec Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Fri, 22 Mar 2024 17:56:58 +0800
Subject: [PATCH] 航线断点
---
src/main/java/com/dji/sample/wayline/service/impl/FlightTaskServiceImpl.java | 9 +++++++--
src/main/java/com/dji/sample/wayline/model/dto/WaylineTaskProgressExt.java | 5 +++++
src/main/java/com/dji/sample/wayline/model/dto/WaylineTaskProgressExtBreakPoint.java | 24 ++++++++++++++++++++++++
3 files changed, 36 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/dji/sample/wayline/model/dto/WaylineTaskProgressExt.java b/src/main/java/com/dji/sample/wayline/model/dto/WaylineTaskProgressExt.java
index bec5eaa..2a45628 100644
--- a/src/main/java/com/dji/sample/wayline/model/dto/WaylineTaskProgressExt.java
+++ b/src/main/java/com/dji/sample/wayline/model/dto/WaylineTaskProgressExt.java
@@ -17,4 +17,9 @@
private String flightId;
private String trackId;
+
+ /**
+ * 航线断点信息
+ */
+ private WaylineTaskProgressExtBreakPoint breakPoint;
}
diff --git a/src/main/java/com/dji/sample/wayline/model/dto/WaylineTaskProgressExtBreakPoint.java b/src/main/java/com/dji/sample/wayline/model/dto/WaylineTaskProgressExtBreakPoint.java
new file mode 100644
index 0000000..44e92f3
--- /dev/null
+++ b/src/main/java/com/dji/sample/wayline/model/dto/WaylineTaskProgressExtBreakPoint.java
@@ -0,0 +1,24 @@
+package com.dji.sample.wayline.model.dto;
+
+import lombok.Data;
+
+/**
+ * @PROJECT_NAME: iot_drone_api
+ * @DESCRIPTION:
+ * @USER: aix
+ * @DATE: 2024/3/22 14:54
+ */
+@Data
+public class WaylineTaskProgressExtBreakPoint {
+
+ private Integer attitudeHead;
+ private Integer breakReason;
+ private Integer height;
+ private Integer index;
+ private Integer latitude;
+ private Integer longitude;
+ private Integer progress;
+ private Integer state;
+ private Integer waylineId;
+
+}
diff --git a/src/main/java/com/dji/sample/wayline/service/impl/FlightTaskServiceImpl.java b/src/main/java/com/dji/sample/wayline/service/impl/FlightTaskServiceImpl.java
index 36c6556..47a0442 100644
--- a/src/main/java/com/dji/sample/wayline/service/impl/FlightTaskServiceImpl.java
+++ b/src/main/java/com/dji/sample/wayline/service/impl/FlightTaskServiceImpl.java
@@ -71,6 +71,7 @@
*/
@ServiceActivator(inputChannel = ChannelName.INBOUND_EVENTS_FLIGHT_TASK_PROGRESS, outputChannel = ChannelName.OUTBOUND_EVENTS)
public CommonTopicReceiver handleProgress(CommonTopicReceiver receiver, MessageHeaders headers) {
+ log.info("上报航线任务进度: {}", receiver.toString());
EventsReceiver<WaylineTaskProgressReceiver> eventsReceiver = mapper.convertValue(receiver.getData(),
new TypeReference<EventsReceiver<WaylineTaskProgressReceiver>>(){});
eventsReceiver.setBid(receiver.getBid());
@@ -81,10 +82,14 @@
WaylineTaskProgressReceiver output = eventsReceiver.getOutput();
- log.info("Task progress: {}", output.getProgress().toString());
+ log.info("任务进度: {}", output.getProgress().toString());
+
+ if (null != output.getExt().getBreakPoint()) {
+ log.info("任务进度 ===> 断点信息：{}", output.getExt().getBreakPoint().toString());
+ }
if (eventsReceiver.getResult() != ResponseResult.CODE_SUCCESS) {
- log.error("Task progress ===> Error code: " + eventsReceiver.getResult());
+ log.error("任务进度 ===> 错误编码: " + eventsReceiver.getResult());
}
EventsResultStatusEnum statusEnum = EventsResultStatusEnum.find(output.getStatus());
--
Gitblit v1.9.3