From 6b4380956666f47a055493dd2c064148e5b7e94a Mon Sep 17 00:00:00 2001
From: Xiajijian <1176061145@qq.com>
Date: Mon, 13 Oct 2025 15:12:53 +0800
Subject: [PATCH] 1.增加注释，修改字段名称和代码格式。 2.合并无人机盒子和无人机管理代码。 3.地图管理和tile管理增加字段名称。 4.增加根据boxSn获取六合盒子列表接口。
---
ard-work/src/main/java/com/ard/work/service/impl/KmzFileServiceImpl.java | 16 ++++++----------
1 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/ard-work/src/main/java/com/ard/work/service/impl/KmzFileServiceImpl.java b/ard-work/src/main/java/com/ard/work/service/impl/KmzFileServiceImpl.java
index db67fd3..05d88b6 100644
--- a/ard-work/src/main/java/com/ard/work/service/impl/KmzFileServiceImpl.java
+++ b/ard-work/src/main/java/com/ard/work/service/impl/KmzFileServiceImpl.java
@@ -1,7 +1,7 @@
package com.ard.work.service.impl;
-import com.ard.work.component.minio.config.MinioConfig;
-import com.ard.work.component.minio.utils.MinioUtil;
+import com.ard.common.config.OssConfiguration;
+import com.ard.oss.service.impl.OssServiceContext;
import com.ard.work.config.WaylinePlaningConfig;
import com.ard.work.domain.dto.wayline.*;
import com.ard.work.domain.entity.UavWayline;
@@ -36,9 +36,6 @@
public class KmzFileServiceImpl implements IKmzFileService {
@Resource
- private MinioConfig minioConfig;
-
- @Resource
private IGeoToolsService geoToolsService;
@Resource
@@ -46,6 +43,9 @@
@Resource
private UavWaylineMapper uavWaylineMapper;
+
+ @Resource
+ private OssServiceContext ossService;
private Document initWayline(Boolean isTemplate) {
//创建Document对象
@@ -429,11 +429,7 @@
InputStream inputStream = new FileInputStream(kmzPath);
//构建记录
String objectKey = fileName;
- //若已经存在，则先删除，再添加
- if (MinioUtil.exists(minioConfig.getBucketName(), objectKey))
- MinioUtil.delete(minioConfig.getBucketName(), objectKey);
- String kmzUrl = MinioUtil.uploadInputStream(minioConfig.getBucketName(), objectKey, inputStream,
- inputStream.available(), "application/octet-stream");
+ String kmzUrl = ossService.upload(OssConfiguration.bucket, objectKey, inputStream);
// 更新航线kmz地址
UavWayline uavWayline = UavWayline.builder()
.id(ardWaylineDTO.waylineId)
--
Gitblit v1.9.3