|
|
@@ -164,6 +164,7 @@ public class FileController {
|
|
|
public String upload(@RequestParam("file") final MultipartFile file) {
|
|
|
APIResult<Converter> result = new APIResult<>();
|
|
|
try {
|
|
|
+ Converter converter = new Converter();
|
|
|
String userId = ContextUtil.getCurrentUserId();
|
|
|
if(StringUtils.isEmpty(userId)){
|
|
|
return buildErrorResult("userId is empty");
|
|
|
@@ -174,6 +175,9 @@ public class FileController {
|
|
|
long fileSize = file.getSize(); // get file size
|
|
|
byte[] bytes = file.getBytes(); // get file in bytes
|
|
|
|
|
|
+ converter.setFileExtension(fileExtension);
|
|
|
+ converter.setFileName(fullFileName);
|
|
|
+ converter.setFileSize(fileSize);
|
|
|
// check if the file size exceeds the maximum file size or is less than 0
|
|
|
if (fileUtility.getMaxFileSize() < fileSize || fileSize <= 0) {
|
|
|
return buildErrorResult("File size is incorrect"); // if so, write an error message to the response
|
|
|
@@ -197,9 +201,9 @@ public class FileController {
|
|
|
// fullFileName = fileUtility.getFileNameWithoutExtension(fileNamePath)
|
|
|
// + "." + fileExtension; // get full file name
|
|
|
createUserMetadata(userService.getUser(), fullFileName);
|
|
|
- Converter converter = new Converter();
|
|
|
- converter.setFileExtension(fileExtension);
|
|
|
- converter.setFileName(fullFileName);
|
|
|
+
|
|
|
+
|
|
|
+ converter.setFilePath(fullFileName);
|
|
|
result.setData(converter);// create user metadata and return it
|
|
|
return objectMapper.writeValueAsString(result);
|
|
|
} catch (Exception e) {
|