github/dataease
github/dataease
3
0
Fork 1
mirror of https://github.com/dataease/dataease.git synced 2025-02-24 19:42:56 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

perf(X-Pack): 阈值告警-使用数值动态值选择等于不会触发

Browse Source
This commit is contained in:
fit2cloud-chenyw 2024-12-03 11:33:13 +08:00
parent 50e4bc125c
commit 0f88dbf5ff
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -524,20 +524,25 @@ public class ChartViewThresholdManage {
}
} else if (Objects.equals(deType, DeTypeConstants.DE_INT) || Objects.equals(deType, DeTypeConstants.DE_FLOAT)) {
if (valueObj == null) return false;
if (ObjectUtils.isEmpty(item.getValue())) {
return false;
}
float targetVal = Float.parseFloat(item.getValue());
float originVal = Float.parseFloat(valueObj.toString());
if (StringUtils.equals(term, "eq")) {
return StringUtils.equals(item.getValue().toString(), valueObj.toString());
return StringUtils.equals(String.valueOf(originVal), String.valueOf(targetVal));
} else if (StringUtils.equals(term, "not_eq")) {
return !StringUtils.equals(item.getValue().toString(), valueObj.toString());
return !StringUtils.equals(String.valueOf(originVal), String.valueOf(targetVal));
} else if (StringUtils.equals(term, "gt")) {
return Float.parseFloat(item.getValue().toString()) < Float.parseFloat(valueObj.toString());
return targetVal < originVal;
} else if (StringUtils.equals(term, "ge")) {
return Float.parseFloat(item.getValue().toString()) <= Float.parseFloat(valueObj.toString());
return targetVal <= originVal;
} else if (StringUtils.equals(term, "lt")) {
return Float.parseFloat(item.getValue().toString()) > Float.parseFloat(valueObj.toString());
return targetVal > originVal;
} else if (StringUtils.equals(term, "le")) {
return Float.parseFloat(item.getValue().toString()) >= Float.parseFloat(valueObj.toString());
return targetVal >= originVal;
} else {
return StringUtils.equals(item.getValue().toString(), valueObj.toString());
return StringUtils.equals(item.getValue(), valueObj.toString());
}
} else if (Objects.equals(deType, DeTypeConstants.DE_TIME)) {
// 补充时间逻辑