From e778750214d72d7aa9ce42d9e0b55dcc60fc41ca Mon Sep 17 00:00:00 2001
From: Xiajijian <1176061145@qq.com>
Date: Tue, 25 Nov 2025 13:39:34 +0800
Subject: [PATCH] 1.增加行点总数字段。
---
ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java | 29 ++++++++++++++++++++---------
1 files changed, 20 insertions(+), 9 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..57f6522 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
@@ -21,6 +21,7 @@
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;
@@ -121,6 +122,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();
}
@@ -149,7 +151,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;
}
/**
@@ -194,6 +204,7 @@
information.setPath(url);
information.setGroupId("0"); // 默认分组
information.setReadOnly("1"); // 默认只读
+ // 增加航线实体类信息
insertRouteInfomation(information);
return MinioUploadResult.builder()
.url(url)
@@ -206,7 +217,7 @@
}
/**
- * 根据文件名称查询航线信息
+ * 根据名称查询航线信息
*
* @param name 文件名称
* @return 结果
@@ -253,8 +264,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,18 +336,16 @@
String exitOnRcLostAction = ardRouteInfo.getUavRouteReq().getExitOnRcLostAction(); //0
PlanLineData planLineData = new PlanLineData();
-
-
-
if (finishAction != null){
planLineData.setLoseAction(0);
}
if (autoFlightSpeed != null){
planLineData.setAutoSpeed(8);
}
- if (globalTransitionalSpeed != null){
- planLineData.setMaxSpeed(15);
- }
+ planLineData.setMaxSpeed(15);
+// if (globalTransitionalSpeed != null){
+// planLineData.setMaxSpeed(15);
+// }
if (exitOnRcLostAction != null){
planLineData.setFinishedAction(1);
}
@@ -360,11 +371,11 @@
if (height != null){
pointData.setHeight(height.floatValue());
}
- Double longitude = routePointReq.getLatitude();
+ Double longitude = routePointReq.getLongitude();
if (longitude != null){
pointData.setLng(longitude.floatValue());
}
- Double latitude = routePointReq.getLongitude();
+ Double latitude = routePointReq.getLatitude();
if (latitude != null){
pointData.setLat(latitude.floatValue());
}
--
Gitblit v1.9.3