czq

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

@@ -209,7 +209,7 @@ public class InspectController {
         //评估时间
         assessmentReport.setTime(inspect.getCreateDate());
         //适配预算
-        assessmentReport.setBudget(inspect.getBudgets().getBudget().get(0).getFund());
+//        assessmentReport.setBudget(inspect.getBudgets().getBudget().get(0).getFund());
         //原系统规模，马晨俊没放进去
         //技术详情，马晨俊的警告点,同时统计技术的数量
         //样式调整
@@ -220,6 +220,8 @@ public class InspectController {
         int plugIn = 0;
         //jni数量
         int jni = 0;
+        //中间件依赖数量
+        int dependOnNum = 0;
         HashMap<String, List<Warn>> warnDetails = inspect.getWarnDetails();
         Set<String> keySet = warnDetails.keySet();
         List<TechnologyReport> technologyReports = new ArrayList<>();
@@ -236,6 +238,10 @@ 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;
+                    }
                     technologyContents.add(technologyContent);
                 }
                 if(Objects.equals(key, "Microsoft CSS extensions(不支持)")){
@@ -294,27 +300,27 @@ public class InspectController {
             dependencies.addAll(projectPom.getDependencies());
         }
 
-        HashMap<String,Integer> num = new HashMap<>();
-        for (PomDependency pomDependency:dependencies) {
-            String groupId = pomDependency.getGroupId();
-            Integer integer = num.get(groupId);
-            if(integer == null){
-                num.put(groupId,1);
-            }else{
-                integer = integer+1;
-                num.put(groupId,integer);
-            }
-        }
-        System.out.println("所有依赖："+JSON.toJSONString(num));
-        Set<String> strings = num.keySet();
-        List<DependOnNum> dependOnNums = new ArrayList<>();
-        for (String s:strings) {
-            DependOnNum dependOnNum = new DependOnNum();
-            dependOnNum.setName(s);
-            dependOnNum.setNum(num.get(s));
-            dependOnNums.add(dependOnNum);
-        }
-        middlewareDifficulty.setDependOnNum(dependOnNums);
+//        HashMap<String,Integer> num = new HashMap<>();
+//        for (PomDependency pomDependency:dependencies) {
+//            String groupId = pomDependency.getGroupId();
+//            Integer integer = num.get(groupId);
+//            if(integer == null){
+//                num.put(groupId,1);
+//            }else{
+//                integer = integer+1;
+//                num.put(groupId,integer);
+//            }
+//        }
+//        System.out.println("所有依赖："+JSON.toJSONString(num));
+//        Set<String> strings = num.keySet();
+//        List<DependOnNum> dependOnNums = new ArrayList<>();
+//        for (String s:strings) {
+//            DependOnNum dependOnNum = new DependOnNum();
+//            dependOnNum.setName(s);
+//            dependOnNum.setNum(num.get(s));
+//            dependOnNums.add(dependOnNum);
+//        }
+        middlewareDifficulty.setDependOnNum(dependOnNum);
         Middleware middleware = reform.getMiddleware();
         middlewareDifficulty.setWeb(middleware.getWeb());
         middlewareDifficulty.setJms(middleware.getJms());
@@ -334,8 +340,8 @@ public class InspectController {
         //本地程序难度
         ProgramDifficulty programDifficulty = new ProgramDifficulty();
         List<DependOnNum> dependOns = new ArrayList<>();
-        DependOnNum dependOnNum = new DependOnNum("jni",jni);
-        dependOns.add(dependOnNum);
+        DependOnNum dependOnNum2 = new DependOnNum("jni",jni);
+        dependOns.add(dependOnNum2);
         programDifficulty.setDependOnNum(dependOns);
         difficultyAssessment.setProgramDifficulty(programDifficulty);
         System.out.println("programDifficulty+:"+JSON.toJSONString(programDifficulty));

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

@@ -40,7 +40,7 @@ public class MiddlewareDifficulty {
     /**
      * 依赖详情
      */
-    private List<DependOnNum> dependOnNum = new ArrayList<>();
+    private Integer dependOnNum;
 
     /*
      *用户额外信息详情