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

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

@@ -41,6 +41,7 @@ public class RuleController {
     @ApiOperation("新增规则")
     @AuthAnnotation(code = {"1200","1400"})
     public ResponseEntity rule(@RequestBody Rule rule){
+        log.info("规则{}",rule);
         Rule rule1 = ruleService.addRulePlus(rule);
         if(rule1!=null){
             return ResponseEntity.ok(rule1);

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

@@ -3,6 +3,7 @@ package com.zjty.inspect.entity;
 import lombok.Data;
 
 import java.util.List;
+
 @Data
 public class DevelopLanguageSystem {
     //原应用主要开发架构

src/main/java/com/zjty/inspect/enums/OperateSystem.java

 package com.zjty.inspect.enums;
 
-import sun.plugin2.os.windows.Windows;
 
 /**
  * <h4>Description : 操作系统</h4>

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

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

@@ -143,6 +143,24 @@ public class ExcelUtil {
             reform.setMode(2);
         } else {
             reform.setMode(1);
+        }
+        DevelopLanguageSystem developLanguageSystem = new DevelopLanguageSystem();
+        List<DevFramework> devFrameworks = new ArrayList<>();
+        for (int i = 17; i < 20; i++) {
+            String framework = getExcelCell(i, 2, sheetAt);
+            String version = getExcelCell(i, 3, sheetAt);
+            String remark = getExcelCell(i, 4, sheetAt);
+            DevFramework devFramework = new DevFramework();
+            devFramework.setFrameWork(FrameWorkEnum.valueOf(framework));
+            devFramework.setVersion(version);
+            devFramework.setDes(remark);
+            devFrameworks.add(devFramework);
+        }
+        developLanguageSystem.setDevFrameworks(devFrameworks);
+
+        for (int i = 20; i < 25; i++) {
+
+
         }
         /**
          * 中间件/API

src/main/resources/application.properties

@@ -4,7 +4,7 @@
 #spring.profiles.active=prod
 # \u670D\u52A1\u5668\u76F8\u5173\u914D\u7F6E
 
-server.port=8078
+server.port=8079
 spring.jpa.database-platform=org.hibernate.dialect.MySQL5InnoDBDialect
 # \u65E5\u5FD7\u6587\u4EF6\u76F8\u5173\u914D\u7F6E
 # logging.level.org.hibernate.sql=debug