Browse Source

航线任务添加字段航线任务状态

S0025136190 1 year ago
parent
commit
c39e84f140

+ 2 - 0
Backend/sample/src/main/java/com/dji/sample/wayline/model/dto/WaylineJobDTO.java

@@ -77,4 +77,6 @@ public class WaylineJobDTO {
     private String errorText;
 
     private ExitWaylineWhenRcLostEnum exitWaylineWhenRcLost;
+
+    private Integer waylineMissionState;
 }

+ 3 - 0
Backend/sample/src/main/java/com/dji/sample/wayline/model/entity/WaylineJobEntity.java

@@ -91,4 +91,7 @@ public class WaylineJobEntity implements Serializable {
 
     @TableField("exit_wayline_when_rc_lost")
     private Integer exitWaylineWhenRcLost;
+
+    @TableField("wayline_mission_state")
+    private Integer waylineMissionState;
 }

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

@@ -101,6 +101,7 @@ public class SDKWaylineService extends AbstractWaylineService {
                     .status(WaylineJobStatusEnum.SUCCESS.getVal())
                     .completedTime(LocalDateTime.now())
                     .mediaCount(output.getExt().getMediaCount())
+                    .waylineMissionState(output.getExt().getWaylineMissionState().getState())
                     .build();
 
             // record the update of the media count.
@@ -130,6 +131,7 @@ public class SDKWaylineService extends AbstractWaylineService {
                         .waylineId(breakPoint.getWaylineId())
                         .build();
                 waylineBreakPointService.insert(breakPointEntity);
+
             }
             waylineJobService.updateJob(job);
             waylineRedisService.delRunningWaylineJob(response.getGateway());

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

@@ -196,6 +196,7 @@ public class WaylineJobServiceImpl implements IWaylineJobService {
                 .outOfControlAction(Optional.ofNullable(dto.getOutOfControlAction())
                         .map(OutOfControlActionEnum::getAction).orElse(null))
                 .parentId(dto.getParentId())
+                .waylineMissionState(dto.getWaylineMissionState())
                 .build();
     }
 
@@ -271,6 +272,7 @@ public class WaylineJobServiceImpl implements IWaylineJobService {
                 .outOfControlAction(OutOfControlActionEnum.find(entity.getOutOfControlAction()))
                 .breakpointContinuation(Objects.nonNull(entity.getBreakpointContinuation()) ? Boolean.parseBoolean(entity.getBreakpointContinuation()):null)
                 .waylinePrecisionType(entity.getWaylinePrecisionType())
+                .waylineMissionState(entity.getWaylineMissionState())
                 .mediaCount(entity.getMediaCount());
         if (Objects.nonNull(entity.getExitWaylineWhenRcLost())) {
             builder.exitWaylineWhenRcLost(ExitWaylineWhenRcLostEnum.find(entity.getExitWaylineWhenRcLost()));