From 72573c30c04626f59e8263dff73404353fdff426 Mon Sep 17 00:00:00 2001 From: huguanghan Date: Thu, 26 Dec 2024 09:24:52 +0800 Subject: [PATCH] =?UTF-8?q?=E9=99=84=E5=B1=9E=E5=B1=9E=E6=80=A7=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../equipment/service/impl/SysEquipmentServiceImpl.java | 3 ++- .../java/com/das/modules/fdr/service/MinioViewsServcie.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/das/src/main/java/com/das/modules/equipment/service/impl/SysEquipmentServiceImpl.java b/das/src/main/java/com/das/modules/equipment/service/impl/SysEquipmentServiceImpl.java index ac0527de..42310c57 100644 --- a/das/src/main/java/com/das/modules/equipment/service/impl/SysEquipmentServiceImpl.java +++ b/das/src/main/java/com/das/modules/equipment/service/impl/SysEquipmentServiceImpl.java @@ -444,7 +444,9 @@ public class SysEquipmentServiceImpl implements SysEquipmentService { List collectDelete = sysEquipmentDocs.stream().filter(item -> !collect.contains(item.getId())).collect(Collectors.toList()); //删除minio文件和数据库记录 for (SysEquipmentDocs item : collectDelete){ + sysEquipmentDocsMapper.deleteById(item.getId()); deleteFile(item); + } } @@ -543,7 +545,6 @@ public class SysEquipmentServiceImpl implements SysEquipmentService { @Override public void readFileToSteam(String path, OutputStream stream) { - path = minioAutoProperties.getPublicBucket()+ FileConstants.FILE_SEPARATOR+ path; minioViewsServcie.readFileToStream(path, stream); } diff --git a/das/src/main/java/com/das/modules/fdr/service/MinioViewsServcie.java b/das/src/main/java/com/das/modules/fdr/service/MinioViewsServcie.java index 2bcf8a21..a4d555ad 100644 --- a/das/src/main/java/com/das/modules/fdr/service/MinioViewsServcie.java +++ b/das/src/main/java/com/das/modules/fdr/service/MinioViewsServcie.java @@ -200,7 +200,7 @@ public class MinioViewsServcie { public void readFileToStream(String path, OutputStream stream) { try (GetObjectResponse res = minioClient.getObject( - GetObjectArgs.builder().bucket(minioProperties.getBucket()).object(path).build())) { + GetObjectArgs.builder().bucket(minioProperties.getPublicBucket()).object(path).build())) { res.transferTo(stream); } catch (Exception e) { log.error("minio读取文件失败", e);