mcj:修复规则添加bug

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

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

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

@@ -23,9 +23,8 @@ public class RuleQo {
     /**
      * 匹配的文件后缀
      */
-    private List<String> suffixes;
+    private List<String> suffix;
 
-    private String suffix;
 
     /**
      * 适配技术id

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

@@ -164,6 +164,9 @@ public class Inspector {
             if (!ruleSuffixFilePathMap.containsKey(rule.getSuffix())) {
                 ruleSuffixFilePathMap.put(rule.getSuffix(), new ArrayList<>());
             }
+            if(!ruleMap.containsKey(rule.getTarget()+":"+rule.getSuffix())){
+                ruleMap.put(rule.getTarget()+":"+rule.getSuffix(),rule);
+            }
         }
         try {
             //以下为计算文件名称匹配正则表达式
@@ -226,7 +229,7 @@ public class Inspector {
                         }
                     }
                     //检查到普通jar包
-                    if (file.toString().endsWith(".jar")) {
+                    if (file.getFileName().toString().endsWith(".jar")) {
                         //新建一个pom对象
                         ProjectPom projectPom = new ProjectPom();
                         //截取jar名称
@@ -523,7 +526,6 @@ public class Inspector {
         stringBuilder.append(dependency.getGroupId()).append(":").append(dependency.getArtifactId());
         if (inspectParameter.getAdmin() == 1) {
             Rule rule = new Rule();
-            System.out.println(JSON.toJSONString(techJavaSupport));
             rule.setTechnologyId(techJavaSupport.getId());
             rule.setTarget(dependency.getGroupId());
             rule.setTechnologyName(techJavaSupport.getTechnologyName());

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

@@ -61,9 +61,9 @@ public class RuleServiceImpl implements RuleService {
      */
     @Override
     public void addRule(RuleQo ruleQo) {
-        List<String> suffixes = ruleQo.getSuffixes();
+        List<String> suffixes = ruleQo.getSuffix();
         for (String suffix : suffixes) {
-            Rule rule1 = ruleDao.findByTargetAndSuffixEquals(ruleQo.getTarget(), suffix);
+            Rule rule1 = ruleDao.findByTargetAndSuffixEqualsAndTechnologyIdEquals(ruleQo.getTarget(), suffix,ruleQo.getTechnologyId());
             if (rule1 != null) {
                 return;
             }
@@ -118,13 +118,18 @@ public class RuleServiceImpl implements RuleService {
 
     @Override
     public void upRule(RuleQo ruleQo) {
-            Rule rule1 = new Rule();
+        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(ruleQo.getSuffix());
+            rule1.setSuffix(suffix);
             rule1.setTechnologyId(ruleQo.getTechnologyId());
             rule1.setTechnologyName(ruleQo.getTechnologyName());
             ruleDao.save(rule1);
-
+        }
     }
 
     @Override