From bf2639e4821122e0bf2d8b25b1de74e75bb6cff5 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Mon, 09 Mar 2026 14:30:01 +0800
Subject: [PATCH] 2026-03-09 标记功能接口调整： 1、目录表增加is_delete字段，用于标记目录是否可以删除；只要true/false； 2、目录数据库中增加“默认文件夹”数据，不可被删除；在删除目录中判断固定id为default_directory_00000001的数据不可删除。
---
ard-work/src/main/java/com/ard/work/service/impl/KmzFileServiceImpl.java | 11 +++++------
1 files changed, 5 insertions(+), 6 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 b56251f..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.common.config.OssConfiguration;
-import com.ard.common.utils.file.MinioUtil;
+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;
@@ -43,6 +43,9 @@
@Resource
private UavWaylineMapper uavWaylineMapper;
+
+ @Resource
+ private OssServiceContext ossService;
private Document initWayline(Boolean isTemplate) {
//创建Document对象
@@ -426,11 +429,7 @@
InputStream inputStream = new FileInputStream(kmzPath);
//构建记录
String objectKey = fileName;
- //若已经存在，则先删除，再添加
- if (MinioUtil.exists(OssConfiguration.bucket, objectKey))
- MinioUtil.delete(OssConfiguration.bucket, objectKey);
- String kmzUrl = MinioUtil.uploadInputStream(OssConfiguration.bucket, 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