mcj:更新

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

@@ -152,7 +152,7 @@ public class Inspector {
         //统计项目语言
         setReportLanguageAndFrame();
         //根据扫描结果以及用户配置得出需要使用的规则及技术
-        ruleTransform(report.getRecastMethod());
+        ruleTransform(inspectParameter.getRecastMethod());
         //解析配置文件集合
         for (Map.Entry<String, List<Path>> entry : configFileTypePathsMapping.entrySet()) {
             switch (entry.getKey()) {
@@ -228,6 +228,7 @@ public class Inspector {
         HashMap<String, List<Warn>> warnMap = getWarnMap();
         ruleDao.saveAll(rules);
         report.setWarnDetails(warnMap);
+        report.setSupportSize(supportWarns.size());
         log.info("评估报告关键技术,{}", warnMap);
         return report;
     }
@@ -268,18 +269,12 @@ public class Inspector {
      */
     private void ruleTransform(Integer status) {
         if (status == 1) {
-            List<Technology> front = technologyDao.findAllByBackorfrontEquals(1);
-            List<String> ids = front.stream().map(Technology::getId).collect(Collectors.toList());
-            this.ruleList = ruleDao.findAllByTechnologyIdIn(ids);
-        } else {
-            if (inspectParameter.getRecastMethod() == 1) {
             this.ruleList = ruleDao.findAll();
         } else {
             List<Technology> front = technologyDao.findAllByBackorfrontEquals(1);
             List<String> ids = front.stream().map(Technology::getId).collect(Collectors.toList());
             this.ruleList = ruleDao.findAllByTechnologyIdIn(ids);
         }
-        }
         Set<String> id = ruleList.stream().map(Rule::getTechnologyId).collect(Collectors.toSet());
         List<Technology> technologies = technologyDao.findAllByIdIn(new ArrayList<>(id));
         for (Technology technology : technologies) {
@@ -492,9 +487,6 @@ public class Inspector {
                     if (supportWarns.size() != 10) {
                         supportWarns.add(warn);
                     }
-                    Integer size = report.getSupportSize();
-                    Integer integer = size + 1;
-                    report.setSupportSize(integer);
                     supportStatus = 1;
                 }
             }