From 3a77c500a010d12e913ff2b9e4cf27b1115c8224 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 09 四月 2025 17:26:52 +0800
Subject: [PATCH] 检验任务，进货检验车间文件选择
---
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InspectionPurchasedServiceImpl.java | 60 +++++++++++++++++++++++++++++++++++-------------------------
1 files changed, 35 insertions(+), 25 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 31c5bec..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,18 +4,24 @@
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;
import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.common.utils.file.MinioUtils;
-import com.ruoyi.framework.exception.ErrorException;
import com.ruoyi.inspect.dto.InspectionPurchasedDto;
import com.ruoyi.inspect.mapper.InspectionPurchasedMapper;
import com.ruoyi.inspect.pojo.InspectionPurchased;
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;
-import javax.annotation.Resource;
+import java.time.LocalDateTime;
/**
* <p>
@@ -26,22 +32,28 @@
* @since 2025-03-25 11:22:56
*/
@Service
+@RequiredArgsConstructor
+@Setter
public class InspectionPurchasedServiceImpl extends ServiceImpl<InspectionPurchasedMapper, InspectionPurchased> implements InspectionPurchasedService {
- @Resource
- private InspectionPurchasedMapper inspectionPurchasedMapper;
+ private final InspectionPurchasedMapper inspectionPurchasedMapper;
- @Resource
- private MinioUtils minioUtils;
+ private final MinioUtils minioUtils;
- @Value("${minio.bucketName}")
- private String bucketName;
+ private final NumberGenerator<InspectionPurchased> numberGenerator;
+
+ @Autowired
+ private MinioConfig minioConfig;
@Override
public int addOrUpdateInspection(InspectionPurchasedDto inspectionPurchasedDto) {
if (inspectionPurchasedDto.getId() == null) {
inspectionPurchasedDto.setInspectionStatus(String.valueOf(0));
-
+ //濮旀墭缂栧彿瑙勫垯鏄疛CZX/SP+W+骞存湀+搴忓彿
+ String no = numberGenerator.generateNumberWithPrefix(3,
+ "JCZX/SP-" + "W" + LimsDateUtil.resetDate(LocalDateTime.now()),
+ InspectionPurchased::getEntrustmentNo);
+ inspectionPurchasedDto.setEntrustmentNo(no);
return inspectionPurchasedMapper.insert(inspectionPurchasedDto);
} else {
return inspectionPurchasedMapper.updateById(inspectionPurchasedDto);
@@ -59,37 +71,35 @@
}
@Override
- public int UpdateInspection(InspectionPurchasedDto inspectionPurchasedDto) throws Exception {
- int insertResult = 0;
- InspectionPurchased inspectionPurchased = inspectionPurchasedMapper.selectById(inspectionPurchasedDto.getId());
- if (ObjectUtils.isNotEmpty(inspectionPurchasedDto.getFile())) {
- if (ObjectUtils.isNotEmpty(inspectionPurchased.getFileUrl())){
+ public int updateInspection(MultipartFile file, Integer id, String inspectionItems, String result) throws Exception {
+ InspectionPurchased inspectionPurchased = inspectionPurchasedMapper.selectById(id);
+ inspectionPurchased.setInspectionStatus(String.valueOf(2));
+ inspectionPurchased.setInspectionItems(inspectionItems);
+ inspectionPurchased.setResult(result);
+ // 妫�鏌ユ枃浠舵槸鍚﹀瓨鍦�
+ if (file != null && !ObjectUtils.isEmpty(file)) {
+ 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 = inspectionPurchasedDto.getFile().getContentType();
+ String contentType = file.getContentType();
String category = contentType != null && contentType.startsWith("image/") ? "images" : "docs";
- MinioResult upload = minioUtils.upload(bucketName, inspectionPurchasedDto.getFile(), true);
+ MinioResult upload = minioUtils.upload(minioConfig.getBucketName(), file, true);
// 璁板綍瀛樺偍璺緞
inspectionPurchased.setFileUrl(upload.getBucketFileName());
inspectionPurchased.setFilePreviewUrl(upload.getPreviewExpiry());
inspectionPurchased.setType(category.equals("images") ? 1 : 2);
- // 鏁版嵁搴撴搷浣�
- insertResult = inspectionPurchasedMapper.updateById(inspectionPurchased);
- if (insertResult <= 0) {
- throw new ErrorException("鏁版嵁搴撴彃鍏ュけ璐�");
- }
- return insertResult;
+ inspectionPurchased.setFileName(upload.getOriginalName());
} catch (Exception e) {
throw new Exception("绯荤粺寮傚父: ", e);
}
}
- return insertResult;
+ return inspectionPurchasedMapper.updateById(inspectionPurchased);
}
}
--
Gitblit v1.9.3