From f61c1902e30b0ab54e833960df7d2d79c8b62120 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 12 Oct 2023 17:11:05 +0800
Subject: [PATCH] 执行时间
---
src/main/java/com/dji/sample/wayline/service/impl/WaylineJobServiceImpl.java | 75 ++++++++++++++++++++++++++++++++++++-
1 files changed, 72 insertions(+), 3 deletions(-)
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 a1ae787..bebb066 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
@@ -158,6 +158,46 @@
@Override
public ResponseResult publishFlightTask(CreateJobParam param, CustomClaim customClaim) throws SQLException {
+
+ //当重复定时和连续执行时走这个逻辑
+ if (param.getTaskType().getVal() == WaylineTaskTypeEnum.CONDITION.getVal()){
+
+
+
+
+
+ //保存数据
+ WaylineJobEntity waylineJobEntity = WaylineJobEntity.builder()
+ .jobId(UUID.randomUUID().toString())
+ .name(param.getName())
+ .dockSn(param.getDockSn())
+ .fileId(param.getFileId())
+ .username(customClaim.getUsername())
+ .workspaceId(customClaim.getWorkspaceId())
+
+
+ .beginTime(param.getTaskDays().get(0)*1000)
+ .endTime(param.getTaskDays().get(1)*1000)
+ .status(WaylineJobStatusEnum.PENDING.getVal())
+ .taskType(param.getTaskType().getVal())
+ .waylineType(param.getWaylineType().getVal())
+ .outOfControlAction(param.getOutOfControlAction())
+ .batteryCapacity(param.getMinBatteryCapacity())
+ .rthAltitude(param.getRthAltitude())
+ .mediaCount(0)
+ .repFreVal(param.getRepFreVal())
+ .repFreType(param.getRepFreType())
+ .repRuleType(param.getRepRuleType())
+ .repRuleVal(param.getRepRuleVal())
+ .executeTimeArr(param.getTaskPeriods())
+ .executeStartTimeArr(param.getExecuteStartTimeArr())
+ .build();
+
+ Boolean insert = mapper.insert(waylineJobEntity)>0;
+
+ return ResponseResult.success(insert);
+ }
+
fillImmediateTime(param);
// param.getTaskDays().sort((a, b) -> (int) (a - b));
@@ -179,6 +219,7 @@
}
WaylineJobDTO waylineJob = waylineJobOpt.get();
// If it is a conditional task type, add conditions to the job parameters.
+ //如果是条件任务类型，需要在任务参数中添加条件。
addPreparedJob(waylineJob, param, beginTime, endTime);
ResponseResult response = this.publishOneFlightTask(waylineJob);
@@ -194,8 +235,7 @@
if (WaylineTaskTypeEnum.CONDITION == param.getTaskType()) {
waylineJob.setConditions(
WaylineTaskConditionDTO.builder()
- .executableConditions(Objects.nonNull(param.getMinStorageCapacity()) ?
- WaylineTaskExecutableConditionDTO.builder().storageCapacity(param.getMinStorageCapacity()).build() : null)
+ .executableConditions(Objects.nonNull(param.getMinStorageCapacity()) ? WaylineTaskExecutableConditionDTO.builder().storageCapacity(param.getMinStorageCapacity()).build() : null)
.readyConditions(WaylineTaskReadyConditionDTO.builder()
.batteryCapacity(param.getMinBatteryCapacity())
.beginTime(beginTime)
@@ -208,7 +248,7 @@
// value: {workspace_id}:{dock_sn}:{job_id}
boolean isAdd = waylineRedisService.addPreparedWaylineJob(waylineJob);
if (!isAdd) {
- throw new RuntimeException("创建准备任务失败。");
+ throw new RuntimeException("创建任务失败。");
}
}
@@ -220,6 +260,7 @@
}
// Issue an immediate task execution command.
+ //发出立即任务执行命令
if (WaylineTaskTypeEnum.IMMEDIATE == waylineJob.getTaskType()) {
boolean isExecuted = executeFlightTask(waylineJob.getWorkspaceId(), waylineJob.getJobId());
if (!isExecuted) {
@@ -228,6 +269,30 @@
}
return ResponseResult.success();
+ }
+
+ @Override
+ public Boolean publishFlightTask(WaylineJobEntity waylineJobEntity) {
+ WaylineJobDTO waylineJob = new WaylineJobDTO();
+
+
+ waylineJob.setConditions(
+ WaylineTaskConditionDTO.builder()
+ .executableConditions(null)
+ .readyConditions(WaylineTaskReadyConditionDTO.builder()
+ .batteryCapacity(waylineJobEntity.getBatteryCapacity())
+
+ .build())
+ .build());
+
+
+
+
+
+
+
+
+ return null;
}
private Boolean prepareFlightTask(WaylineJobDTO waylineJob) throws SQLException {
@@ -244,6 +309,7 @@
}
// get file url
+ //获取航线文件地址
URL url = waylineFileService.getObjectUrl(waylineJob.getWorkspaceId(), waylineFile.get().getWaylineId());
WaylineTaskCreateDTO flightTask = WaylineTaskCreateDTO.builder()
@@ -259,6 +325,7 @@
.build())
.build();
+ //当任务类型为条件时
if (WaylineTaskTypeEnum.CONDITION == waylineJob.getTaskType()) {
if (Objects.isNull(waylineJob.getConditions())) {
throw new IllegalArgumentException();
@@ -267,10 +334,12 @@
flightTask.setExecutableConditions(waylineJob.getConditions().getExecutableConditions());
}
+ //发布飞行指令
ServiceReply serviceReply = messageSender.publishServicesTopic(
waylineJob.getDockSn(), WaylineMethodEnum.FLIGHT_TASK_PREPARE.getMethod(), flightTask, waylineJob.getJobId());
if (ResponseResult.CODE_SUCCESS != serviceReply.getResult()) {
log.info("Prepare task ====> Error code: {}", serviceReply.getResult());
+ //飞行失败，更新数据库信息
this.updateJob(WaylineJobDTO.builder()
.workspaceId(waylineJob.getWorkspaceId())
.jobId(waylineJob.getJobId())
--
Gitblit v1.9.3