hxf 2 éve
szülő
commit
d9a6757813

+ 2 - 1
neim-biz/src/main/java/com/jiayue/biz/controller/ManualEntryController.java

@@ -128,9 +128,10 @@ public class ManualEntryController extends BaseController {
 
     //项目进展解析
     @PostMapping("/projectProgressParse")
-    public void projectProgressParse(@RequestParam("file") MultipartFile multipartFile, @RequestParam("id") String eqId, @RequestParam("name") String name) {
+    public AjaxResult projectProgressParse(@RequestParam("file") MultipartFile multipartFile, @RequestParam("id") String eqId, @RequestParam("name") String name) {
 
         projectProgressService.projectProgressParse(multipartFile, eqId, name);
+        return AjaxResult.success("200");
 
     }
 

+ 0 - 22
neim-biz/src/main/java/com/jiayue/biz/service/impl/ProjectProgressServiceImpl.java

@@ -57,33 +57,19 @@ public class ProjectProgressServiceImpl implements ProjectProgressService {
         }
         multipartFile.transferTo(new File(projectProgressDirFileNew.getPath() + File.separator + multipartFile.getOriginalFilename()));
 
-
     }
 
 
-
-
-
     //项目进展解析
     public void projectProgressParse(MultipartFile multipartFile, String id, String name) {
-
         String fileName = multipartFile.getOriginalFilename();
         File filed = new File(fileName);
-        OutputStream out = null;
         try {
-            //获取文件流,以文件流的方式输出到新文件
-//            InputStream in = multipartFile.getInputStream();
-            out = new FileOutputStream(filed);
-            byte[] ss = multipartFile.getBytes();
-            for (int i = 0; i < ss.length; i++) {
-                out.write(ss[i]);
-            }
             ExcelReader reader = ExcelUtil.getReader(filed);
             List<List<Object>> read = reader.read();
             //解析文件入库
             saveProjectProgress(read,id);
 
-
             File projectProgressDirFileNew = new File(projectProgressDir + name + File.separator + projectProgressBackNew);
             if (!projectProgressDirFileNew.exists()) {
                 projectProgressDirFileNew.mkdirs();
@@ -101,14 +87,6 @@ public class ProjectProgressServiceImpl implements ProjectProgressService {
 
         } catch (IOException e) {
             e.printStackTrace();
-        } finally {
-            if (out != null) {
-                try {
-                    out.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
         }