|
|
|
@ -34,7 +34,6 @@ public class FileService {
|
|
|
|
|
FileData fileData = new FileData();
|
|
|
|
|
fileData.setData(getTmpFile(tmpFileName));
|
|
|
|
|
fileData.setSize(getTmpFileSize(tmpFileName));
|
|
|
|
|
fileData.setName(getTmpFileName(tmpFileName));
|
|
|
|
|
fileData.setCreateDate(new Date());
|
|
|
|
|
return fileRepository.save(fileData);
|
|
|
|
|
}
|
|
|
|
@ -99,16 +98,18 @@ public class FileService {
|
|
|
|
|
|
|
|
|
|
@Transactional
|
|
|
|
|
public FileData create(FileDataDto fileDataDto) {
|
|
|
|
|
FileData newFile = copyFromDto(new FileData(), fileDataDto);
|
|
|
|
|
FileData newFile = new FileData();
|
|
|
|
|
try {
|
|
|
|
|
newFile = createFileFromTmp(fileDataDto.getTmpFileName());
|
|
|
|
|
} catch (IOException e) {
|
|
|
|
|
}
|
|
|
|
|
copyFromDto(newFile, fileDataDto);
|
|
|
|
|
newFile = fileRepository.save(newFile);
|
|
|
|
|
return newFile;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private FileData copyFromDto(FileData fileData, FileDataDto fileDataDto) {
|
|
|
|
|
fileData.setCreateDate(fileDataDto.getCreateDate());
|
|
|
|
|
fileData.setData(fileDataDto.getData());
|
|
|
|
|
fileData.setName(fileDataDto.getName());
|
|
|
|
|
fileData.setSize(fileDataDto.getSize());
|
|
|
|
|
return fileData;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|