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

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

@@ -265,7 +265,7 @@ public class InspectController {
         //jni数量
         int jni = 0;
         //中间件依赖数量
-       // int dependOnNum = 0;
+        int number = 0;
         HashMap<String, List<Warn>> warnDetails = inspect.getWarnDetails();
         Set<String> keySet = warnDetails.keySet();
         List<TechnologyReport> technologyReports = new ArrayList<>();
@@ -282,10 +282,11 @@ public class InspectController {
                     technologyContent.setFile(warn.getFilePath());
                     technologyContent.setKeyWord(warn.getRule());
                     technologyContent.setPosition(warn.getLineNum().toString());
-//                    String categoryId = warn.getCategoryId();
-//                    if(!Objects.equals(categoryId, "0") &&categoryId!=null&& Objects.equals(categoryId, "1")){
-//                        dependOnNum += 1;
-//                    }
+                    String categoryId = warn.getCategoryId();
+                    if(!Objects.equals(categoryId, "0") &&categoryId!=null&& Objects.equals(categoryId, "1")
+                            && (key.contains("不支持") || key.contains("未知"))){
+                        number += 1;
+                    }
                     technologyContents.add(technologyContent);
                 }
                 if(Objects.equals(key, "Microsoft CSS extensions(不支持)")){
@@ -338,11 +339,11 @@ public class InspectController {
         //中间件难度
         MiddlewareDifficulty middlewareDifficulty = new MiddlewareDifficulty();
         //所有的依赖
-        List<PomDependency> dependencies = new ArrayList<>();
-        List<ProjectPom> depTreeList = inspect.getDependencyVo().getDepTreeList();
-        for (ProjectPom projectPom : depTreeList) {
-            dependencies.addAll(projectPom.getDependencies());
-        }
+//        List<PomDependency> dependencies = new ArrayList<>();
+//        List<ProjectPom> depTreeList = inspect.getDependencyVo().getDepTreeList();
+//        for (ProjectPom projectPom : depTreeList) {
+//            dependencies.addAll(projectPom.getDependencies());
+//        }
 
 //        HashMap<String,Integer> num = new HashMap<>();
 //        for (PomDependency pomDependency:dependencies) {
@@ -364,6 +365,7 @@ public class InspectController {
 //            dependOnNum.setNum(num.get(s));
 //            dependOnNums.add(dependOnNum);
 //        }
+        middlewareDifficulty.setNumber(number);
         middlewareDifficulty.setDependOnNum(inspect.getSupportSize());
         Middleware middleware = reform.getMiddleware();
         middlewareDifficulty.setWeb(middleware.getWeb());

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

@@ -38,10 +38,14 @@ public class MiddlewareDifficulty {
     private double load;
 
     /**
-     * 依赖详情
+     * 依赖详情(国产化支持的，王永磊要用)
      */
     private Integer dependOnNum;
 
+    /**
+     * 依赖数量
+     */
+    private Integer number;
     /*
      *用户额外信息详情
      */

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()== 2)?1.1:1;
+        double pFramework = (frameDifficulty.getDetails()== 2)?1.1:1;//2020/3/9改动：1是分离，2是混合
         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 即用户额外信息
@@ -307,7 +307,7 @@ public class WorkLoadUtil {
 //        for(DependOnNum dependOnNum:middlewareDifficulty.getDependOnNum()){
 //            pMiddle*=(1.0+0.001*dependOnNum.getNum());
 //        }
-        pMiddle*=(1.0+0.001*middlewareDifficulty.getDependOnNum());
+        pMiddle*=(1.0+0.001*middlewareDifficulty.getNumber());//getDependOnNum());
         pMiddle = pMiddle>1.3?1.3:pMiddle;
         logger.info("中间件难度-评估："+pMiddle);
         middlewareDifficulty.setSystemEvaluation(Double.valueOf(nf.format(pMiddle)));