mcj:更新规则的修改

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

@@ -43,13 +43,11 @@ public class RuleController {
     /**
      * 修改规则
      * @param ruleQo 规则封装
-     * @param id id
      * @return
      */
-    @PostMapping(value = "/{id}")
+    @PostMapping(value = "/update")
     @ApiOperation("修改规则")
-    public ResponseEntity update(@RequestBody RuleQo ruleQo,@PathVariable String id){
-        ruleQo.setId(id);
+    public ResponseEntity update(@RequestBody RuleQo ruleQo){
         ruleService.upRule(ruleQo);
         return ResponseEntity.ok(200);
     }

src/main/java/com/zjty/inspect/dao/RuleDao.java

@@ -36,4 +36,6 @@ public interface RuleDao extends JpaRepository<Rule,String>,JpaSpecificationExec
      * @return
      */
     List<Rule> findAllByTechnologyIdIn(List<String> ids);
+
+    List<Rule> findAllByTechnologyIdEqualsAndTargetEquals(String techId,String target);
 }

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

@@ -199,9 +199,7 @@ public class Inspector {
             Files.walkFileTree(Paths.get(inspectParameter.getSourceAddress()), new FileVisitor<Path>() {
                 @Override
                 public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException {
-                    //这里是对于路径（文件夹）的过滤，在这里读不到文件如果能判断，可以返回FileVisitResult.SKIP_SUBTREE 不访问子目录
-                    //if(dir.getFileName().startsWith("."))return FileVisitResult.SKIP_SUBTREE;
-                    //if (dir.endsWith(".git"))return FileVisitResult.SKIP_SUBTREE;
+
                     return FileVisitResult.CONTINUE;
                 }
 
@@ -274,7 +272,6 @@ public class Inspector {
                             ruleSuffixFilePathMap.get(entry.getValue()).add(file);
                         }
                     }
-                    //检查到普通jar包
                     return FileVisitResult.CONTINUE;
                 }
 
@@ -316,7 +313,6 @@ public class Inspector {
     public ReportVo analysis() {
         DependencyVo dependencyVo = new DependencyVo();
         setReportLanguageAndFrame();
-
         //查询所有规则
         ruleTransform(report.getRecastMethod());
         //解析配置文件集合
@@ -375,9 +371,6 @@ public class Inspector {
                     if (path1.toAbsolutePath().toString().endsWith("jar") || path1.toAbsolutePath().toString().endsWith("class")) {
                         continue;
                     }
-                    if(path1.getFileName().toString().equals("js")){
-                        System.out.println("d");
-                    }
                     valiWarn(rules, path1, path1.getFileName().toString(), 0);
                     //将文件的每一行都与规则匹配
                     List<String> strings = Files.readAllLines(path1);

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

@@ -23,6 +23,7 @@ import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 规则库
@@ -130,18 +131,11 @@ public class RuleServiceImpl implements RuleService {
 
     @Override
     public void upRule(RuleQo ruleQo) {
-        List<String> suffixes = ruleQo.getSuffix();
-        for (String suffix : suffixes) {
-            Rule rule1 = ruleDao.findByTargetAndSuffixEqualsAndTechnologyIdEquals(ruleQo.getTarget(), suffix,ruleQo.getTechnologyId());
-            if (rule1 != null) {
-                return;
-            }
-            rule1.setTarget(ruleQo.getTarget());
-            rule1.setSuffix(suffix);
-            rule1.setTechnologyId(ruleQo.getTechnologyId());
-            rule1.setTechnologyName(ruleQo.getTechnologyName());
-            ruleDao.save(rule1);
+        List<Rule> rules = ruleDao.findAllByTechnologyIdEqualsAndTargetEquals(ruleQo.getTechnologyId(), ruleQo.getTarget());
+        for (Rule rule : rules) {
+            ruleDao.deleteById(rule.getId());
         }
+        addRule(ruleQo);
     }
 
     @Override