Merge branch 'master' of git.yfzx.zjtys.com.cn:912-system/monitor/inspect into lj-project

src/main/java/com/zjty/inspect/utils/ExcelUtil.java

@@ -17,6 +17,7 @@ import org.springframework.web.multipart.MultipartFile;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -33,9 +34,8 @@ public class ExcelUtil {
 
     public static Reform parseExcel(MultipartFile f1) {
         try {
-            File f = new File("/Users/mcj/文章/工作文档/调研表.xlsx");
-            FileInputStream fileInputStream = new FileInputStream(f);
-            String[] split = Objects.requireNonNull(f.getName()).split("\\.");
+            InputStream fileInputStream = f1.getInputStream();
+            String[] split = Objects.requireNonNull(f1.getOriginalFilename()).split("\\.");
             if (xlsx.equals(split[1])) {
                 XSSFWorkbook xwb = new XSSFWorkbook(fileInputStream);
                 //3、得到Excel工作表对象