|
|
@ -52,9 +52,11 @@ import java.util.ArrayList;
|
|
|
|
import java.util.LinkedHashMap;
|
|
|
|
import java.util.LinkedHashMap;
|
|
|
|
import java.util.List;
|
|
|
|
import java.util.List;
|
|
|
|
import java.util.Map;
|
|
|
|
import java.util.Map;
|
|
|
|
|
|
|
|
import java.util.stream.Collectors;
|
|
|
|
import java.util.zip.ZipEntry;
|
|
|
|
import java.util.zip.ZipEntry;
|
|
|
|
import java.util.zip.ZipInputStream;
|
|
|
|
import java.util.zip.ZipInputStream;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import static java.util.stream.Collectors.toMap;
|
|
|
|
import static me.zhengjie.modules.constant.FileConstant.SPLIT_FILE_SYMBOL;
|
|
|
|
import static me.zhengjie.modules.constant.FileConstant.SPLIT_FILE_SYMBOL;
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
@ -226,23 +228,20 @@ public class FormdataServiceImpl implements FormdataService {
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public void uploadOOS(MultipartFile file, List<FormdataDto> list) {
|
|
|
|
public void uploadOOS(MultipartFile file, List<FormdataDto> list) {
|
|
|
|
|
|
|
|
|
|
|
|
List<WavDTO> wavList = zipUtil(file);
|
|
|
|
List<WavDTO> wavList = zipUtil(file);
|
|
|
|
for (WavDTO wavDTO : wavList) {
|
|
|
|
Map<String, FormdataDto> map = list.stream().collect(toMap(FormdataDto::getPhone, p -> p));
|
|
|
|
for (FormdataDto info : list) {
|
|
|
|
for (WavDTO wav : wavList) {
|
|
|
|
if (wavDTO.getName().equals(info.getPhone())) {
|
|
|
|
if (map.containsKey(wav.getName())) {
|
|
|
|
//上传路径
|
|
|
|
//上传路径
|
|
|
|
String newFileName = buildPathUtils.buildFileOosPath(wavDTO.getSubFixFile());
|
|
|
|
String newFileName = buildPathUtils.buildFileOosPath(wav.getSubFixFile());
|
|
|
|
OSS ossClient = new OSSClientBuilder().build(endpoint, accessKeyId, accessKeySecret);
|
|
|
|
OSS ossClient = new OSSClientBuilder().build(endpoint, accessKeyId, accessKeySecret);
|
|
|
|
ossClient.putObject(bucketName, newFileName, wavDTO.getLine());
|
|
|
|
ossClient.putObject(bucketName, newFileName, wav.getLine());
|
|
|
|
ossClient.shutdown();
|
|
|
|
ossClient.shutdown();
|
|
|
|
OosDTO oosDTO = toBean(info, newFileName);
|
|
|
|
OosDTO oosDTO = toBean(map.get(wav.getName()), newFileName);
|
|
|
|
//发送下游
|
|
|
|
//发送下游
|
|
|
|
transFormDataTask.doRunTask(oosDTO);
|
|
|
|
transFormDataTask.doRunTask(oosDTO);
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
private List<WavDTO> zipUtil(MultipartFile file) {
|
|
|
|
private List<WavDTO> zipUtil(MultipartFile file) {
|
|
|
|