From 72b6d1dce413abe4d0db4c53b5f1b6d77e9dd94f Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Tue, 09 Dec 2025 16:03:08 +0800
Subject: [PATCH] 2025-12-09 zwy 增加INBOUND_STATE_SPLITTER、INBOUND_STATE_ROUTER的通道Bean定义，解决“没有订阅者” 的错误。
---
ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java | 31 +++++++++++++++++++------------
1 files changed, 19 insertions(+), 12 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 b48775c..eb3795a 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
@@ -221,22 +221,29 @@
@Override
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"); // 默认只读
// 增加航线实体类信息
UavRouteReq uavRouteReq = fileConversionEntity(file);
+ ArdRouteInfo ardRouteInfo = new ArdRouteInfo();
if (uavRouteReq != null){
- information.setUavRouteReq(uavRouteReq);
- information.setType(templateTypeData(uavRouteReq));
- information.setAircraft(droneTypeData(uavRouteReq));
+ ardRouteInfo.setUavRouteReq(uavRouteReq);
+ ardRouteInfo.setType(templateTypeData(uavRouteReq));
+ ardRouteInfo.setAircraft(droneTypeData(uavRouteReq));
}
- insertRouteInfomation(information);
+ // 判断禁飞区
+ List<RoutePointReq> routePointList = ardRouteInfo.getUavRouteReq().getRoutePointList();
+ for (RoutePointReq routePointReq : routePointList) {
+ ArdNoflyDto ardNoflyDto = new ArdNoflyDto();
+ ardNoflyDto.setCurrent(new Vertex(routePointReq.getLongitude(), routePointReq.getLatitude()));
+ verifyNoFlyZone(ardNoflyDto);
+ }
+ 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);
return MinioUploadResult.builder()
.url(url)
.newFileName(FileUtils.getName(url))
--
Gitblit v1.9.3