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

perf(X-Pack): 阈值告警-时间字段规则

Browse Source
This commit is contained in:
fit2cloud-chenyw 2024-09-06 18:03:25 +08:00
parent 1bf51ca229
commit c12a7dc00d
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,6 @@ package io.dataease.chart.manage;
import io.dataease.api.chart.request.ThresholdCheckRequest;
import io.dataease.api.chart.vo.ThresholdCheckVO;
import io.dataease.engine.constant.DeTypeConstants;
import io.dataease.exception.DEException;
import io.dataease.extensions.datasource.dto.DatasetTableFieldDTO;
import io.dataease.extensions.view.dto.ChartViewDTO;
import io.dataease.extensions.view.dto.ChartViewFieldDTO;
@ -388,11 +387,36 @@ public class ChartViewThresholdManage {
}
} else if (Objects.equals(deType, DeTypeConstants.DE_TIME)) {
// 补充时间逻辑
return true;
return timeMatch(item, valueObj);
} else {
return true;
}
}
}
private boolean timeMatch(FilterTreeItem item, Object valueObj) {
if (ObjectUtils.isEmpty(valueObj)) return false;
String valueText = valueObj.toString();
String target = item.getValue();
target = target.replaceAll("[^0-9]", "");
valueText = valueText.replaceAll("[^0-9]", "");
long targetLong = Long.parseLong(target);
long valueLong = Long.parseLong(valueText);
String term = item.getTerm();
if (StringUtils.equals(term, "eq")) {
return valueLong == targetLong;
} else if (StringUtils.equals(term, "not_eq")) {
return valueLong != targetLong;
} else if (StringUtils.equals(term, "gt")) {
return valueLong > targetLong;
} else if (StringUtils.equals(term, "ge")) {
return valueLong >= targetLong;
} else if (StringUtils.equals(term, "lt")) {
return valueLong < targetLong;
} else if (StringUtils.equals(term, "le")) {
return valueLong <= targetLong;
} else {
return valueLong == targetLong;
}
}
}

2
de-xpack

@ -1 +1 @@
Subproject commit 35bc777cd58d0ff07d68e4c5bd5cb803fcbd2ec2
Subproject commit d8081f9962673ee5313df4a75475aaae0fa56ead