From 70c59fee44a5a85fa140d65b02f640efa7f0eb72 Mon Sep 17 00:00:00 2001
From: Xiajijian <1176061145@qq.com>
Date: Sat, 13 Dec 2025 16:33:27 +0800
Subject: [PATCH] 1. 修改无动作参数报错问题。
---
ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java | 26 ++++++--------------------
1 files changed, 6 insertions(+), 20 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 1c9f028..aa000dd 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
@@ -15,7 +15,6 @@
import com.ard.framework.web.service.TokenService;
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;
@@ -38,6 +37,8 @@
import javax.annotation.Resource;
+import static com.ard.route.enums.kml.DroneEnumValueEnums.M350_RTK;
+import static com.ard.route.util.InitializationUtils.divided_23;
import static com.ard.route.util.InitializationUtils.divided_6;
import static com.ard.route.util.ToolUtils.*;
import static com.ard.route.util.UavRouteReqUtils.fileConversionEntity;
@@ -59,8 +60,6 @@
@Autowired
private OssServiceContext ossService;
- @Autowired
- private OssDockServiceContext ossDockService;
@Autowired
private UavRouteService routeService;
@@ -90,10 +89,12 @@
for (RoutePointReq routePointReq : ardRouteInfo.getUavRouteReq().getRoutePointList()) {
routePointReq.setHeight(routePointReq.getHeight() + getDoublePoint(ardRouteInfo.getUavRouteReq().getTakeOffRefPoint(),"alt"));
// 判断无人机类型
- if (ardRouteInfo.getUavRouteReq().getDroneType().equals(89)){
+ if (ardRouteInfo.getUavRouteReq().getDroneType().equals(M350_RTK.getValue())){
for (ActionGroupReq actionGroupReq : routePointReq.getActionGroupList()) {
for (PointActionReq action : actionGroupReq.getActions()) {
- action.setZoom(divided_6(action.getZoom()));
+ if (action.getZoom() != null || action.getZoom() != 0){
+ action.setZoom(divided_23(action.getZoom()));
+ }
}
}
}
@@ -218,9 +219,6 @@
if (information.getPath() != null){
ossService.deleteObject("kmz", subStringMinioUrlName(information.getPath()));
}
- if (information.getPath1() != null){
- ossDockService.deleteObject("kmz", subStringMinioUrlName(information.getPath1()));
- }
}
/**
@@ -263,10 +261,8 @@
}
String url = ossService.upload("kmz",file);
- String urlDock = ossDockService.upload("kmz",file);
ardRouteInfo.setName(file.getOriginalFilename());
ardRouteInfo.setPath(url);
- ardRouteInfo.setPath1(urlDock);
ardRouteInfo.setGroupId("0"); // 默认分组
ardRouteInfo.setReadOnly("1"); // 默认只读
insertRouteInfomation(ardRouteInfo);
@@ -356,16 +352,6 @@
} catch (IOException | ClassNotFoundException e) {
throw new RuntimeException(e);
}
-
- // 判断禁飞区
- try {
- arrayWithinNoFlyZone(route.getUavRouteReq().getRoutePointList());
- } catch (ControlException e) {
- log.error("禁飞区错误.航线航点在禁飞区！", e);
- // 返回包含禁飞区错误信息的特定结果
- return false;
- }
-
// 1.2通过minio获取航线信息
// 2.将航线信息转换成对应实体类
WayLineUploadDTO wayLineUploadDTO = buildWayLineUploadDTO(route);
--
Gitblit v1.9.3