2025-11-15 zwy 航线信息被删掉后，航线任务列表在读取航线时会报错；处理错误，航线不存在时航线文件名称显示空。正常逻辑应该是航线文件有任务...

zhaowenyu

2025-11-19 894d18bb13dae351028e584f9b73a8d6964a0a50

 ard-sample/src/main/java/com/ard/sample/wayline/service/impl/WaylineJobServiceImpl.java

@@ -179,13 +179,14 @@
        }
        Optional<WaylineJobDTO> waylineJobOpt = this.createWaylineJob(param, loginUser.getUsername(),
                param.getExecuteTime(), param.getExecuteTime());
        if (waylineJobOpt.isEmpty()) {
            return ResponseResult.error("创建机场任务失败！");
        }
        // 循环任务
        if (param.getTaskType() == WaylineTaskTypeEnum.LOOP.getVal()) {
            // 循环任务，不立即执行，由定时任务发布
            return ResponseResult.success();
        }

        if (waylineJobOpt.isEmpty()) {
            return ResponseResult.error("创建机场任务失败！");
        }

        WaylineJobDTO waylineJob = waylineJobOpt.get();
@@ -248,6 +249,7 @@
                .build();

        ServiceReply serviceReply = messageSender.publishWithReply(topic, response);
        log.info("下发任务结果： {}", serviceReply.getResult());
        if (ResponseResult.CODE_SUCCESS != serviceReply.getResult()) {
            log.info("Prepare task ====> Error code: {}", serviceReply.getResult());
            this.updateJob(WaylineJobDTO.builder()
@@ -335,6 +337,7 @@
                .build();

        ServiceReply serviceReply = messageSender.publishWithReply(topic, response);
        log.info("下发任务结果： {}", serviceReply.getResult());
        if (ResponseResult.CODE_SUCCESS != serviceReply.getResult()) {
            log.info("Prepare task ====> Error code: {}", serviceReply.getResult());
            this.updateJob(WaylineJobDTO.builder()
@@ -437,8 +440,9 @@
        // Check if the task status is correct.
        boolean isErr = !jobIds.removeAll(waylineJobIds) || !jobIds.isEmpty();
        if (isErr) {
            throw new IllegalArgumentException("These tasks have an incorrect status and cannot be canceled. "
                    + Arrays.toString(jobIds.toArray()));
            throw new IllegalArgumentException("任务开始后，无法取消。" + Arrays.toString(jobIds.toArray()));
//            throw new IllegalArgumentException("These tasks have an incorrect status and cannot be canceled. "
//                    + Arrays.toString(jobIds.toArray()));
        }

        // Group job id by dock sn.
@@ -578,8 +582,8 @@
                new Page<WaylineJobEntity>(page, pageSize),
                new LambdaQueryWrapper<WaylineJobEntity>()
                        // 实际开始时间筛选，允许为空，为空则不进行筛选
                        .ge(startTime != null, WaylineJobEntity::getExecuteTime, startTime)
                        .le(endTime != null, WaylineJobEntity::getExecuteTime, endTime)
                        .ge(startTime != null, WaylineJobEntity::getBeginTime, startTime)
                        .le(endTime != null, WaylineJobEntity::getBeginTime, endTime)
                        // 任务类型筛选，允许为空，为空则不进行筛选
                        .eq(taskType != null, WaylineJobEntity::getTaskType, taskType)
                        // 任务名称筛选，允许为空，为空则不进行筛选;....模糊查询
@@ -776,14 +780,27 @@
            return null;
        }
        // 修改航线文件名称，从ard_route_info航线表中取;
        String fileId = entity.getFileId();
        String fileName = "";
        try {
            if (fileId != null) {
                ArdRouteInfo ardRouteInfo = _ardRouteInfoService.selectArdRouteInfoById(fileId);
                if (ardRouteInfo != null) {
                    fileName = Optional.ofNullable(ardRouteInfo.getName()).orElse("");
                }
            }
        }
        catch (Exception e) {
            log.info("获取航线名称失败，fileId:{},异常原因：{}", fileId,e.getMessage());
            fileName = "";
        }
        WaylineJobDTO.WaylineJobDTOBuilder builder = WaylineJobDTO.builder()
                .jobId(entity.getJobId())
                .jobName(entity.getName())
                .fileId(entity.getFileId())
//                .fileName(waylineFileService.getWaylineByWaylineId(entity.getFileId())
//                        .orElse(WaylineFileDTO.builder().build()).getName())
                .fileName(_ardRouteInfoService.selectArdRouteInfoById(entity.getFileId())
                        .getName())
                .fileName(fileName)
                .dockSn(entity.getDockSn())
                .dockName(deviceService.getDeviceBySn(entity.getDockSn())
                        .orElse(DeviceDTO.builder().build()).getNickname())