人脸上传修改
This commit is contained in:
parent
4fa09c394c
commit
50d153ea03
|
|
@ -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()) {
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
Loading…
Reference in New Issue