mcj:修改服务器规则查询

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

@@ -59,7 +59,7 @@ public class EvaluationController {
     }
     @ApiOperation("根据id查询输入")
     @GetMapping(value = "/in/{name}")
-    @AuthAnnotation(code = {"000800"})
+    //@AuthAnnotation(code = {"000800"})
     public ResponseEntity getInName(@PathVariable String name) {
         Evaluation evaluation = evaluationService.findById(name);
         if(evaluation!=null){

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

@@ -159,10 +159,9 @@ public class Inspector {
         report.setFileLine(fileLine);
         log.info("inspect:源代码扫描完成,统计各个文件后缀完成");
         //统计项目语言
-        CompletableFuture<Void> future = runAsync(this::setReportLanguageAndFrame);
+        setReportLanguageAndFrame();
         //根据扫描结果以及用户配置得出需要使用的规则及技术
-        CompletableFuture<Void> future1 = runAsync(() -> ruleTransform(inspectParameter.getRecastMethod()));
-        allOf(future, future1);
+        ruleTransform(inspectParameter.getRecastMethod());
         //扫描配置文件
         forEachFilesMap();
         //将得到的告警信息根据技术id进行转换
@@ -329,10 +328,7 @@ public class Inspector {
 
     private void initData() {
         //查询技术，构造支持与非支持技术对象，3个对象
-        CompletableFuture<Void> future = runAsync(this::findExistTechnology);
         //配置语言 map结构
-        CompletableFuture<Void> future1 = runAsync(this::statisticsLanguage);
-        CompletableFuture<Void> future2 = runAsync(this::initRule);
         codeSize = 0;
         fileLine = 0;
         fileNum = 0;
@@ -346,7 +342,9 @@ public class Inspector {
         //配置 config文件 结构
         statisticsConfigFile();
         initTechnology();
-        CompletableFuture.allOf(future, future1, future2);
+        statisticsLanguage();
+        findExistTechnology();
+        initRule();
     }
 
     private void statisticsConfigFile() {
@@ -379,7 +377,7 @@ public class Inspector {
      */
     private void initRule() {
         //查询所有规则，第一遍扫描文件需要
-        this.ruleList = ruleService.findRules();
+        this.ruleList = ruleService.mcjAllRule();
         //根据后缀名，收集文件进行操作
         for (Rule rule : ruleList) {
             if (!ruleSuffixFilePathMap.containsKey(rule.getSuffix())) {

src/main/java/com/zjty/inspect/service/RuleService.java

@@ -53,4 +53,6 @@ public interface RuleService {
     List<Rule> findAllByTechnologyIdIn(List<String> technologyIds);
 
     void importRules(MultipartFile file);
+
+    List<Rule> mcjAllRule();
 }

src/main/java/com/zjty/inspect/service/impl/RuleServiceImpl.java

@@ -55,7 +55,7 @@ public class RuleServiceImpl implements RuleService {
     @Autowired
     private RuleCollectionDao ruleCollectionDao;
 
-
+    @Override
     public List<Rule> mcjAllRule() {
         List<Rule> rules = ruleDao.findAll();
         List<Rule> ruleList = new ArrayList<>();