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

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

@@ -59,8 +59,8 @@ public class ReportVo {
 
     /**
      * 适配方式
-     * 1：修改
-     * 2：适配
+     * 1：重构
+     * 2：修改
      */
     private Integer recastMethod;
 

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

@@ -316,9 +316,7 @@ public class Inspector {
     public ReportVo analysis() {
         DependencyVo dependencyVo = new DependencyVo();
         setReportLanguageAndFrame();
-        if(report.getLanguage()!=1 & report.getRecastMethod()==1){
-            return report;
-        }
+
         //查询所有规则
         ruleTransform(report.getRecastMethod());
         //解析配置文件集合
@@ -343,20 +341,24 @@ public class Inspector {
                     }
                     break;
                 case "gradle":
-                    for (Path path : entry.getValue()) {
-                        if (path.getFileName().endsWith("build.gradle")) {
-                            ProjectPom projectPom = new ProjectPom();
-                            report.setManager(DependenceManagement.GRADLE.getStatus());
-                            List<PomDependency> pomDependencies = AnalysisFile.analysisGradle(path);
-                            projectPom.setDependencies(pomDependencies);
-                            //设置依赖
-                            StringBuilder stringBuilder = new StringBuilder();
-                            for (PomDependency dependency : pomDependencies) {
-                                setRule(path, stringBuilder, dependency);
-                            }
-                            dependencyVo.add(projectPom);
-                        }
-                    }
+//                    for (Path path : entry.getValue()) {
+//                        if (path.getFileName().endsWith("build.gradle")) {
+//                            try {
+//                                ProjectPom projectPom = new ProjectPom();
+//                                report.setManager(DependenceManagement.GRADLE.getStatus());
+//                                List<PomDependency> pomDependencies = AnalysisFile.analysisGradle(path);
+//                                projectPom.setDependencies(pomDependencies);
+//                                //设置依赖
+//                                StringBuilder stringBuilder = new StringBuilder();
+//                                for (PomDependency dependency : pomDependencies) {
+//                                    setRule(path, stringBuilder, dependency);
+//                                }
+//                                dependencyVo.add(projectPom);
+//                            }catch (Exception e){
+//                                e.printStackTrace();
+//                            }
+//                        }
+//                    }
                     break;
                 default:
             }

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

@@ -55,7 +55,7 @@ public class BudgetUitl {
         }
         if(systemFund<=30){
             scale=1;
-        }else if(systemFund<=200){
+        }else if(systemFund<=2000){
             scale=2;
         }else{
             scale=3;

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

@@ -258,7 +258,7 @@ public class WorkLoadUtil {
         */
         FrameDifficulty frameDifficulty = report.getDifficultyAssessment().getFrameDifficulty();
         //系统部署架构难度P（混合：1.1  前后分离：1）即系统评估
-        double pFramework = (frameDifficulty.getDetails()== 1)?1.1:1;
+        double pFramework = (frameDifficulty.getDetails()== 2)?1.1:1;
         logger.info("系统部署架构难度-评估："+pFramework);
         frameDifficulty.setSystemEvaluation(Double.valueOf(nf.format(pFramework)));
         //系统部署架构难度e（分布式 0.2 负载均衡 0.1 容灾0.1 其他0.1） e = 1.2*1.1*1.1*1.1 即用户额外信息