From 3f43e40ed1a1e9f66b3ad2862da9dbc4b710c712 Mon Sep 17 00:00:00 2001
From: nishiwei <13126973358@163.com>
Date: Fri, 23 Oct 2026 14:09:47 +0800
Subject: [PATCH] 智云3.0机场1适配内容提交
---
ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java | 131 ++++++++++++++++++++++++++++++++++---------
1 files changed, 102 insertions(+), 29 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 a8b9e9f..eddf3c2 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
@@ -1,10 +1,12 @@
package com.ard.route.service.impl;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.List;
import com.ard.common.exception.ControlException;
import com.ard.common.utils.DateUtils;
+import com.ard.common.utils.SecurityUtils;
import com.ard.common.utils.file.FileUtils;
import com.ard.common.utils.uuid.IdUtils;
import com.ard.data.noflyzone.domain.ArdNoFlyZone;
@@ -12,6 +14,8 @@
import com.ard.data.noflyzone.service.IArdNoFlyZoneService;
import com.ard.data.noflyzone.utils.NoFlyZoneUtils;
import com.ard.framework.web.service.TokenService;
+import com.ard.inspection.domain.ArdPointCloud;
+import com.ard.inspection.mapper.ArdPointCloudMapper;
import com.ard.oss.model.MinioUploadResult;
import com.ard.oss.service.impl.OssServiceContext;
import com.ard.route.domain.djuav.ActionGroupReq;
@@ -19,9 +23,11 @@
import com.ard.route.domain.djuav.RoutePointReq;
import com.ard.route.domain.djuav.UavRouteReq;
import com.ard.route.domain.dto.ArdNoflyDto;
+import com.ard.route.domain.route.ArdRouteCloud;
import com.ard.route.domain.route.ArdRouteInfo;
import com.ard.route.domain.route.ArdRouteMission;
import com.ard.route.domain.vo.KmzResultVo;
+import com.ard.route.mapper.ArdRouteCloudMapper;
import com.ard.route.mapper.ArdRouteInfoMapper;
import com.ard.route.mapper.ArdRouteMissionMapper;
import com.ard.route.service.IArdRouteInfoService;
@@ -33,15 +39,14 @@
import com.ard.work.service.ITyService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
-
import javax.annotation.Resource;
-
-import static com.ard.common.utils.SecurityUtils.getUsername;
+import static com.ard.route.enums.kml.DroneEnumValueEnums.M30_M30T;
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.divided23;
import static com.ard.route.util.ToolUtils.*;
import static com.ard.route.util.UavRouteReqUtils.buildWayLineUploadDTO;
import static com.ard.route.util.UavRouteReqUtils.fileConversionEntity;
@@ -69,6 +74,12 @@
@Autowired
private ArdRouteMissionMapper ardRouteMissionMapper;
+ @Autowired
+ private ArdPointCloudMapper ardPointCloudMapper;
+
+ @Autowired
+ private ArdRouteCloudMapper ardRouteCloudMapper;
+
@Resource
private IArdNoFlyZoneService ardNoFlyZoneService;
@@ -86,8 +97,19 @@
ArdRouteInfo ardRouteInfo = ardRouteInfoMapper.selectArdRouteInfoById(id);
try {
if (ardRouteInfo != null) {
- if (ardRouteInfo.getRouteData() != null){
- ardRouteInfo.setUavRouteReq((UavRouteReq) deserialize(ardRouteInfo.getRouteData()));
+ if ("3".equals(ardRouteInfo.getType())) {
+ if (ardRouteInfo.getRouteData() != null){
+ UavRouteReq uavRouteReq = new UavRouteReq();
+ BeanUtils.copyProperties(deserialize(ardRouteInfo.getRouteData()), uavRouteReq);
+ ardRouteInfo.setUavRouteReq(uavRouteReq);
+ }
+ } else {
+ if (ardRouteInfo.getRouteData() != null){
+ ardRouteInfo.setUavRouteReq((UavRouteReq) deserialize(ardRouteInfo.getRouteData()));
+ }
+ }
+ if (ardRouteInfo.getCloudData() != null){
+ ardRouteInfo.setArdPointCloudList(deserializeLs(ardRouteInfo.getCloudData()));
}
}
} catch (IOException | ClassNotFoundException e) {
@@ -148,13 +170,45 @@
if (ardRouteInfo.getGroupId() == null){
ardRouteInfo.setGroupId("0");
}
- ardRouteInfo.getUavRouteReq().setDroneType(subStringDroneType(ardRouteInfo.getAircraft()));
- KmzResultVo kmzResult = routeService.buildKmz(ardRouteInfo.getUavRouteReq(),ardRouteInfo.getName());
+ if ("3".equals(ardRouteInfo.getType())){
+ ardRouteInfo.getUavRouteReq().setHeightMode("EGM96");
+ }else {
+ ardRouteInfo.getUavRouteReq().setHeightMode("relativeToStartPoint");
+ }
+ UavRouteReq uavRouteReq = ardRouteInfo.getUavRouteReq();
+ uavRouteReq.setDroneType(subStringDroneType(ardRouteInfo.getAircraft()));
+ // 机场1：M30/M30T 需保留 aircraft 中的子类型（0-67-0 / 0-67-1），
+ // 否则 M30T 会按 M30 生成 KMZ（payload 52 而非 53）
+ if (M30_M30T.getValue().equals(uavRouteReq.getDroneType())) {
+ uavRouteReq.setSubDroneType(subStringSubDroneType(ardRouteInfo.getAircraft()));
+ }
+ KmzResultVo kmzResult = routeService.buildKmz(uavRouteReq,ardRouteInfo.getName());
zoomProcessing(ardRouteInfo);
ardRouteInfo.setPath(kmzResult.getPath());
ardRouteInfo.setReadOnly("0");
+ insertRoutePointCloud(ardRouteInfo);
ardRouteInfoMapper.insertArdRouteInfo(dataProcessing(ardRouteInfo));
return kmzResult.getPath();
+ }
+
+ /**
+ * 新增航信信息时，修改点云数据
+ * 同时增加航线与点云关联关系表数据
+ */
+ private void insertRoutePointCloud(ArdRouteInfo ardRouteInfo) {
+ List<ArdRouteCloud> cloudList = new ArrayList<>();
+ if (ardRouteInfo.getArdPointCloudList() != null){
+ for (ArdPointCloud cloudId : ardRouteInfo.getArdPointCloudList()) {
+ ArdRouteCloud cloud = new ArdRouteCloud();
+ cloud.setRouteId(ardRouteInfo.getId());
+ cloud.setCloudId(cloudId.getId());
+ cloudId.setAssociatedState("1");
+ cloudList.add(cloud);
+ cloudId.setUpdateTime(DateUtils.getNowDate());
+ ardPointCloudMapper.updateArdPointCloud(cloudId);
+ }
+ ardRouteCloudMapper.batchRouteCloud(cloudList);
+ }
}
/**
@@ -165,18 +219,20 @@
*/
private void checkRouteMissionStatus(ArdRouteInfo ardRouteInfo,String type){
ArdRouteMission mission = ardRouteMissionMapper.selectArdRouteMissionById(ardRouteInfo.getMissionId());
- switch(type){
- case "1":
- validateForCreate(mission);
- break;
- case "2":
- bindRoute(mission, ardRouteInfo);
- break;
- case "3":
- executeMission(mission);
- break;
- default:
- throw new RuntimeException("不支持的操作类型!!!");
+ if (mission != null){
+ switch(type){
+ case "1":
+ validateForCreate(mission);
+ break;
+ case "2":
+ bindRoute(mission,ardRouteInfo);
+ break;
+ case "3":
+ executeMission(mission,ardRouteInfo);
+ break;
+ default:
+ throw new RuntimeException("不支持的操作类型!!!");
+ }
}
}
@@ -187,17 +243,18 @@
}
private void bindRoute(ArdRouteMission mission, ArdRouteInfo routeInfo) {
- if (!"0".equals(mission.getRouteId())) {
+ if (mission.getRouteId() != null) {
throw new RuntimeException("航线任务下已绑定航线，不可创建新航线信息！！！");
}
mission.setRouteId(routeInfo.getId());
ardRouteMissionMapper.updateArdRouteMission(mission);
}
- private void executeMission(ArdRouteMission mission) {
+ private void executeMission(ArdRouteMission mission,ArdRouteInfo ardRouteInfo) {
if ("0".equals(mission.getExecuteStatus())) {
+ mission.setRouteId(ardRouteInfo.getId());
mission.setExecuteStatus("1");
- mission.setExecuteBy(getUsername());
+ mission.setExecuteName(SecurityUtils.getUsername());
mission.setExecuteTime(DateUtils.getNowDate());
mission.setUpdateTime(DateUtils.getNowDate());
ardRouteMissionMapper.updateArdRouteMission(mission);
@@ -221,9 +278,14 @@
// 先删除航线
delOssService(route);
// 再生成航线
- ardRouteInfo.getUavRouteReq().setDroneType(subStringDroneType(ardRouteInfo.getAircraft()));
+ UavRouteReq uavRouteReq = ardRouteInfo.getUavRouteReq();
+ uavRouteReq.setDroneType(subStringDroneType(ardRouteInfo.getAircraft()));
+ // 机场1：M30T(0-67-1) 需同步子类型，避免编辑后按 M30 重新生成 KMZ
+ if (M30_M30T.getValue().equals(uavRouteReq.getDroneType())) {
+ uavRouteReq.setSubDroneType(subStringSubDroneType(ardRouteInfo.getAircraft()));
+ }
zoomProcessing(ardRouteInfo);
- kmzResult = routeService.buildKmz(ardRouteInfo.getUavRouteReq(), ardRouteInfo.getName());
+ kmzResult = routeService.buildKmz(uavRouteReq, ardRouteInfo.getName());
if ("更新航线kmz文件失败".equals(kmzResult.getData())) {
return 0;
}
@@ -240,7 +302,7 @@
for (ActionGroupReq actionGroupReq : routePointReq.getActionGroupList()) {
for (PointActionReq action : actionGroupReq.getActions()) {
if (action.getZoom() != null){
- action.setZoom(divided_23(action.getZoom()));
+ action.setZoom(divided23(action.getZoom()));
}
}
}
@@ -252,14 +314,19 @@
private ArdRouteInfo dataProcessing(ArdRouteInfo ardRouteInfo) {
// 航线数据
byte[] routeData = null;
+ byte[] cloudData = null;
try {
if (ardRouteInfo.getUavRouteReq() != null){
routeData = serialize(ardRouteInfo.getUavRouteReq());
+ }
+ if (ardRouteInfo.getArdPointCloudList() != null){
+ cloudData = serialize(ardRouteInfo.getArdPointCloudList());
}
} catch (IOException e) {
throw new RuntimeException(e);
}
ardRouteInfo.setRouteData(routeData);
+ ardRouteInfo.setCloudData(cloudData);
ardRouteInfo.setPointCount(getPointCount(ardRouteInfo));
return ardRouteInfo;
}
@@ -416,6 +483,9 @@
ArdRouteInfo route = ardRouteInfoMapper.selectArdRouteInfoById(id);
try {
route.setUavRouteReq((UavRouteReq) deserialize(route.getRouteData()));
+ if (route.getCloudData() != null){
+ route.setArdPointCloudList(deserializeLs(route.getCloudData()));
+ }
} catch (IOException | ClassNotFoundException e) {
throw new RuntimeException(e);
}
@@ -457,6 +527,7 @@
WaylineInfo WaylineInfo = new WaylineInfo();
WaylineInfo.setBoxSn(boxSn);
WaylineInfo.setWaylineId(route.getId());
+ WaylineInfo.setRouteName(route.getName());
UavWaylineCache.put(WaylineInfo);
// 4.调用接口
tyService.wayLineUpload(wayLineUploadDTO);
@@ -472,9 +543,11 @@
@Override
public Boolean routeBegins(String id,String boxSn) {
ArdRouteInfo route = ardRouteInfoMapper.selectArdRouteInfoById(id);
- // 判断是否循环航线
- if (null != route && "0".equals(route.getIsLoop())){
- deleteArdRouteInfoById(id);
+ if (null != route){
+ // 判断是否循环航线
+ if ("0".equals(route.getIsLoop())){
+ deleteArdRouteInfoById(id);
+ }
checkRouteMissionStatus(route,"3");
}
WayLineBeginDTO wayLineBeginDTO = new WayLineBeginDTO(boxSn);
--
Gitblit v1.9.3