Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
GeoFlyApi
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
GeoFly
GeoFlyApi
Commits
f6f7e715
Commit
f6f7e715
authored
May 07, 2026
by
郑宁
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
解决条件任务无法执行的问题
parent
bd8cdbef
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
1 deletions
+6
-1
sample/src/main/java/com/dji/sample/wayline/service/impl/FlightTaskServiceImpl.java
+6
-1
No files found.
sample/src/main/java/com/dji/sample/wayline/service/impl/FlightTaskServiceImpl.java
View file @
f6f7e715
...
...
@@ -376,7 +376,10 @@ public class FlightTaskServiceImpl extends AbstractWaylineService implements IFl
}
boolean
isSuccess
=
this
.
prepareFlightTask
(
waylineJob
);
if
(!
isSuccess
)
{
if
(
isSuccess
)
{
// 任务准备成功
log
.
info
(
"Prepare job successfully.{}"
,
waylineJob
.
getJobId
());
}
else
{
return
HttpResultResponse
.
error
(
"Failed to prepare job."
);
}
...
...
@@ -664,11 +667,13 @@ public class FlightTaskServiceImpl extends AbstractWaylineService implements IFl
String
blockedId
=
waylineRedisService
.
getBlockedWaylineJobId
(
response
.
getGateway
());
// fix: 修复条件任务不执行bug
if
(
StringUtils
.
hasText
(
blockedId
))
{
log
.
info
(
"The conditional task is blocking and will not be executed.block id {}"
,
blockedId
);
return
null
;
}
Optional
<
DeviceDTO
>
deviceOpt
=
deviceRedisService
.
getDeviceOnline
(
response
.
getGateway
());
if
(
deviceOpt
.
isEmpty
())
{
log
.
info
(
"The device is offline.flight task ready!"
);
return
null
;
}
DeviceDTO
device
=
deviceOpt
.
get
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment