From cf396d3076a064998fbac84f76861f5ed918c5e5 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 03 四月 2025 15:18:34 +0800
Subject: [PATCH] minio修改
---
basic-server/src/main/java/com/ruoyi/basic/service/StandardTreeService.java | 2
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InspectionPurchasedServiceImpl.java | 12 +++--
basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardMethodListServiceImpl.java | 13 ++++++
basic-server/src/main/java/com/ruoyi/basic/service/impl/WorkShopFileServiceImpl.java | 10 +++--
basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListUpdateRecordServiceImpl.java | 7 ++-
basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java | 4 +-
basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTreeServiceImpl.java | 13 +-----
ruoyi-common/src/main/java/com/ruoyi/common/config/MinioConfig.java | 1
basic-server/src/main/java/com/ruoyi/basic/service/impl/WorkShopServiceImpl.java | 8 ++-
9 files changed, 41 insertions(+), 29 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java b/basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java
index c398be5..ec38fa5 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java
@@ -79,8 +79,8 @@
@ApiOperation(value = "鍒犻櫎鏍囧噯鏍戠殑灞傜骇")
@DeleteMapping("/delStandardTree")
- public Result delStandardTree(String tree) {
- return Result.success(standardTreeService.delStandardTree(tree));
+ public Result delStandardTree(String level, String id) {
+ return Result.success(standardTreeService.delStandardTree(level,id));
}
@ApiOperation(value = "閫氳繃鏍囧噯鏍戞煡璇㈠搴旂殑妫�楠岄」鐩�")
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/StandardTreeService.java b/basic-server/src/main/java/com/ruoyi/basic/service/StandardTreeService.java
index f25e0c6..7fc6206 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/StandardTreeService.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/StandardTreeService.java
@@ -23,7 +23,7 @@
int addStandardTree(ModelAddDto modelAddDto);
- int delStandardTree(String tree);
+ int delStandardTree(String level,String id);
List<BasicTreeDto> getStandardTree2();
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardMethodListServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardMethodListServiceImpl.java
index ad901fd..596aabb 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardMethodListServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardMethodListServiceImpl.java
@@ -50,6 +50,7 @@
return map;
}
StringBuilder checkItemQueryTree = new StringBuilder(); // 妫�鏌ラ」鏌ヨ
+ StringBuilder productTree = new StringBuilder(); // 妫�楠屼骇鍝佹爲
// 鍒ゆ柇鏄惁鍖呭惈杞﹂棿
boolean existWorkShopFlag = this.existWorkShop(tree);
// 杞﹂棿灞傜骇澶氫竴灞傜骇
@@ -58,6 +59,7 @@
case 7:
sampleType = trees[4];
checkItemQueryTree.append("\"").append(trees[4]).append("\",\"").append(trees[5]).append("\",\"").append(trees[6]).append("\"");
+ productTree.append("\"").append(trees[4]).append("\",\"").append(trees[5]).append("\"");
break;
case 6:
sampleType = trees[4];
@@ -73,6 +75,7 @@
case 6:
sampleType = trees[3];
checkItemQueryTree.append("\"").append(trees[3]).append("\",\"").append(trees[4]).append("\",\"").append(trees[5]).append("\"");
+ productTree.append("\"").append(trees[3]).append("\",\"").append(trees[4]).append("\"");
break;
case 5:
sampleType = trees[3];
@@ -90,7 +93,15 @@
List<StandardMethodList> standardMethodListArray = standardMethodListMapper.selectStandardMethodLists(checkItemQueryTree.toString());
// 鏌ヤ笉鍒版煡璇㈡鏌ュ璞�
if(CollectionUtils.isEmpty(standardMethodListArray)){
- standardMethodListArray = standardMethodListMapper.selectStandardMethodLists(sampleType);
+ // 濡傛灉鏄畬鏁村眰绾э紝鍚戜笂鎺ㄥ埌浜у搧灞傜骇
+ if((existWorkShopFlag&&trees.length == 7) || (!existWorkShopFlag&&trees.length == 6)){
+ standardMethodListArray = standardMethodListMapper.selectStandardMethodLists(productTree.toString());
+
+ }
+ // 杩樻槸涓虹┖鏌ヨ瀵硅薄灞傜骇
+ if(CollectionUtils.isEmpty(standardMethodListArray)){
+ standardMethodListArray = standardMethodListMapper.selectStandardMethodLists(sampleType);
+ }
}
map.put("standardMethodList", standardMethodListArray);
return map;
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListUpdateRecordServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListUpdateRecordServiceImpl.java
index e53ae53..d9dcf7e 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListUpdateRecordServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListUpdateRecordServiceImpl.java
@@ -17,6 +17,7 @@
import com.ruoyi.basic.service.StandardMethodListService;
import com.ruoyi.basic.service.StandardProductListService;
import com.ruoyi.basic.service.StandardProductListUpdateRecordService;
+import com.ruoyi.common.config.MinioConfig;
import com.ruoyi.common.core.domain.MinioResult;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.QueryWrappers;
@@ -55,8 +56,8 @@
@Resource
private MinioUtils minioUtils;
- @Value("${minio.bucketName}")
- private String bucketName;
+ @Autowired
+ private MinioConfig minioConfig;
/**
* 鏍囧噯鏍戜笅妫�楠岄」淇敼璁板綍鍒嗛〉鏌ヨ
@@ -92,7 +93,7 @@
@Override
public void uploadRecordFile(MultipartFile file, Long id) {
try {
- MinioResult result = minioUtils.upload(bucketName, file, true);
+ MinioResult result = minioUtils.upload(minioConfig.getBucketName(), file, true);
// 淇濆瓨璺緞
StandardProductListUpdateRecord standardProductListUpdateRecord = new StandardProductListUpdateRecord();
standardProductListUpdateRecord.setId(id);
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTreeServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTreeServiceImpl.java
index 9c8951e..3f60b21 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTreeServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTreeServiceImpl.java
@@ -238,16 +238,9 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public int delStandardTree(String tree) {
- String[] trees = tree.split(" - ");
- switch (trees.length) {
- case 5:
- if (trees[3].equals("null")) {
- standardTreeMapper.delete(Wrappers.<StandardTree>lambdaUpdate().eq(StandardTree::getFactory, trees[0]).eq(StandardTree::getLaboratory, trees[1]).eq(StandardTree::getSampleType, trees[2]).isNull(StandardTree::getSample).eq(StandardTree::getModel, trees[4]));
- } else {
- standardTreeMapper.delete(Wrappers.<StandardTree>lambdaUpdate().eq(StandardTree::getFactory, trees[0]).eq(StandardTree::getLaboratory, trees[1]).eq(StandardTree::getSampleType, trees[2]).eq(StandardTree::getSample, trees[3]).eq(StandardTree::getModel, trees[4]));
- }
- break;
+ public int delStandardTree(String level,String id) {
+ if(BasicTreeEnums.MODEL_TYPE.getCode().equals(level)){
+ modelMapper.deleteById(id);
}
return 1;
}
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/WorkShopFileServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/WorkShopFileServiceImpl.java
index a0a3f6c..7067aad 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/WorkShopFileServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/WorkShopFileServiceImpl.java
@@ -7,7 +7,9 @@
import com.ruoyi.basic.mapper.*;
import com.ruoyi.basic.pojo.*;
import com.ruoyi.basic.service.WorkShopFileService;
+import com.ruoyi.common.config.MinioConfig;
import com.ruoyi.common.utils.file.MinioUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@@ -37,8 +39,8 @@
@Resource
private MinioUtils minioUtils;
- @Value("${minio.bucketName}")
- private String bucketName;
+ @Autowired
+ private MinioConfig minioConfig;
@Override
public int delFile(Integer id) {
@@ -51,9 +53,9 @@
WorkShopFile file = workShopFileMapper.selectById(id);
if (file != null && file.getFileUrl() != null) {
// 妫�鏌� MinIO 涓枃浠舵槸鍚﹀瓨鍦�
- if (minioUtils.objectExists(bucketName, file.getFileUrl())) {
+ if (minioUtils.objectExists(minioConfig.getBucketName(), file.getFileUrl())) {
// 鍏堝垹闄� MinIO 涓殑瀵硅薄
- minioUtils.removeObjectsResult(bucketName, file.getFileUrl());
+ minioUtils.removeObjectsResult(minioConfig.getBucketName(), file.getFileUrl());
}
}
// 鎵ц鏁版嵁搴撳垹闄ゆ搷浣�
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/WorkShopServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/WorkShopServiceImpl.java
index 7620e5b..8b99c7b 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/WorkShopServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/WorkShopServiceImpl.java
@@ -9,11 +9,13 @@
import com.ruoyi.basic.pojo.WorkShop;
import com.ruoyi.basic.pojo.WorkShopFile;
import com.ruoyi.basic.service.WorkShopService;
+import com.ruoyi.common.config.MinioConfig;
import com.ruoyi.common.core.domain.MinioResult;
import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.file.MinioUtils;
import com.ruoyi.framework.exception.ErrorException;
+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;
@@ -35,8 +37,8 @@
@Resource
private MinioUtils minioUtils;
- @Value("${minio.bucketName}")
- private String bucketName;
+ @Autowired
+ private MinioConfig minioConfig;
@Override
@@ -73,7 +75,7 @@
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);
// 璁板綍瀛樺偍璺緞
workShopFile.setFileUrl(upload.getBucketFileName());
workShopFile.setFileMinioUrl(upload.getPreviewExpiry());
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());
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/config/MinioConfig.java b/ruoyi-common/src/main/java/com/ruoyi/common/config/MinioConfig.java
index d9277a0..5937bb3 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/config/MinioConfig.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/config/MinioConfig.java
@@ -16,6 +16,7 @@
private String accessKey;
private String secretKey;
private Boolean secure;
+ private String bucketName;
@Bean
public MinioClient getMinioClient() {
--
Gitblit v1.9.3