mirror of
https://github.com/dataease/dataease.git
synced 2026-05-15 13:32:18 +08:00
Merge pull request #13790 from dataease/pr@dev-v2@fix_threshold_number
fix(系统设置): 阈值告警-数值动态类型选择等于无效
This commit is contained in:
@@ -413,7 +413,7 @@ public class ChartViewThresholdManage {
|
||||
DatasetTableFieldDTO field = item.getField();
|
||||
String dataeaseName = field.getDataeaseName();
|
||||
String value = item.getValue();
|
||||
float tempFVal = 0f;
|
||||
Float tempFVal = StringUtils.equalsAny(value, "min", "max") ? null : 0f;
|
||||
int validLen = 0;
|
||||
|
||||
for (Map<String, Object> row : rows) {
|
||||
@@ -421,9 +421,17 @@ public class ChartViewThresholdManage {
|
||||
if (ObjectUtils.isEmpty(o)) continue;
|
||||
float fvalue = Float.parseFloat(o.toString());
|
||||
if (StringUtils.equals("min", value)) {
|
||||
tempFVal = Math.min(tempFVal, fvalue);
|
||||
if (ObjectUtils.isEmpty(tempFVal)) {
|
||||
tempFVal = fvalue;
|
||||
} else {
|
||||
tempFVal = Math.min(tempFVal, fvalue);
|
||||
}
|
||||
} else if (StringUtils.equals("max", value)) {
|
||||
tempFVal = Math.max(tempFVal, fvalue);
|
||||
if (ObjectUtils.isEmpty(tempFVal)) {
|
||||
tempFVal = fvalue;
|
||||
} else {
|
||||
tempFVal = Math.max(tempFVal, fvalue);
|
||||
}
|
||||
} else if (StringUtils.equals("average", value)) {
|
||||
tempFVal += fvalue;
|
||||
validLen++;
|
||||
|
||||
2
de-xpack
2
de-xpack
Submodule de-xpack updated: 7669a4307a...d72300fcc5
Reference in New Issue
Block a user