Browse Source

新建航线任务问题修改

S0025136190 1 year ago
parent
commit
357334ba9b

+ 5 - 0
Backend/sample/src/main/java/com/dji/sample/wayline/service/impl/SDKWaylineService.java

@@ -142,6 +142,11 @@ public class SDKWaylineService extends AbstractWaylineService {
         return new TopicEventsResponse<>();
     }
 
+    public TopicRequestsResponse<MqttReply> returnHomeInfo(TopicRequestsRequest<ReturnHomeInfo> response, MessageHeaders headers) {
+        log.info("returnHomeInfo: {}", response.toString());
+        return new TopicRequestsResponse<>();
+    }
+
     @Transactional(isolation = Isolation.READ_UNCOMMITTED)
     @Override
     public TopicRequestsResponse<MqttReply<FlighttaskResourceGetResponse>> flighttaskResourceGet(TopicRequestsRequest<FlighttaskResourceGetRequest> response, MessageHeaders headers) {

+ 2 - 2
Backend/sample/src/main/java/com/dji/sample/wayline/service/impl/WaylineJobServiceImpl.java

@@ -98,7 +98,7 @@ public class WaylineJobServiceImpl implements IWaylineJobService {
                 .status(WaylineJobStatusEnum.PENDING.getVal())
                 .taskType(param.getTaskType().getType())
                 .waylineType(param.getWaylineType().getValue())
-                //.outOfControlAction(param.getOutOfControlAction().getAction())
+                .outOfControlAction(param.getOutOfControlAction().getAction())
                 .rthAltitude(param.getRthAltitude())
                 .mediaCount(0)
                 .breakpointContinuation(param.getBreakpointContinuation())
@@ -270,7 +270,7 @@ public class WaylineJobServiceImpl implements IWaylineJobService {
                 .taskType(TaskTypeEnum.find(entity.getTaskType()))
                 .waylineType(WaylineTypeEnum.find(entity.getWaylineType()))
                 .rthAltitude(entity.getRthAltitude())
-                //.outOfControlAction(OutOfControlActionEnum.find(entity.getOutOfControlAction()))
+                .outOfControlAction(OutOfControlActionEnum.find(entity.getOutOfControlAction()))
                 .breakpointContinuation(Objects.nonNull(entity.getBreakpointContinuation()) ? Boolean.parseBoolean(entity.getBreakpointContinuation()):null)
                 .waylinePrecisionType(entity.getWaylinePrecisionType())
                 .mediaCount(entity.getMediaCount());