Commit 27e80fd0 by guoxj

feat:增加航线精度类型字段及相关逻辑处理

parent b80788ce
......@@ -94,4 +94,9 @@ public class WaylineJobDTO {
*/
private FlighttaskBreakPoint breakPoint;
/**
* 航线精度类型 0: GPS任务 1: 高精度RTK任务
*/
private WaylinePrecisionTypeEnum waylinePrecisionType;
}
......@@ -95,4 +95,10 @@ public class WaylineJobEntity implements Serializable {
@TableField("org_id")
private String orgId;
/**
* 航线精度类型: 0-GPS任务, 1-高精度RTK任务
*/
@TableField("wayline_precision_type")
private Integer waylinePrecisionType;
}
......@@ -62,4 +62,9 @@ public class CreateJobParam {
*/
private Integer breakPointResumeFlight;
/**
* 航线精度类型 0: GPS任务 1: 高精度RTK任务
*/
private Integer waylinePrecisionType;
}
......@@ -430,6 +430,7 @@ public class FlightTaskServiceImpl extends AbstractWaylineService implements IFl
.setRthAltitude(waylineJob.getRthAltitude())
.setOutOfControlAction(waylineJob.getOutOfControlAction())
.setExitWaylineWhenRcLost(ExitWaylineWhenRcLostEnum.EXECUTE_RC_LOST_ACTION)
.setWaylinePrecisionType(waylineJob.getWaylinePrecisionType() != null ? waylineJob.getWaylinePrecisionType() : WaylinePrecisionTypeEnum.RTK)
.setFile(new FlighttaskFile()
.setUrl(url.toString())
.setFingerprint(waylineFile.get().getSign()));
......
......@@ -126,6 +126,7 @@ public class WaylineJobServiceImpl extends ServiceImpl<IWaylineJobMapper, Waylin
.waylineType(param.getWaylineType().getValue())
.outOfControlAction(param.getOutOfControlAction().getAction())
.rthAltitude(param.getRthAltitude())
.waylinePrecisionType(param.getWaylinePrecisionType() != null ? param.getWaylinePrecisionType() : 1)
.mediaCount(0)
.build();
......@@ -364,6 +365,8 @@ public class WaylineJobServiceImpl extends ServiceImpl<IWaylineJobMapper, Waylin
.rthAltitude(dto.getRthAltitude())
.outOfControlAction(Optional.ofNullable(dto.getOutOfControlAction())
.map(OutOfControlActionEnum::getAction).orElse(null))
.waylinePrecisionType(Optional.ofNullable(dto.getWaylinePrecisionType())
.map(WaylinePrecisionTypeEnum::getType).orElse(null))
.parentId(dto.getParentId())
.build();
}
......@@ -427,6 +430,8 @@ public class WaylineJobServiceImpl extends ServiceImpl<IWaylineJobMapper, Waylin
.waylineType(WaylineTypeEnum.find(entity.getWaylineType()))
.rthAltitude(entity.getRthAltitude())
.outOfControlAction(OutOfControlActionEnum.find(entity.getOutOfControlAction()))
.waylinePrecisionType(Objects.nonNull(entity.getWaylinePrecisionType()) ?
WaylinePrecisionTypeEnum.find(entity.getWaylinePrecisionType()) : WaylinePrecisionTypeEnum.RTK)
.mediaCount(entity.getMediaCount());
if (Objects.nonNull(entity.getEndTime())) {
......@@ -835,6 +840,8 @@ public class WaylineJobServiceImpl extends ServiceImpl<IWaylineJobMapper, Waylin
.waylineType(WaylineTypeEnum.find(entity.getWaylineType()))
.rthAltitude(entity.getRthAltitude())
.outOfControlAction(OutOfControlActionEnum.find(entity.getOutOfControlAction()))
.waylinePrecisionType(Objects.nonNull(entity.getWaylinePrecisionType()) ?
WaylinePrecisionTypeEnum.find(entity.getWaylinePrecisionType()) : WaylinePrecisionTypeEnum.RTK)
.mediaCount(entity.getMediaCount());
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