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

zhaowenyu

2025-11-19 894d18bb13dae351028e584f9b73a8d6964a0a50

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

 ard-admin/src/main/java/com/ard/web/controller/sample/wayline/WaylineJobController.java

@@ -57,10 +57,15 @@
                                                                 @RequestParam(required = false) Integer taskType,
                                                                 @RequestParam(required = false) String name,
                                                                 @RequestParam(required = false) Boolean isComplete) {
        try {
//        PaginationData<WaylineJobDTO> data = waylineJobService.getJobsByWorkspaceId(page, pageSize);defaultValue
        PaginationData<WaylineJobDTO> data = waylineJobService.getJobsList(page, pageSize, status,startTime, endTime, taskType,name,isComplete);
        return ResponseResult.success(data);
    }
        catch (Exception e) {
            return ResponseResult.error(e.getMessage());
        }
    }

    /**
     * Send the command to cancel the jobs.

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

@@ -780,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())