From 62425ee97401796752694001a2222dd38aa34c71 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Mon, 24 Nov 2025 15:34:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java b/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java
index d2e9f34..1190edc 100644
--- a/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java
+++ b/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java
@@ -206,7 +206,7 @@
}
/**
- * 根据文件名称查询航线信息
+ * 根据名称查询航线信息
*
* @param name 文件名称
* @return 结果
@@ -253,8 +253,10 @@
} catch (IOException | ClassNotFoundException e) {
throw new RuntimeException(e);
}
+ // 1.2通过minio获取航线信息
// 2.将航线信息转换成对应实体类
WayLineUploadDTO wayLineUploadDTO = buildWayLineUploadDTO(route);
+ wayLineUploadDTO.setBoxSn(boxSn);
// 3.调用接口
tyService.wayLineUpload(wayLineUploadDTO);
return true;
@@ -323,9 +325,6 @@
String exitOnRcLostAction = ardRouteInfo.getUavRouteReq().getExitOnRcLostAction(); //0
PlanLineData planLineData = new PlanLineData();
-
-
-
if (finishAction != null){
planLineData.setLoseAction(0);
}
--
Gitblit v1.9.3