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

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

@@ -27,6 +27,8 @@ public interface RuleDao extends JpaRepository<Rule,String>,JpaSpecificationExec
 
     Rule findByTarget(String target);
 
+    Rule findByTargetAndSuffixEquals(String target,String suffix);
+
     /**
      * 根据技术id查询规则
      * @param ids 技术id

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

@@ -2,6 +2,8 @@ package com.zjty.inspect.entity;
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * 规则
  * @author Mcj
@@ -21,7 +23,7 @@ public class RuleQo {
     /**
      * 匹配的文件后缀
      */
-    private String suffix;
+    private List<String> suffix;
 
     /**
      * 适配技术id

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

@@ -43,6 +43,7 @@ public class RuleServiceImpl implements RuleService {
     @Autowired
     private TechnologyService technologyService;
 
+    @Override
     public void test(){
         List<Rule> rules = ruleDao.findAll();
         for (Rule rule : rules) {
@@ -58,18 +59,20 @@ public class RuleServiceImpl implements RuleService {
      */
     @Override
     public void addRule(RuleQo ruleQo) {
-        Rule rule1 = ruleDao.findByTarget(ruleQo.getTarget());
-        if(rule1!=null){
-            return;
+
+        for (String suffix : ruleQo.getSuffix()) {
+            Rule rule1 = ruleDao.findByTargetAndSuffixEquals(ruleQo.getTarget(),suffix);
+            if(rule1!=null){
+                return;
+            }
+            Rule rule = new Rule();
+            rule.setTarget(ruleQo.getTarget());
+            rule.setSuffix(suffix);
+            rule.setTechnologyId(ruleQo.getTechnologyId());
+            rule.setTechnologyName(ruleQo.getTechnologyName());
+            rule.setId(UUIDUtil.getUUID());
+            ruleDao.save(rule);
         }
-        // TODO: 2020-02-27 适配技术与扫描关键字关联
-        Rule rule = new Rule();
-        rule.setTarget(ruleQo.getTarget());
-        rule.setSuffix(ruleQo.getSuffix());
-        rule.setTechnologyId(ruleQo.getTechnologyId());
-        rule.setTechnologyName(ruleQo.getTechnologyName());
-        rule.setId(UUIDUtil.getUUID());
-        ruleDao.save(rule);
     }
 
     /**
@@ -112,17 +115,19 @@ public class RuleServiceImpl implements RuleService {
 
     @Override
     public void upRule(RuleQo ruleQo) {
-        Rule rule1 = ruleDao.findByTarget(ruleQo.getTarget());
-        if(rule1!=null){
-            return;
+        for (String suffix : ruleQo.getSuffix()) {
+            Rule rule1 = ruleDao.findByTarget(ruleQo.getTarget());
+            if(rule1!=null){
+                return;
+            }
+            Rule rule = new Rule();
+            rule.setTarget(ruleQo.getTarget());
+            rule.setSuffix(suffix);
+            rule.setTechnologyId(ruleQo.getTechnologyId());
+            rule.setTechnologyName(ruleQo.getTechnologyName());
+            rule.setId(ruleQo.getId());
+            ruleDao.save(rule);
         }
-        Rule rule = new Rule();
-        rule.setTarget(ruleQo.getTarget());
-        rule.setSuffix(ruleQo.getSuffix());
-        rule.setTechnologyId(ruleQo.getTechnologyId());
-        rule.setTechnologyName(ruleQo.getTechnologyName());
-        rule.setId(ruleQo.getId());
-        ruleDao.save(rule);
     }
 
     @Override