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

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

@@ -83,8 +83,8 @@ public class RuleController {
     })
     @RequestMapping(value="/search/{page}/{size}",method=RequestMethod.POST)
     public ResponseEntity findSearch(@RequestBody Map searchMap , @PathVariable int page, @PathVariable int size){
-        Page<Rule> search = ruleService.findSearch(searchMap, page, size);
-        return  ResponseEntity.ok(search);
+        Page<Rule> pageList = ruleService.findSearch(searchMap, page, size);
+        return  ResponseEntity.ok(new PageResult<Rule>(pageList.getTotalElements(), pageList.getContent()) );
     }
 
     /**

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

@@ -21,7 +21,10 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
 import java.io.*;
 import java.io.File;
 import java.util.*;
@@ -111,19 +114,6 @@ public class RuleServiceImpl implements RuleService {
 
     }
 
-    public void saveRule(Rule rule) {
-        String suffix = rule.getSuffix();
-        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);
-    }
 
     //批量添加
     @Override
@@ -171,23 +161,28 @@ public class RuleServiceImpl implements RuleService {
      */
     private Specification<Rule> createSpecification(Map searchMap) {
 
-        return (root, query, cb) -> {
-            List<Predicate> predicateList = new ArrayList<>();
-            if (searchMap.get("technologyName") != null && !"".equals(searchMap.get("technologyName"))) {
-                predicateList.add(cb.like(root.get("technologyName").as(String.class), "%" + searchMap.get("technologyName") + "%"));
-            }
-            if (searchMap.get("target") != null && !"".equals(searchMap.get("target"))) {
-                predicateList.add(cb.like(root.get("target").as(String.class), "%" + searchMap.get("target") + "%"));
-            }
-            if (searchMap.get("suffix") != null && !"".equals(searchMap.get("suffix"))) {
-                predicateList.add(cb.like(root.get("suffix").as(String.class), "%" + searchMap.get("suffix") + "%"));
-            }
-            return cb.and(predicateList.toArray(new Predicate[predicateList.size()]));
+        return new Specification<Rule>() {
 
+            @Override
+            public Predicate toPredicate(Root<Rule> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
+                List<Predicate> predicateList = new ArrayList<Predicate>();
+                if (searchMap.get("technologyName") != null && !"".equals(searchMap.get("technologyName"))) {
+                    predicateList.add(cb.like(root.get("technologyName").as(String.class), "%" + searchMap.get("technologyName") + "%"));
+                }
+                if (searchMap.get("target") != null && !"".equals(searchMap.get("target"))) {
+                    predicateList.add(cb.like(root.get("target").as(String.class), "%" + searchMap.get("target") + "%"));
+                }
+                if (searchMap.get("suffix") != null && !"".equals(searchMap.get("suffix"))) {
+                    predicateList.add(cb.like(root.get("suffix").as(String.class), "%" + searchMap.get("suffix") + "%"));
+                }
+                return cb.and( predicateList.toArray(new Predicate[predicateList.size()]));
+
+            }
         };
 
     }
 
+
     @Override
     public void upRule(RuleQo ruleQo) {
         RuleQo oldRule = ruleQo.getOldRule();
@@ -366,14 +361,10 @@ public class RuleServiceImpl implements RuleService {
                     List<Rule> rules = technology.getRules();
                     if (rules != null && rules.size() > 0) {
                         for (Rule rule : rules) {
-                            saveRule(rule);
+                            addRulePlus(rule);
                         }
                     }
                 }
-                ruleCollectionDao.deleteAll();
-                List<Rule> all = ruleDao.findAll();
-                List<RuleCollection> ruleCollections = dataList2RuleCollection(all);
-                ruleCollectionDao.saveAll(ruleCollections);
             }
         }