Commit b27b1694 by gdj

自定义机场退出drc模式时不进行恢复航线指令

parent 19693038
...@@ -48,6 +48,9 @@ import java.util.List; ...@@ -48,6 +48,9 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Optional; import java.util.Optional;
import static com.dji.sample.common.constant.DeviceConstant.CUSTOM_DOCK_LIST;
import static com.dji.sample.common.constant.DeviceConstant.CUSTOM_DOCK_START;
/** /**
* @author sean * @author sean
* @version 1.3 * @version 1.3
...@@ -222,7 +225,14 @@ public class DrcServiceImpl implements IDrcService { ...@@ -222,7 +225,14 @@ public class DrcServiceImpl implements IDrcService {
String jobId = waylineRedisService.getPausedWaylineJobId(param.getDockSn()); String jobId = waylineRedisService.getPausedWaylineJobId(param.getDockSn());
if (StringUtils.hasText(jobId)) { if (StringUtils.hasText(jobId)) {
flighttaskService.updateJobStatus(workspaceId, jobId, UpdateJobParam.builder().status(WaylineTaskStatusEnum.RESUME).build()); if (CUSTOM_DOCK_LIST.contains(param.getDockSn()) || param.getDockSn().contains("12345")) {
} else if (StringUtils.hasText(param.getDockSn()) && param.getDockSn().startsWith(CUSTOM_DOCK_START)) {
} else {
// 非自定义机场 恢复航线
flighttaskService.updateJobStatus(workspaceId, jobId, UpdateJobParam.builder().status(WaylineTaskStatusEnum.RESUME).build());
}
} }
this.delDrcModeInRedis(param.getDockSn()); this.delDrcModeInRedis(param.getDockSn());
......
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