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

pom.xml

@@ -105,7 +105,22 @@
             <artifactId>zip4j</artifactId>
             <version>1.3.2</version>
         </dependency>
+        <dependency>
+            <groupId>cn.afterturn</groupId>
+            <artifactId>easypoi-base</artifactId>
+            <version>3.2.0</version>
+        </dependency>
 
+        <dependency>
+            <groupId>cn.afterturn</groupId>
+            <artifactId>easypoi-web</artifactId>
+            <version>3.2.0</version>
+        </dependency>
+        <dependency>
+            <groupId>cn.afterturn</groupId>
+            <artifactId>easypoi-annotation</artifactId>
+            <version>3.2.0</version>
+        </dependency>
         <!--解压rar压缩-->
         <dependency>
             <groupId>com.github.junrar</groupId>

src/main/java/com/zjty/inspect/controller/InspectController.java

@@ -401,4 +401,10 @@ public class InspectController {
             return ResponseEntity.status(400).build();
         }
     }
+    @PostMapping("/importExcelToRapidAssessment")
+    private ResponseEntity uploadFileToInspect(MultipartFile file) throws IOException {
+        Reform reform = ExcelUtil.parseExcel(file);
+        ResponseEntity responseEntity = this.rapidAssessment(reform);
+        return responseEntity;
+    }
 }

src/main/java/com/zjty/inspect/entity/Reform.java

@@ -177,4 +177,5 @@ public class Reform {
      */
     private Apply apply = new Apply();
 
+    private String unitName;
 }

src/main/java/com/zjty/inspect/inspect/Inspector.java

@@ -599,8 +599,12 @@ public class Inspector {
                             dependencyVo.add(projectPom);
                         }
                         fileNum += 1;
-                        List<String> allLines = Files.readAllLines(file);
-                        fileLine += allLines.size();
+                        try {
+                            List<String> allLines = Files.readAllLines(file);
+                            fileLine += allLines.size();
+                        }catch (IOException e){
+                            log.error("当前文件无法读取:{}",e.getMessage());
+                        }
 
                         for (Map.Entry<String, PathMatcher> entry : languageSuffixMatcherMapping.entrySet()) {
                             //通过正则表达式匹配.java类型后缀文件，并+1