center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge pull request #11981 from dataease/pr@dev-v2@perf_threshold_null_value

Browse Source 
perf(X-Pack): 阈值告警图表数据包含空值无效
This commit is contained in:
fit2cloud-chenyw 2024-09-03 19:26:27 +08:00 committed by GitHub
commit d7b77af7f2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewThresholdManage.java
View File

@ -335,6 +335,9 @@ public class ChartViewThresholdManage {
} else {
String term = item.getTerm();
if (Objects.equals(deType, DeTypeConstants.DE_STRING)) {
if (valueObj == null) {
return StringUtils.equals(term, "null");
}
if (StringUtils.equals(term, "eq")) {
return StringUtils.equals(item.getValue(), valueObj.toString());
} else if (StringUtils.equals(term, "not_eq")) {
@ -348,9 +351,9 @@ public class ChartViewThresholdManage {
} else if (StringUtils.equals(term, "not_like")) {
return !StringUtils.contains(item.getValue(), valueObj.toString());
} else if (StringUtils.equals(term, "null")) {
return valueObj == null;
return false;
} else if (StringUtils.equals(term, "not_null")) {
return valueObj != null;
return true;
} else if (StringUtils.equals(term, "empty")) {
return StringUtils.isBlank(valueObj.toString());
} else if (StringUtils.equals(term, "not_empty")) {
@ -359,6 +362,7 @@ public class ChartViewThresholdManage {
return StringUtils.equals(item.getValue(), valueObj.toString());
}
} else if (Objects.equals(deType, DeTypeConstants.DE_INT) || Objects.equals(deType, DeTypeConstants.DE_FLOAT)) {
if (valueObj == null) return false;
if (StringUtils.equals(term, "eq")) {
return StringUtils.equals(item.getValue().toString(), valueObj.toString());
} else if (StringUtils.equals(term, "not_eq")) {