From fbde0b947b4641081b558302ea77d88c902c4cd1 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 30 四月 2025 10:03:24 +0800
Subject: [PATCH] 可靠性计划优化检验项
---
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InspectionPurchasedServiceImpl.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InspectionPurchasedServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InspectionPurchasedServiceImpl.java
index a5b652f..21fcf87 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InspectionPurchasedServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InspectionPurchasedServiceImpl.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.config.MinioConfig;
import com.ruoyi.common.core.domain.MinioResult;
import com.ruoyi.common.numgen.NumberGenerator;
import com.ruoyi.common.utils.LimsDateUtil;
@@ -15,6 +16,7 @@
import com.ruoyi.inspect.service.InspectionPurchasedService;
import lombok.RequiredArgsConstructor;
import lombok.Setter;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
@@ -40,8 +42,8 @@
private final NumberGenerator<InspectionPurchased> numberGenerator;
- @Value("${minio.bucketName}")
- private String bucketName;
+ @Autowired
+ private MinioConfig minioConfig;
@Override
public int addOrUpdateInspection(InspectionPurchasedDto inspectionPurchasedDto) {
@@ -79,16 +81,16 @@
if (ObjectUtils.isNotEmpty(inspectionPurchased.getFileUrl())) {
if (inspectionPurchased != null && inspectionPurchased.getFileUrl() != null) {
// 妫�鏌� MinIO 涓枃浠舵槸鍚﹀瓨鍦�
- if (minioUtils.objectExists(bucketName, inspectionPurchased.getFileUrl())) {
+ if (minioUtils.objectExists(minioConfig.getBucketName(), inspectionPurchased.getFileUrl())) {
// 鍏堝垹闄� MinIO 涓殑瀵硅薄
- minioUtils.removeObjectsResult(bucketName, inspectionPurchased.getFileUrl());
+ minioUtils.removeObjectsResult(minioConfig.getBucketName(), inspectionPurchased.getFileUrl());
}
}
}
try {
String contentType = file.getContentType();
String category = contentType != null && contentType.startsWith("image/") ? "images" : "docs";
- MinioResult upload = minioUtils.upload(bucketName, file, true);
+ MinioResult upload = minioUtils.upload(minioConfig.getBucketName(), file, true);
// 璁板綍瀛樺偍璺緞
inspectionPurchased.setFileUrl(upload.getBucketFileName());
inspectionPurchased.setFilePreviewUrl(upload.getPreviewExpiry());
--
Gitblit v1.9.3