From c3b9669d67b5928757e6ad9c3b8215070cef344e Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Mon, 01 Dec 2025 11:25:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java | 71 ++++++++++++++++++++++++-----------
1 files changed, 49 insertions(+), 22 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 57f6522..aa70de9 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
@@ -14,18 +14,18 @@
import com.ard.data.noflyzone.utils.NoFlyZoneUtils;
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;
import com.ard.route.domain.djuav.UavRouteReq;
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;
import com.ard.route.service.UavRouteService;
+import com.ard.work.domain.cache.UavWaylineCache;
import com.ard.work.domain.dto.state.PointData;
import com.ard.work.domain.dto.wayline.*;
import com.ard.work.service.ITyService;
@@ -51,6 +51,9 @@
@Autowired
private OssServiceContext ossService;
+
+ @Autowired
+ private OssDockServiceContext ossDockService;
@Autowired
private UavRouteService routeService;
@@ -110,20 +113,10 @@
if (ardRouteInfo.getGroupId() == null){
ardRouteInfo.setGroupId("0");
}
- // 航线数据
- byte[] routeData;
- try {
- routeData = serialize(ardRouteInfo.getUavRouteReq());
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
ardRouteInfo.getUavRouteReq().setDroneType(subStringDroneType(ardRouteInfo.getAircraft()));
- ardRouteInfo.setRouteData(routeData);
KmzResultVo kmzResult = routeService.buildKmz(ardRouteInfo.getUavRouteReq(), ardRouteInfo.getName());
ardRouteInfo.setPath(kmzResult.getPath());
- ardRouteInfo.setReadOnly("0");
- ardRouteInfo.setPointCount(getPointCount(ardRouteInfo));
- ardRouteInfoMapper.insertArdRouteInfo(ardRouteInfo);
+ ardRouteInfoMapper.insertArdRouteInfo(dataProcessing(ardRouteInfo));
return kmzResult.getPath();
}
@@ -141,20 +134,34 @@
KmzResultVo kmzResult;
// 获取源文件名字
ArdRouteInfo route = ardRouteInfoMapper.selectArdRouteInfoById(ardRouteInfo.getId());
- if (route.getName().equals(ardRouteInfo.getName())) {
- kmzResult = routeService.updateKmz(ardRouteInfo.getUavRouteReq(), ardRouteInfo.getName());
- }else {
- kmzResult = routeService.updateKmzNew(ardRouteInfo.getUavRouteReq(), route.getName(), ardRouteInfo.getName());
- }
+ // 先删除航线
+ delOssService(route);
+ // 再生成航线
+ kmzResult = routeService.buildKmz(ardRouteInfo.getUavRouteReq(), ardRouteInfo.getName());
if ("更新航线kmz文件失败".equals(kmzResult.getData())) {
return 0;
}
ardRouteInfo.setPath(kmzResult.getPath());
}
- ardRouteInfo.setPointCount(getPointCount(ardRouteInfo));
- return ardRouteInfoMapper.updateArdRouteInfo(ardRouteInfo);
+ return ardRouteInfoMapper.updateArdRouteInfo(dataProcessing(ardRouteInfo));
}
+ // 新增信息加工
+ private ArdRouteInfo dataProcessing(ArdRouteInfo ardRouteInfo) {
+ // 航线数据
+ byte[] routeData;
+ try {
+ routeData = serialize(ardRouteInfo.getUavRouteReq());
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ ardRouteInfo.setRouteData(routeData);
+ ardRouteInfo.setReadOnly("0");
+ ardRouteInfo.setPointCount(getPointCount(ardRouteInfo));
+ return ardRouteInfo;
+ }
+
+ // 获取行点总数
private Integer getPointCount(ArdRouteInfo ardRouteInfo) {
if (ardRouteInfo.getUavRouteReq().getRoutePointList() != null) {
return ardRouteInfo.getUavRouteReq().getRoutePointList().size();
@@ -173,9 +180,19 @@
// 删除航线(kmz)文件
for (String id : ids) {
ArdRouteInfo information = ardRouteInfoMapper.selectArdRouteInfoById(id);
- ossService.deleteObject("kmz", subStringMinioUrlName(information.getPath()));
+ delOssService(information);
}
return ardRouteInfoMapper.deleteArdRouteInfoByIds(ids);
+ }
+
+ // 删除minio文件
+ private void delOssService(ArdRouteInfo information){
+ if (information.getPath() != null){
+ ossService.deleteObject("kmz", subStringMinioUrlName(information.getPath()));
+ }
+ if (information.getPath1() != null){
+ ossDockService.deleteObject("kmz", subStringMinioUrlName(information.getPath1()));
+ }
}
/**
@@ -199,11 +216,15 @@
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"); // 默认只读
+ // 生成kmz文件实体类加工
+
// 增加航线实体类信息
insertRouteInfomation(information);
return MinioUploadResult.builder()
@@ -268,7 +289,12 @@
// 2.将航线信息转换成对应实体类
WayLineUploadDTO wayLineUploadDTO = buildWayLineUploadDTO(route);
wayLineUploadDTO.setBoxSn(boxSn);
- // 3.调用接口
+ // 3.缓存航线信息
+ WaylineInfo WaylineInfo = new WaylineInfo();
+ WaylineInfo.setBoxSn(boxSn);
+ WaylineInfo.setWaylineId(route.getId());
+ UavWaylineCache.put(WaylineInfo);
+ // 4.调用接口
tyService.wayLineUpload(wayLineUploadDTO);
return true;
}
@@ -476,6 +502,7 @@
private void insertRouteInfomation(ArdRouteInfo ardRouteInfo){
ardRouteInfo.setId(IdUtils.simpleUUID());
ardRouteInfo.setCreateTime(DateUtils.getNowDate());
+ ardRouteInfo.setUpdateTime(DateUtils.getNowDate());
ardRouteInfoMapper.insertArdRouteInfo(ardRouteInfo);
}
--
Gitblit v1.9.3