From 54f3f9d6c99f6890c39ff05b1e251a555709341a Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 08 四月 2025 11:55:36 +0800
Subject: [PATCH] 1.原辅料下单 2.检验对象选择

---
 basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListUpdateRecordServiceImpl.java |   50 +++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 43 insertions(+), 7 deletions(-)

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 3c70fa6..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
@@ -10,21 +10,28 @@
 import com.ruoyi.basic.dto.CopyStandardProductListDto;
 import com.ruoyi.basic.dto.InsSampleReceiveDto;
 import com.ruoyi.basic.dto.ResetTreeDragDTO;
+import com.ruoyi.basic.dto.StandardProductListUpdateRecordDto;
 import com.ruoyi.basic.enums.StandardProductListChcekTypeEnums;
 import com.ruoyi.basic.mapper.*;
 import com.ruoyi.basic.pojo.*;
 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;
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.file.MinioUtils;
 import lombok.AllArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
 
+import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.util.*;
 import java.util.regex.Matcher;
@@ -37,7 +44,6 @@
  * @createDate 2024-03-05 10:33:29
  */
 @Service
-@AllArgsConstructor
 public class StandardProductListUpdateRecordServiceImpl extends ServiceImpl<StandardProductListUpdateRecordMapper, StandardProductListUpdateRecord>
         implements StandardProductListUpdateRecordService {
 
@@ -47,6 +53,12 @@
     @Autowired
     private StandardProductListUpdateRecordRelMapper standardProductListUpdateRecordRelMapper;
 
+    @Resource
+    private MinioUtils minioUtils;
+
+    @Autowired
+    private MinioConfig minioConfig;
+
     /**
      * 鏍囧噯鏍戜笅妫�楠岄」淇敼璁板綍鍒嗛〉鏌ヨ
      * @param page
@@ -54,21 +66,45 @@
      * @return
      */
     @Override
-    public IPage<StandardProductListUpdateRecord> standardProductListRecordPage(Page page, StandardProductListUpdateRecord record) {
-        return standardProductListUpdateRecordMapper.standardProductListRecordPage(page,QueryWrappers.queryWrappers(record));
+    public IPage<StandardProductListUpdateRecordDto> standardProductListRecordPage(Page page, StandardProductListUpdateRecordDto record) {
+        return standardProductListUpdateRecordMapper.standardProductListRecordPage(page,record);
     }
 
     /**
-     * 鏍囧噯鏍戜笅妫�楠岄」淇敼璁板綍鍒嗛〉鏌ヨ
-     * @param page
+     * 鏍囧噯鏍戜笅妫�楠岄」淇敼璁板綍鏌ヨ
      * @param standardProductListUpdateRecordRel
      * @return
      */
     @Override
-    public IPage<StandardProductListUpdateRecordRel> standardProductListRecordRelPage(Page page, StandardProductListUpdateRecordRel standardProductListUpdateRecordRel) {
-        return standardProductListUpdateRecordRelMapper.standardProductListRecordRelPage(page,QueryWrappers.queryWrappers(standardProductListUpdateRecordRel));
+    public Map<String,Object> standardProductListRecordRelPage(StandardProductListUpdateRecordRel standardProductListUpdateRecordRel) {
+        Map<String, Object> resultMap = new HashMap<>();
+        List<StandardProductListUpdateRecordRel> recordRelList = standardProductListUpdateRecordRelMapper.standardProductListRecordRelPage(QueryWrappers.queryWrappers(standardProductListUpdateRecordRel));
+        resultMap.put("productList",recordRelList);
+        resultMap.put("total",recordRelList.size());
+        return resultMap;
     }
 
+    /**
+     * 鏍囧噯鏍戜笅淇敼璁板綍鏂囦欢涓婁紶
+     *
+     * @param file
+     * @param id
+     */
+    @Override
+    public void uploadRecordFile(MultipartFile file, Long id) {
+        try {
+            MinioResult result = minioUtils.upload(minioConfig.getBucketName(), file, true);
+            // 淇濆瓨璺緞
+            StandardProductListUpdateRecord standardProductListUpdateRecord = new StandardProductListUpdateRecord();
+            standardProductListUpdateRecord.setId(id);
+            standardProductListUpdateRecord.setFileName(result.getOriginalName());
+            standardProductListUpdateRecord.setFilePath(result.getBucketFileName());
+            standardProductListUpdateRecord.setFilePreviewPath(result.getPreviewExpiry());
+            standardProductListUpdateRecordMapper.updateById(standardProductListUpdateRecord);
+        }catch (Exception e){
+            throw new RuntimeException("鏂囦欢涓婁紶澶辫触");
+        }
+    }
 }
 
 

--
Gitblit v1.9.3