From 50d153ea0358d3532693b27c755e6975585fffa4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=96=B9=E4=BA=AE?= <fltoo@qq.com>
Date: Thu, 12 Feb 2026 13:23:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E8=84=B8=E4=B8=8A=E4=BC=A0=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bmw/service/impl/PmWorkerServiceImpl.java  | 18 ++++++++++++------
 .../service/impl/FileUtilsServiceImpl.java     | 10 +++++-----
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmWorkerServiceImpl.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmWorkerServiceImpl.java
index 2c0c14a..879042a 100644
--- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmWorkerServiceImpl.java
+++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmWorkerServiceImpl.java
@@ -150,7 +150,7 @@ public class PmWorkerServiceImpl implements PmWorkerService{
                             newPath=ImageCropper.addNewSuffixToFileName(path);
                         }else{
                              filePath=fileData.getAbsolutePath();
-                            newPath=ImageCropper.addNewSuffixToFileName(filePath);
+                             newPath=ImageCropper.addNewSuffixToFileName(filePath);
                         }
                         if(newPath!=null){
                             //临时文件
@@ -161,12 +161,16 @@ public class PmWorkerServiceImpl implements PmWorkerService{
                             workerFiles[0] = multipartFile;
                         }
                     }
+                   if(file == null){
+                       workerFiles[0] =CustomMultipartFile.convert(fileData);
+                   }
                     //人脸的数据添加
                     uploadFileVos = fileUploadUtils.uploadFile(workerFiles, Constants.FILE_UPLOAD_WORKER, record.getId().toString(), type,"", "");
-                    if (file!=null && file.exists()) {
-                        boolean delete = file.delete();
-                        System.out.println("删除临时文件--->"+delete);
-                    }
+                    log.info("人脸数据："+uploadFileVos);
+//                    if (file!=null && file.exists()) {
+//                        boolean delete = file.delete();
+//                        System.out.println("删除临时文件--->"+delete);
+//                    }
                 }
                 //入场相关数据添加
                 addWorkerEinData(record,fileMsg);
@@ -507,7 +511,9 @@ public class PmWorkerServiceImpl implements PmWorkerService{
                         workerFiles[0] = multipartFile;
                     }
                 }
-
+                if(file == null){
+                    workerFiles[0] =CustomMultipartFile.convert(fileData);
+                }
                 //人脸的数据添加
                 uploadFileVos = fileUploadUtils.uploadFile(workerFiles, Constants.FILE_UPLOAD_WORKER, record.getId().toString(), type,"", "");
                 if (file!=null &&file.exists()) {
diff --git a/bonus-modules/bonus-file/src/main/java/com/bonus/file/service/impl/FileUtilsServiceImpl.java b/bonus-modules/bonus-file/src/main/java/com/bonus/file/service/impl/FileUtilsServiceImpl.java
index 1740e81..a65c59f 100644
--- a/bonus-modules/bonus-file/src/main/java/com/bonus/file/service/impl/FileUtilsServiceImpl.java
+++ b/bonus-modules/bonus-file/src/main/java/com/bonus/file/service/impl/FileUtilsServiceImpl.java
@@ -31,10 +31,7 @@ import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.Base64;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
@@ -200,7 +197,9 @@ public class FileUtilsServiceImpl {
      * @return
      */
     public List<UploadFileVo> uploadFile(String sourceTable, String sourceId, String[] sourceType, String prefix, MultipartFile[] files, String bucketName) {
-      List<UploadFileVo>  list=new ArrayList<>();
+
+        log.info("文件上传1："+ files[0]);
+        List<UploadFileVo>  list=new ArrayList<>();
         if(StringHelper.isNullOrEmptyString(prefix)){
             prefix=floor;
         }
@@ -213,6 +212,7 @@ public class FileUtilsServiceImpl {
             minioUtils.createBucket(bucketName);
         }
         for (int i = 0; i <files.length ; i++) {
+            log.info("文件上传2："+ files.length);
             UploadFileVo vo=new UploadFileVo();
             vo.setSourceId(sourceId);
             vo.setSourceTable(sourceTable);