1.修改表名。

Xiajijian

2025-11-13 d779caf4b08cf06945fc74495c75d42a6466b20b

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

@@ -1,8 +1,8 @@
package com.ard.sample.wayline.service.impl;

import com.ard.oss.service.impl.OssServiceContext;
import com.ard.route.domain.route.ArdRouteInformation;
import com.ard.route.service.IArdRouteInformationService;
import com.ard.route.domain.route.ArdRouteInfo;
import com.ard.route.service.IArdRouteInfoService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -27,7 +27,6 @@
import com.ard.sample.wayline.model.enums.WaylineMethodEnum;
import com.ard.sample.wayline.model.enums.WaylineTaskTypeEnum;
import com.ard.sample.wayline.model.param.CreateJobParam;
import com.ard.sample.wayline.service.IWaylineFileService;
import com.ard.sample.wayline.service.IWaylineJobService;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -45,7 +44,6 @@
import javax.annotation.Resource;
import java.io.IOException;
import java.io.InputStream;
import java.net.MalformedURLException;
import java.net.URL;
import java.sql.SQLException;
import java.time.Instant;
@@ -55,6 +53,7 @@
import java.util.stream.Collectors;

import static com.ard.route.util.ToolUtils.kmzPath;
import static com.ard.route.util.ToolUtils.subStringMinioUrlName;

/**
 * @author sean
@@ -73,7 +72,7 @@
//    private IWaylineFileService waylineFileService;

    @Autowired
    private IArdRouteInformationService _ardRouteInformationService;
    private IArdRouteInfoService _ardRouteInfoService;

    @Resource
    private OssServiceContext _ossService;
@@ -192,7 +191,7 @@
//            return ResponseResult.error("机场任务航线不存在！");
//        }
        // 换航线表
        ArdRouteInformation ardRouteOpt = _ardRouteInformationService.selectArdRouteInformationById(waylineJob.getFileId());
        ArdRouteInfo ardRouteOpt = _ardRouteInfoService.selectArdRouteInfoById(waylineJob.getFileId());
        if (ardRouteOpt == null) {
            return ResponseResult.error("机场任务航线不存在！");
        }
@@ -200,7 +199,7 @@
        // get file url
//        URL url = waylineFileService.getObjectUrl(waylineFile.get().getWaylineId());
        URL url= null;
        String minioUrl = ardRouteOpt.getMinioUpPath();
        String minioUrl = subStringMinioUrlName(ardRouteOpt.getUpPath());
        String md5 = "";
        try (InputStream inputStream = _ossService.getObject(kmzPath,minioUrl))
        {
@@ -507,9 +506,9 @@
//            messageSender.publish(topic, builder.build());
//            return;
//        }
        // 修改航线文件名称，从ard_route_information航线表中取;
        // 修改航线文件名称，从ard_route_info航线表中取;
        // 换航线表
        ArdRouteInformation ardRouteOpt = _ardRouteInformationService.selectArdRouteInformationById(waylineJob.getFileId());
        ArdRouteInfo ardRouteOpt = _ardRouteInfoService.selectArdRouteInfoById(waylineJob.getFileId());
        if (ardRouteOpt == null) {
            builder.data(RequestsReply.error(CommonErrorEnum.ILLEGAL_ARGUMENT));
            messageSender.publish(topic, builder.build());
@@ -518,7 +517,7 @@

        // get file url
        URL url = null;
        String minioUrl = ardRouteOpt.getMinioUpPath();
        String minioUrl = subStringMinioUrlName(ardRouteOpt.getUpPath());
        String md5 = "";
        try (InputStream inputStream = _ossService.getObject(kmzPath,minioUrl))
        {
@@ -629,15 +628,15 @@
        if (entity == null) {
            return null;
        }
        // 修改航线文件名称，从ard_route_information航线表中取;
        // 修改航线文件名称，从ard_route_info航线表中取;
        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(_ardRouteInformationService.selectArdRouteInformationById(entity.getFileId())
                        .getFileName())
                .fileName(_ardRouteInfoService.selectArdRouteInfoById(entity.getFileId())
                        .getName())
                .dockSn(entity.getDockSn())
                .dockName(deviceService.getDeviceBySn(entity.getDockSn())
                        .orElse(DeviceDTO.builder().build()).getNickname())