升级版本1.9.0

xieb

2024-04-01 97082b60eb2fbccb66f7f0beefb5cb591448ec10

 src/main/java/com/dji/sample/wayline/service/impl/WaylineJobServiceImpl.java

@@ -143,7 +143,9 @@
                .rthAltitude(param.getRthAltitude())
                .mediaCount(0)
                .build();

        if (StringUtils.hasText(param.getJobId())){
            jobEntity.setJobId(param.getJobId());
        }
        return insertWaylineJob(jobEntity);
    }

@@ -419,7 +421,7 @@
                    .status(WaylineJobStatusEnum.FAILED.getVal())
                    .completedTime(LocalDateTime.now())
                    .code(serviceReply.getResult()).build());
            // The conditional task fails and enters the blocking status.
            // 条件任务失败，进入阻塞状态。
            if (WaylineTaskTypeEnum.CONDITION == job.getTaskType()
                    && WaylineErrorCodeEnum.find(serviceReply.getResult()).isBlock()) {
                waylineRedisService.setBlockedWaylineJob(job.getDockSn(), jobId);
@@ -529,6 +531,18 @@
    }

    @Override
    public PaginationData<WaylineJobDTO> getJobsByWorkspaceIdNew(String workspaceId, long page, long pageSize, WaylineJobQueryParam waylineJobQueryParam, String order) {
        Page<WaylineJobEntity> pageData = mapper.getPageNew(new Page<WaylineJobEntity>(page, pageSize), waylineJobQueryParam, workspaceId,order);

        List<WaylineJobDTO> records = pageData.getRecords()
                .stream()
                .map(this::entity2Dto)
                .collect(Collectors.toList());

        return new PaginationData<WaylineJobDTO>(records, new Pagination(pageData));
    }

    @Override
    public List<WaylineJobDTO> getChildrenJobs(String workspaceId, WaylineJobQueryParam waylineJobQueryParam) {

        List<WaylineJobEntity> list = mapper.getJobs(workspaceId, waylineJobQueryParam);