Merge remote-tracking branch 'origin/ht-dev' into ht-dev

rain

2024-05-06 cbc15bffc95c486ec8fe67270d8d4e08de7b1407

 src/main/java/com/dji/sample/territory/service/impl/TbDkjbxxServiceImpl.java

@@ -8,6 +8,7 @@
import com.dji.sample.patches.model.entity.LotInfo;
import com.dji.sample.patches.utils.GeoToolsUtil;
import com.dji.sample.patches.utils.MultipartFileTOFileUtil;
import com.dji.sample.patches.utils.PointPO;
import com.dji.sample.patches.xml.mode.XMLTemplateModel;
import com.dji.sample.patches.xml.utils.CreateWaylineFileUtils;
import com.dji.sample.territory.dao.ITbDkjbxxMapper;
@@ -104,7 +105,7 @@
    public MultipartFile listFile(String workspaceId, String waylineName, double airportLat, double airportLon) throws IOException {
        List<TbDkjbxxEntity> list = iTbDkjbxxMapper.selectList(null);
        List<LotInfo> info = dbConvertToEntity(list);
        Coordinate[] coordinates = GeoToolsUtil.getRoutePointOrder(info, airportLat, airportLon);
        List<PointPO> coordinates = GeoToolsUtil.getRoutePointOrder(info, airportLat, airportLon);
        // 创建XML模板模型
        XMLTemplateModel xmlModel = XMLTemplateModel.init(coordinates, info);
        CreateWaylineFileUtils.createWaylineFile(xmlModel, patchesConfigPojo.getTemplate(), patchesConfigPojo.getTargetTemplate(), patchesConfigPojo.getWaylines(), patchesConfigPojo.getTargetWaylines());