|
@@ -6,6 +6,7 @@ import lombok.RequiredArgsConstructor;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import org.apache.commons.fileupload.FileItem;
|
|
import org.apache.commons.fileupload.FileItem;
|
|
import org.apache.commons.fileupload.disk.DiskFileItemFactory;
|
|
import org.apache.commons.fileupload.disk.DiskFileItemFactory;
|
|
|
|
+import org.apache.commons.io.FileSystem;
|
|
import org.apache.commons.io.FileUtils;
|
|
import org.apache.commons.io.FileUtils;
|
|
import org.apache.commons.io.IOUtils;
|
|
import org.apache.commons.io.IOUtils;
|
|
import org.apache.http.entity.ContentType;
|
|
import org.apache.http.entity.ContentType;
|
|
@@ -35,13 +36,21 @@ public class DataRecalculationController {
|
|
@Autowired
|
|
@Autowired
|
|
DataRecalculationService dataRecalculationService;
|
|
DataRecalculationService dataRecalculationService;
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
+ * 修改为异步处理文件,避免文件过大前台长时间不响应
|
|
|
|
+ * @param file
|
|
|
|
+ * @param equipmentNo
|
|
|
|
+ * @param recorderNo
|
|
|
|
+ * @return
|
|
|
|
+ */
|
|
@PostMapping("/uploadFileAnalysis")
|
|
@PostMapping("/uploadFileAnalysis")
|
|
public AjaxResult uploadFileAnalysis(@RequestParam("file") MultipartFile file, @RequestParam("equipmentNo") String equipmentNo, @RequestParam("recorderNo") String recorderNo) {
|
|
public AjaxResult uploadFileAnalysis(@RequestParam("file") MultipartFile file, @RequestParam("equipmentNo") String equipmentNo, @RequestParam("recorderNo") String recorderNo) {
|
|
MultipartFile file1 = null;
|
|
MultipartFile file1 = null;
|
|
|
|
|
|
try {
|
|
try {
|
|
- FileUtils.copyInputStreamToFile(file.getInputStream(), new File("../"+file.getOriginalFilename()));
|
|
|
|
- file1 = getMultipartFile( new File("../"+file.getOriginalFilename()));
|
|
|
|
|
|
+ String uploadfilePath = "."+ File.separator +"uploadfile"+ File.separator +file.getOriginalFilename();
|
|
|
|
+ FileUtils.copyInputStreamToFile(file.getInputStream(), new File(uploadfilePath));
|
|
|
|
+ file1 = getMultipartFile( new File(uploadfilePath));
|
|
} catch (IOException e) {
|
|
} catch (IOException e) {
|
|
throw new RuntimeException(e);
|
|
throw new RuntimeException(e);
|
|
}
|
|
}
|