From 9ad4c5c1d7077ca9210327f73d4d57f5f425475e Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 25 四月 2026 11:24:46 +0800
Subject: [PATCH] refactor(production): 优化生产计划分页查询筛选条件+生产计划去掉审核状态字段
---
src/main/java/com/ruoyi/basic/service/impl/StorageAttachmentServiceImpl.java | 95 +++++++++++++++++------------------------------
1 files changed, 35 insertions(+), 60 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/service/impl/StorageAttachmentServiceImpl.java b/src/main/java/com/ruoyi/basic/service/impl/StorageAttachmentServiceImpl.java
index b1c2ca5..f3f3ae3 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/StorageAttachmentServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/StorageAttachmentServiceImpl.java
@@ -1,20 +1,14 @@
package com.ruoyi.basic.service.impl;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.basic.dto.StorageBlobDTO;
-import com.ruoyi.basic.pojo.StorageAttachment;
import com.ruoyi.basic.mapper.StorageAttachmentMapper;
import com.ruoyi.basic.mapper.StorageBlobMapper;
-import com.ruoyi.basic.pojo.StorageBlob;
+import com.ruoyi.basic.pojo.StorageAttachment;
import com.ruoyi.basic.service.StorageAttachmentService;
import com.ruoyi.basic.service.StorageBlobService;
import com.ruoyi.common.constant.StorageAttachmentConstants;
import com.ruoyi.common.enums.StorageAttachmentRecordType;
-import com.ruoyi.common.utils.MinioUtils;
import lombok.RequiredArgsConstructor;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -30,50 +24,27 @@
@Service
@RequiredArgsConstructor
public class StorageAttachmentServiceImpl extends ServiceImpl<StorageAttachmentMapper, StorageAttachment> implements StorageAttachmentService {
- @Autowired
- private StorageBlobMapper storageBlobMapper;
+ private final StorageBlobMapper storageBlobMapper;
- @Autowired
- private StorageAttachmentMapper storageAttachmentMapper;
+ private final StorageAttachmentMapper storageAttachmentMapper;
- @Autowired
- private StorageBlobService storageBlobService;
+ private final StorageBlobService storageBlobService;
- @Autowired
- private MinioUtils minioUtils;
-
- @Override
- public List<StorageAttachment> selectStorageAttachments(Long recordId, StorageAttachmentRecordType recordType, StorageAttachmentConstants fileType) {
- List<StorageAttachment> storageAttachments = storageAttachmentMapper.selectList(new LambdaQueryWrapper<StorageAttachment>()
- .eq(StorageAttachment::getRecordId, recordId)
- .eq(StorageAttachment::getRecordType, recordType.ordinal())
- .eq(StorageAttachment::getName, fileType.toString()));
- if (storageAttachments != null) {
- for (StorageAttachment storageAttachment : storageAttachments) {
- StorageBlob storageBlob = storageBlobMapper.selectById(storageAttachment.getStorageBlobId());
- StorageBlobDTO storageBlobDTO = new StorageBlobDTO();
- BeanUtils.copyProperties(storageBlob, storageBlobDTO);
- storageBlobDTO.setUrl(minioUtils.getPreviewUrl(storageBlob.getBucketName(), storageBlob.getBucketName(), true));
- storageAttachment.setStorageBlobDTO(storageBlobDTO);
- }
- }
-
- return storageAttachments;
- }
@Override
public void saveStorageAttachment(List<StorageAttachment> attachments, Long recordId, StorageAttachmentRecordType recordType, StorageAttachmentConstants fileType) {
// 鍒犻櫎鏃у浘
- deleteStorageAttachment(new StorageAttachment(fileType.toString(), (long) recordType.ordinal(), recordId));
- for (StorageAttachment attachment : attachments) {
- // 鑾峰彇鍏宠仈璁板綍
- StorageBlob storageBlob = attachment.getStorageBlobDTO();
- attachment.setName(fileType.toString());
- attachment.setRecordType((long) recordType.ordinal());
- attachment.setRecordId(recordId);
- attachment.setStorageBlobId(storageBlob.getId());
- storageAttachmentMapper.insert(attachment);
- }
+ // todo fileChange
+// deleteStorageAttachment(new StorageAttachment(fileType.toString(), (long) recordType.ordinal(), recordId));
+// for (StorageAttachment attachment : attachments) {
+// // 鑾峰彇鍏宠仈璁板綍
+// StorageBlob storageBlob = attachment.getStorageBlobDTO();
+// attachment.setName(fileType.toString());
+// attachment.setRecordType((long) recordType.ordinal());
+// attachment.setRecordId(recordId);
+// attachment.setStorageBlobId(storageBlob.getId());
+// storageAttachmentMapper.insert(attachment);
+// }
}
@@ -81,27 +52,31 @@
public void saveStorageAttachment(List<StorageAttachment> attachments, Long recordId, StorageAttachmentRecordType recordType, String fileType) {
// 鍒犻櫎鏃у浘
// deleteStorageAttachment(new StorageAttachment(fileType, (long) recordType.ordinal(), recordId));
- for (StorageAttachment attachment : attachments) {
- // 鑾峰彇鍏宠仈璁板綍
- StorageBlob storageBlob = attachment.getStorageBlobDTO();
- attachment.setName(fileType);
- attachment.setRecordType((long) recordType.ordinal());
- attachment.setRecordId(recordId);
- attachment.setStorageBlobId(storageBlob.getId());
- storageAttachmentMapper.insert(attachment);
- }
+ // todo fileChange
+// for (StorageAttachment attachment : attachments) {
+// // 鑾峰彇鍏宠仈璁板綍
+// StorageBlob storageBlob = attachment.getStorageBlobDTO();
+// attachment.setName(fileType);
+// attachment.setRecordType((long) recordType.ordinal());
+// attachment.setRecordId(recordId);
+// attachment.setStorageBlobId(storageBlob.getId());
+// storageAttachmentMapper.insert(attachment);
+// }
}
@Override
public int deleteStorageAttachment(StorageAttachment storageAttachment) {
// 鍏堝垹闄ゆ槑缁嗚〃
- storageBlobService.deleteStorageBlobs(storageAttachment);
-
-
- return storageAttachmentMapper.delete(new LambdaQueryWrapper<StorageAttachment>()
- .eq(StorageAttachment::getRecordId, storageAttachment.getRecordId())
- .eq(StorageAttachment::getRecordType, storageAttachment.getRecordType())
- .eq(StorageAttachment::getName, storageAttachment.getName()));
+ // todo fileChange
+// storageBlobService.deleteStorageBlobs(storageAttachment);
+//
+//
+// return storageAttachmentMapper.delete(new LambdaQueryWrapper<StorageAttachment>()
+// .eq(StorageAttachment::getRecordId, storageAttachment.getRecordId())
+// .eq(StorageAttachment::getRecordType, storageAttachment.getRecordType())
+// .eq(StorageAttachment::getName, storageAttachment.getName()));
+// }
+ return 0;
}
}
--
Gitblit v1.9.3