Commit 3050aea9 by guoxuejian

feat: add wayline precision type to job DTO, entity, and parameters

parent cdea3aba
...@@ -94,4 +94,8 @@ public class WaylineJobDTO { ...@@ -94,4 +94,8 @@ public class WaylineJobDTO {
*/ */
private FlighttaskBreakPoint breakPoint; private FlighttaskBreakPoint breakPoint;
/**
* 航线精度类型 0: GPS任务 1: 高精度RTK任务
*/
private WaylinePrecisionTypeEnum waylinePrecisionType;
} }
...@@ -95,4 +95,10 @@ public class WaylineJobEntity implements Serializable { ...@@ -95,4 +95,10 @@ public class WaylineJobEntity implements Serializable {
@TableField("org_id") @TableField("org_id")
private String orgId; private String orgId;
/**
* 航线精度类型: 0-GPS任务, 1-高精度RTK任务
*/
@TableField("wayline_precision_type")
private Integer waylinePrecisionType;
} }
...@@ -62,4 +62,9 @@ public class CreateJobParam { ...@@ -62,4 +62,9 @@ public class CreateJobParam {
*/ */
private Integer breakPointResumeFlight; private Integer breakPointResumeFlight;
/**
* 航线精度类型 0: GPS任务 1: 高精度RTK任务
*/
private Integer waylinePrecisionType;
} }
...@@ -430,6 +430,7 @@ public class FlightTaskServiceImpl extends AbstractWaylineService implements IFl ...@@ -430,6 +430,7 @@ public class FlightTaskServiceImpl extends AbstractWaylineService implements IFl
.setRthAltitude(waylineJob.getRthAltitude()) .setRthAltitude(waylineJob.getRthAltitude())
.setOutOfControlAction(waylineJob.getOutOfControlAction()) .setOutOfControlAction(waylineJob.getOutOfControlAction())
.setExitWaylineWhenRcLost(ExitWaylineWhenRcLostEnum.EXECUTE_RC_LOST_ACTION) .setExitWaylineWhenRcLost(ExitWaylineWhenRcLostEnum.EXECUTE_RC_LOST_ACTION)
.setWaylinePrecisionType(waylineJob.getWaylinePrecisionType() != null ? waylineJob.getWaylinePrecisionType() : WaylinePrecisionTypeEnum.RTK)
.setFile(new FlighttaskFile() .setFile(new FlighttaskFile()
.setUrl(url.toString()) .setUrl(url.toString())
.setFingerprint(waylineFile.get().getSign())); .setFingerprint(waylineFile.get().getSign()));
......
...@@ -126,6 +126,7 @@ public class WaylineJobServiceImpl extends ServiceImpl<IWaylineJobMapper, Waylin ...@@ -126,6 +126,7 @@ public class WaylineJobServiceImpl extends ServiceImpl<IWaylineJobMapper, Waylin
.waylineType(param.getWaylineType().getValue()) .waylineType(param.getWaylineType().getValue())
.outOfControlAction(param.getOutOfControlAction().getAction()) .outOfControlAction(param.getOutOfControlAction().getAction())
.rthAltitude(param.getRthAltitude()) .rthAltitude(param.getRthAltitude())
.waylinePrecisionType(param.getWaylinePrecisionType() != null ? param.getWaylinePrecisionType() : 1)
.mediaCount(0) .mediaCount(0)
.build(); .build();
...@@ -364,6 +365,8 @@ public class WaylineJobServiceImpl extends ServiceImpl<IWaylineJobMapper, Waylin ...@@ -364,6 +365,8 @@ public class WaylineJobServiceImpl extends ServiceImpl<IWaylineJobMapper, Waylin
.rthAltitude(dto.getRthAltitude()) .rthAltitude(dto.getRthAltitude())
.outOfControlAction(Optional.ofNullable(dto.getOutOfControlAction()) .outOfControlAction(Optional.ofNullable(dto.getOutOfControlAction())
.map(OutOfControlActionEnum::getAction).orElse(null)) .map(OutOfControlActionEnum::getAction).orElse(null))
.waylinePrecisionType(Optional.ofNullable(dto.getWaylinePrecisionType())
.map(WaylinePrecisionTypeEnum::getType).orElse(null))
.parentId(dto.getParentId()) .parentId(dto.getParentId())
.build(); .build();
} }
...@@ -427,6 +430,8 @@ public class WaylineJobServiceImpl extends ServiceImpl<IWaylineJobMapper, Waylin ...@@ -427,6 +430,8 @@ public class WaylineJobServiceImpl extends ServiceImpl<IWaylineJobMapper, Waylin
.waylineType(WaylineTypeEnum.find(entity.getWaylineType())) .waylineType(WaylineTypeEnum.find(entity.getWaylineType()))
.rthAltitude(entity.getRthAltitude()) .rthAltitude(entity.getRthAltitude())
.outOfControlAction(OutOfControlActionEnum.find(entity.getOutOfControlAction())) .outOfControlAction(OutOfControlActionEnum.find(entity.getOutOfControlAction()))
.waylinePrecisionType(Objects.nonNull(entity.getWaylinePrecisionType()) ?
WaylinePrecisionTypeEnum.find(entity.getWaylinePrecisionType()) : WaylinePrecisionTypeEnum.RTK)
.mediaCount(entity.getMediaCount()); .mediaCount(entity.getMediaCount());
if (Objects.nonNull(entity.getEndTime())) { if (Objects.nonNull(entity.getEndTime())) {
...@@ -835,6 +840,8 @@ public class WaylineJobServiceImpl extends ServiceImpl<IWaylineJobMapper, Waylin ...@@ -835,6 +840,8 @@ public class WaylineJobServiceImpl extends ServiceImpl<IWaylineJobMapper, Waylin
.waylineType(WaylineTypeEnum.find(entity.getWaylineType())) .waylineType(WaylineTypeEnum.find(entity.getWaylineType()))
.rthAltitude(entity.getRthAltitude()) .rthAltitude(entity.getRthAltitude())
.outOfControlAction(OutOfControlActionEnum.find(entity.getOutOfControlAction())) .outOfControlAction(OutOfControlActionEnum.find(entity.getOutOfControlAction()))
.waylinePrecisionType(Objects.nonNull(entity.getWaylinePrecisionType()) ?
WaylinePrecisionTypeEnum.find(entity.getWaylinePrecisionType()) : WaylinePrecisionTypeEnum.RTK)
.mediaCount(entity.getMediaCount()); .mediaCount(entity.getMediaCount());
if (Objects.nonNull(entity.getEndTime())) { if (Objects.nonNull(entity.getEndTime())) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment