评估报告管理页面修改v1.0.4

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

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

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

@@ -59,8 +59,8 @@ public class RuleServiceImpl implements RuleService {
     public void addRule(RuleQo ruleQo) {
         List<String> suffixes = ruleQo.getSuffix();
         for (String suffix : suffixes) {
-            Rule rule1 = ruleDao.findByTargetAndSuffixEqualsAndTechnologyIdEquals(ruleQo.getTarget(), suffix,ruleQo.getTechnologyId());
-            if (rule1 != null) {
+            List<Rule> rule1 = ruleDao.findByTargetAndSuffixEqualsAndTechnologyIdEquals(ruleQo.getTarget(), suffix,ruleQo.getTechnologyId());
+            if (rule1 != null&& rule1.size()>0) {
                 continue;
             }
             Rule rule = new Rule();
@@ -77,8 +77,13 @@ public class RuleServiceImpl implements RuleService {
     }
     public void saveRule(Rule rule) {
         String suffix = rule.getSuffix();
-        Rule rule1 = ruleDao.findByTargetAndSuffixEqualsAndTechnologyIdEquals(rule.getTarget(), suffix,rule.getTechnologyId());
-        if (rule1 != null) {
+        List<Rule> rule1 = ruleDao.findByTargetAndSuffixEqualsAndTechnologyIdEquals(rule.getTarget(), suffix,rule.getTechnologyId());
+        if (rule1 != null&&rule1.size()>0) {
+            if(rule1.size()>1){
+                for (int i = 1; i < rule1.size(); i++) {
+                    ruleDao.deleteById(rule1.get(i).getId());
+                }
+            }
             return;
         }
         ruleDao.save(rule);

src/main/resources/application.properties

@@ -50,7 +50,7 @@ spring.resources.static-locations=classpath:/uploads/
 # mysql\u6570\u636E\u5E93\u914D\u7F6E
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 #spring.datasource.url=jdbc:mysql://192.168.1.249:3306/bservice?useSSL=false&serverTimezone=UTC&autoReconnect=true&characterEncoding=utf-8
-spring.datasource.url=jdbc:mysql://120.55.57.35:3306/adaptation?useSSL=false&serverTimezone=UTC&autoReconnect=true&characterEncoding=utf-8
+spring.datasource.url=jdbc:mysql://localhost:3306/adaptation?useSSL=false&serverTimezone=UTC&autoReconnect=true&characterEncoding=utf-8
 spring.datasource.username=root
 spring.datasource.password=root