From ecdd1add809811170ecb6bbef8941bcac7c349f8 Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Tue, 19 Dec 2023 15:39:36 +0800
Subject: [PATCH] 无人机 -执行飞行任务
---
src/main/java/com/dji/sample/wayline/service/impl/IWayLineTaskServiceImpl.java | 5 ++---
src/main/java/com/dji/sample/wayline/service/impl/WaylineJobServiceImpl.java | 4 +++-
src/main/java/com/dji/sample/component/mqtt/handler/InboundMessageRouter.java | 2 +-
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/dji/sample/component/mqtt/handler/InboundMessageRouter.java b/src/main/java/com/dji/sample/component/mqtt/handler/InboundMessageRouter.java
index 5d30c75..570e446 100644
--- a/src/main/java/com/dji/sample/component/mqtt/handler/InboundMessageRouter.java
+++ b/src/main/java/com/dji/sample/component/mqtt/handler/InboundMessageRouter.java
@@ -45,7 +45,7 @@
String topic = headers.get(MqttHeaders.RECEIVED_TOPIC).toString();
byte[] payload = (byte[])message.getPayload();
-// log.debug("received topic :{} \t payload :{}", topic, new String(payload));
+ log.debug("received topic :{} \t payload :{}", topic, new String(payload));
DeviceTopicEnum topicEnum = DeviceTopicEnum.find(topic);
MessageChannel bean = (MessageChannel) SpringBeanUtils.getBean(topicEnum.getBeanName());
diff --git a/src/main/java/com/dji/sample/wayline/service/impl/IWayLineTaskServiceImpl.java b/src/main/java/com/dji/sample/wayline/service/impl/IWayLineTaskServiceImpl.java
index 2370496..4c6df84 100644
--- a/src/main/java/com/dji/sample/wayline/service/impl/IWayLineTaskServiceImpl.java
+++ b/src/main/java/com/dji/sample/wayline/service/impl/IWayLineTaskServiceImpl.java
@@ -61,8 +61,8 @@
.fileId(param.getFileId())
.dockSn(param.getDockSn())
.workspaceId(workspaceId)
- .executeTime(param.getBeginTime())
- .beginTime(param.getBeginTime())
+ .executeTime(LocalDateTime.now())
+ .beginTime(LocalDateTime.now())
.taskType(param.getTaskType())
.waylineType(param.getWaylineType())
.rthAltitude(param.getRthAltitude())
@@ -110,7 +110,6 @@
.fingerprint(waylineFile.get().getSign())
.build())
.build();
-
ServiceReply serviceReply = messageSender.publishServicesTopic(
waylineJob.getDockSn(), WaylineMethodEnum.FLIGHT_TASK_PREPARE.getMethod(), flightTask, waylineJob.getJobId());
if (ResponseResult.CODE_SUCCESS != serviceReply.getResult()) {
diff --git a/src/main/java/com/dji/sample/wayline/service/impl/WaylineJobServiceImpl.java b/src/main/java/com/dji/sample/wayline/service/impl/WaylineJobServiceImpl.java
index c5c97ed..ec23a26 100644
--- a/src/main/java/com/dji/sample/wayline/service/impl/WaylineJobServiceImpl.java
+++ b/src/main/java/com/dji/sample/wayline/service/impl/WaylineJobServiceImpl.java
@@ -143,7 +143,9 @@
.rthAltitude(param.getRthAltitude())
.mediaCount(0)
.build();
-
+ if (StringUtils.hasText(param.getJobId())){
+ jobEntity.setJobId(param.getJobId());
+ }
return insertWaylineJob(jobEntity);
}
--
Gitblit v1.9.3