1.修改增加路径。

Xiajijian

2025-11-26 3e96b0942eaf75a0a5cfca1ff569976074de9466

 ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java

@@ -14,18 +14,18 @@
import com.ard.data.noflyzone.utils.NoFlyZoneUtils;
import com.ard.oss.model.MinioUploadResult;
import com.ard.oss.service.impl.OssServiceContext;
import com.ard.ossdock.service.impl.OssDockServiceContext;
import com.ard.route.domain.djuav.ActionGroupReq;
import com.ard.route.domain.djuav.PointActionReq;
import com.ard.route.domain.djuav.RoutePointReq;
import com.ard.route.domain.djuav.UavRouteReq;
import com.ard.route.domain.dto.ArdNoflyDto;
import com.ard.route.domain.route.ArdRouteInfo;
import com.ard.route.domain.sixhe.ArdRouteChange;
import com.ard.route.domain.vo.KmzInfoVo;
import com.ard.route.domain.vo.KmzResultVo;
import com.ard.route.mapper.ArdRouteInfoMapper;
import com.ard.route.service.IArdRouteInfoService;
import com.ard.route.service.UavRouteService;
import com.ard.work.domain.cache.UavWaylineCache;
import com.ard.work.domain.dto.state.PointData;
import com.ard.work.domain.dto.wayline.*;
import com.ard.work.service.ITyService;
@@ -51,6 +51,9 @@

    @Autowired
    private OssServiceContext ossService;

    @Autowired
    private OssDockServiceContext ossDockService;

    @Autowired
    private UavRouteService routeService;
@@ -122,6 +125,7 @@
        KmzResultVo kmzResult = routeService.buildKmz(ardRouteInfo.getUavRouteReq(), ardRouteInfo.getName());
        ardRouteInfo.setPath(kmzResult.getPath());
        ardRouteInfo.setReadOnly("0");
        ardRouteInfo.setPointCount(getPointCount(ardRouteInfo));
        ardRouteInfoMapper.insertArdRouteInfo(ardRouteInfo);
        return kmzResult.getPath();
    }
@@ -150,7 +154,15 @@
            }
            ardRouteInfo.setPath(kmzResult.getPath());
        }
        ardRouteInfo.setPointCount(getPointCount(ardRouteInfo));
        return ardRouteInfoMapper.updateArdRouteInfo(ardRouteInfo);
    }

    private Integer getPointCount(ArdRouteInfo ardRouteInfo) {
        if (ardRouteInfo.getUavRouteReq().getRoutePointList() != null) {
            return ardRouteInfo.getUavRouteReq().getRoutePointList().size();
        }
        return 0;
    }

    /**
@@ -190,9 +202,11 @@
    public MinioUploadResult uploadArdRouteInfo(MultipartFile file) {
        try {
            String url = ossService.upload("kmz",file);
            String urlDock = ossDockService.upload("kmz",file);
            ArdRouteInfo information = new ArdRouteInfo();
            information.setName(file.getOriginalFilename());
            information.setPath(url);
            information.setPath1(urlDock);
            information.setGroupId("0");     // 默认分组
            information.setReadOnly("1");   // 默认只读
            // 增加航线实体类信息
@@ -259,7 +273,12 @@
        // 2.将航线信息转换成对应实体类
        WayLineUploadDTO wayLineUploadDTO = buildWayLineUploadDTO(route);
        wayLineUploadDTO.setBoxSn(boxSn);
        // 3.调用接口
        // 3.缓存航线信息
        WaylineInfo WaylineInfo = new WaylineInfo();
        WaylineInfo.setBoxSn(boxSn);
        WaylineInfo.setWaylineId(route.getId());
        UavWaylineCache.put(WaylineInfo);
        // 4.调用接口
        tyService.wayLineUpload(wayLineUploadDTO);
        return true;
    }