|
@@ -121,40 +121,6 @@ public class PrivateStandardServiceImpl extends ServiceImpl<PrivateStandardMappe
|
|
List<PrivateStandard> privateStandards1 = new ArrayList<>();
|
|
List<PrivateStandard> privateStandards1 = new ArrayList<>();
|
|
|
|
|
|
for (PrivateStandardDTO privateStandard : privateStandards) {
|
|
for (PrivateStandardDTO privateStandard : privateStandards) {
|
|
- List<StandardFile> standardFiles = new ArrayList<>();
|
|
|
|
- MultipartFile[] files = privateStandard.getFiles();
|
|
|
|
-
|
|
|
|
- try {
|
|
|
|
- for (MultipartFile file : files) {
|
|
|
|
- StandardFile standardFile = new StandardFile();
|
|
|
|
- standardFile.setId(SnowFlakeUtil.getId());
|
|
|
|
- standardFile.setStandardId(privateStandard.getId());
|
|
|
|
- standardFile.setCreateUser(user.getUserId());
|
|
|
|
-
|
|
|
|
-
|
|
|
|
- String originalFilename = file.getOriginalFilename();
|
|
|
|
- standardFile.setFileName(originalFilename);
|
|
|
|
- originalFilename = "standard/" + privateStandard.getId() + "|" + originalFilename;
|
|
|
|
-
|
|
|
|
- //Oss上传 传特殊文件名 在oss中做特殊路径处理
|
|
|
|
- BladeFile bladeFile = this.newIOSSClient.uploadFileByInputStream2(originalFilename, file.getInputStream());
|
|
|
|
-
|
|
|
|
- standardFile.setStandardFileUrl(bladeFile.getLink());
|
|
|
|
- standardFiles.add(standardFile);
|
|
|
|
- }
|
|
|
|
- } catch (Exception e) {
|
|
|
|
- //删除之前上传的文件
|
|
|
|
- for (StandardFile standardFile : standardFiles) {
|
|
|
|
- String pdfName = standardFile.getStandardFileUrl().split("upload")[1];
|
|
|
|
- this.newIOSSClient.removeFile("upload" + pdfName);
|
|
|
|
- }
|
|
|
|
- e.printStackTrace();
|
|
|
|
- throw new ServiceException("文件上传失败!请检查Oss");
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- standardFileService.saveBatch(standardFiles);
|
|
|
|
-
|
|
|
|
-
|
|
|
|
PrivateStandard privateStandard1 = BeanUtil.copyProperties(privateStandard, PrivateStandard.class);
|
|
PrivateStandard privateStandard1 = BeanUtil.copyProperties(privateStandard, PrivateStandard.class);
|
|
privateStandards1.add(privateStandard1);
|
|
privateStandards1.add(privateStandard1);
|
|
}
|
|
}
|