From 0f88dbf5ffc6eeaf907b452a891d3534295a651d Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Tue, 3 Dec 2024 11:33:13 +0800 Subject: [PATCH] =?UTF-8?q?perf(X-Pack):=20=E9=98=88=E5=80=BC=E5=91=8A?= =?UTF-8?q?=E8=AD=A6-=E4=BD=BF=E7=94=A8=E6=95=B0=E5=80=BC=E5=8A=A8?= =?UTF-8?q?=E6=80=81=E5=80=BC=E9=80=89=E6=8B=A9=E7=AD=89=E4=BA=8E=E4=B8=8D?= =?UTF-8?q?=E4=BC=9A=E8=A7=A6=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/ChartViewThresholdManage.java | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewThresholdManage.java b/core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewThresholdManage.java index 7513d8dbcb..c08d1c2a65 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewThresholdManage.java +++ b/core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewThresholdManage.java @@ -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)) { // 补充时间逻辑