OpenSource/hertzbeat
Public Access
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[manager,webapp] 全局监控搜索框功能实现

Browse Source
This commit is contained in:
tomsun28
2021-12-19 16:08:18 +08:00
parent 8ec8740ab2
commit 9b2638c233
3 changed files with 58 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
manager/src/main/java/com/usthe/manager/controller/MonitorsController.java
View File

@@ -65,13 +65,19 @@ public class MonitorsController {
Predicate predicateApp = criteriaBuilder.equal(root.get("app"), app);
predicate = criteriaBuilder.and(predicateApp);
}
if (name != null && !"".equals(name)) {
if (name != null && !"".equals(name) && host != null && !"".equals(host)) {
Predicate predicateName = criteriaBuilder.like(root.get("name"), "%" + name + "%");
predicate = criteriaBuilder.and(predicateName);
}
if (host != null && !"".equals(host)) {
Predicate predicateHost = criteriaBuilder.like(root.get("host"), "%" + host + "%");
predicate = criteriaBuilder.and(predicateHost);
predicate = criteriaBuilder.or(predicateName, predicateHost);
} else {
if (host != null && !"".equals(host)) {
Predicate predicateHost = criteriaBuilder.like(root.get("host"), "%" + host + "%");
predicate = criteriaBuilder.and(predicateHost);
}
if (name != null && !"".equals(name)) {
Predicate predicateName = criteriaBuilder.like(root.get("name"), "%" + name + "%");
predicate = criteriaBuilder.and(predicateName);
}
}
return predicate;
};