forked from uav/ard-uav-server
blame | history | patch | commit | commitdiff | ignore whitespace
liusuyi
2025-09-29 b27c25fe7907f21956cc34919dfece66aeb3d9f7 
 ard-sample/src/main/java/com/ard/sample/wayline/service/impl/WaylineJobServiceImpl.java


@@ -176,7 +176,6 @@


        if (ResponseResult.CODE_SUCCESS != serviceReply.getResult()) {


            log.info("Prepare task ====> Error code: {}", serviceReply.getResult());


            this.updateJob(WaylineJobDTO.builder()


                    .workspaceId(waylineJob.getWorkspaceId())


                    .jobId(waylineJob.getJobId())


                    .executeTime(LocalDateTime.now())


                    .status(WaylineJobStatusEnum.FAILED.getVal())


@@ -194,7 +193,7 @@




        if (WaylineTaskTypeEnum.TIMED.getVal() == waylineJob.getTaskType()) {


            boolean isAdd = RedisOpsUtils.zAdd(RedisConst.WAYLINE_JOB_TIMED_EXECUTE,


                    waylineJob.getWorkspaceId() + RedisConst.DELIMITER + waylineJob.getDockSn() + RedisConst.DELIMITER + waylineJob.getJobId(),


                     waylineJob.getDockSn() + RedisConst.DELIMITER + waylineJob.getJobId(),


                    waylineJob.getBeginTime().atZone(ZoneId.systemDefault()).toInstant().toEpochMilli());


            if (!isAdd) {


                return ResponseResult.error("Failed to create scheduled job.");


@@ -454,7 +453,6 @@


                .jobId(dto.getJobId())


                .fileId(dto.getFileId())


                .dockSn(dto.getDockSn())


                .workspaceId(dto.getWorkspaceId())


                .taskType(dto.getTaskType())


                .waylineType(dto.getWaylineType())


                .username(dto.getUsername())


@@ -479,7 +477,6 @@


                .dockName(deviceService.getDeviceBySn(entity.getDockSn())


                        .orElse(DeviceDTO.builder().build()).getNickname())


                .username(entity.getUsername())


                .workspaceId(entity.getWorkspaceId())


                .status(WaylineJobStatusEnum.IN_PROGRESS.getVal() == entity.getStatus() &&


                        RedisOpsUtils.checkExist(RedisConst.WAYLINE_JOB_PAUSED_PREFIX + entity.getJobId()) ?


                        WaylineJobStatusEnum.PAUSED.getVal() : entity.getStatus())