Commit e64f7125 authored by neo's avatar neo

[DEV] return upload result

parent 7093cc1d
...@@ -12,6 +12,7 @@ import org.springframework.web.multipart.MultipartHttpServletRequest; ...@@ -12,6 +12,7 @@ import org.springframework.web.multipart.MultipartHttpServletRequest;
import pwc.taxtech.atms.constant.enums.EnumModule; import pwc.taxtech.atms.constant.enums.EnumModule;
import java.io.File; import java.io.File;
import java.net.URI;
import java.util.Calendar; import java.util.Calendar;
import java.util.Date; import java.util.Date;
import java.util.UUID; import java.util.UUID;
...@@ -48,10 +49,10 @@ public class FileUploadAdapter { ...@@ -48,10 +49,10 @@ public class FileUploadAdapter {
public ResponseEntity upload(MultipartHttpServletRequest request, EnumModule trailBalance, UUID userIdForUpload) { public ResponseEntity upload(MultipartHttpServletRequest request, EnumModule trailBalance, UUID userIdForUpload) {
if (request.getFileMap().size() <= 0) return ResponseEntity.badRequest().body("NoFile"); if (request.getFileMap().size() <= 0) return ResponseEntity.badRequest().body("NoFile");
FileParamBean paramBean = getQueryStringParameters(request); FileParamBean paramBean = getQueryStringParameters(request);
if (!paramBean.result) return ResponseEntity.badRequest().body("ParametersInvalid"); if (!paramBean.result) return ResponseEntity.badRequest().body("ParametersInvalid");
if (paramBean.totalSize > Long.valueOf(maxFileSize)) return ResponseEntity.badRequest().body("InvalidFileSize"); if (paramBean.totalSize > Long.valueOf(maxFileSize))
return ResponseEntity.badRequest().body("InvalidFileSize");
String baseFolder = prepareFolder(); String baseFolder = prepareFolder();
if (!Utils.isEmpty(baseFolder)) return ResponseEntity.badRequest().body("PrepareFolderError"); if (!Utils.isEmpty(baseFolder)) return ResponseEntity.badRequest().body("PrepareFolderError");
...@@ -68,23 +69,23 @@ public class FileUploadAdapter { ...@@ -68,23 +69,23 @@ public class FileUploadAdapter {
if (completeFile.exists()) completeFile.delete(); if (completeFile.exists()) completeFile.delete();
} }
if(paramBean.isLastChunk){ if (paramBean.isLastChunk) {
LOGGER.debug("Last chunk arrived"); LOGGER.debug("Last chunk arrived");
File completeFile = new File(completePath); File completeFile = new File(completePath);
File tempFile = new File(tempPath); File tempFile = new File(tempPath);
tempFile.renameTo(completeFile); tempFile.renameTo(completeFile);
LOGGER.info("{} upload to temp folder sucess",paramBean.fileName); LOGGER.info("{} upload to temp folder sucess", paramBean.fileName);
} }
}else { } else {
File tempFile = new File(tempPath); File tempFile = new File(tempPath);
File completeFile = new File(completePath); File completeFile = new File(completePath);
if (tempFile.exists()) tempFile.delete(); if (tempFile.exists()) tempFile.delete();
if (completeFile.exists()) completeFile.delete(); if (completeFile.exists()) completeFile.delete();
} }
return ResponseEntity.created(URI.create("")).body(paramBean.tempFileName);
return null;
} }
private FileParamBean getQueryStringParameters(MultipartHttpServletRequest request) { private FileParamBean getQueryStringParameters(MultipartHttpServletRequest request) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment