From bd2ead7fc4642833ae6188574e5738407e988c1c Mon Sep 17 00:00:00 2001
From: Xiajijian <1176061145@qq.com>
Date: Sat, 29 Nov 2025 17:25:54 +0800
Subject: [PATCH] 1.优化修改航线信息功能。
---
ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java | 53 +++++++++++++++++++++++++++++++++--------------------
1 files changed, 33 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 c89d015..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
@@ -113,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();
}
@@ -144,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();
@@ -176,12 +180,21 @@
// 删除航线(kmz)文件
for (String id : ids) {
ArdRouteInfo information = ardRouteInfoMapper.selectArdRouteInfoById(id);
- ossService.deleteObject("kmz", subStringMinioUrlName(information.getPath()));
- ossDockService.deleteObject("kmz", subStringMinioUrlName(information.getPath1()));
+ 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()));
+ }
+ }
+
/**
* 删除航线(kmz)信息
*
--
Gitblit v1.9.3