From ef27e33d03aea4924e487e52408ecb87ef7f8e2a Mon Sep 17 00:00:00 2001 From: dashevchenko Date: Wed, 26 Mar 2025 17:41:31 +0200 Subject: [PATCH] implemented compare for BoolDataPoint --- .../server/edqs/data/dp/AbstractDataPoint.java | 15 ++------------- .../server/edqs/data/dp/BoolDataPoint.java | 5 +++++ 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/common/edqs/src/main/java/org/thingsboard/server/edqs/data/dp/AbstractDataPoint.java b/common/edqs/src/main/java/org/thingsboard/server/edqs/data/dp/AbstractDataPoint.java index 5cd2c562ca..1fdb731af6 100644 --- a/common/edqs/src/main/java/org/thingsboard/server/edqs/data/dp/AbstractDataPoint.java +++ b/common/edqs/src/main/java/org/thingsboard/server/edqs/data/dp/AbstractDataPoint.java @@ -17,6 +17,7 @@ package org.thingsboard.server.edqs.data.dp; import lombok.Getter; import lombok.RequiredArgsConstructor; +import org.apache.commons.lang3.StringUtils; import org.thingsboard.server.common.data.edqs.DataPoint; @RequiredArgsConstructor @@ -56,19 +57,7 @@ public abstract class AbstractDataPoint implements DataPoint { @Override public int compareTo(DataPoint dataPoint) { - String str1 = this.valueToString(); - String str2 = dataPoint.valueToString(); - - if (str1 == null && str2 == null) { - return 0; - } - if (str1 == null) { - return -1; - } - if (str2 == null) { - return 1; - } - return str1.compareToIgnoreCase(str2); + return StringUtils.compareIgnoreCase(valueToString(), dataPoint.valueToString()); } } diff --git a/common/edqs/src/main/java/org/thingsboard/server/edqs/data/dp/BoolDataPoint.java b/common/edqs/src/main/java/org/thingsboard/server/edqs/data/dp/BoolDataPoint.java index 83d91d8f75..70a14917ba 100644 --- a/common/edqs/src/main/java/org/thingsboard/server/edqs/data/dp/BoolDataPoint.java +++ b/common/edqs/src/main/java/org/thingsboard/server/edqs/data/dp/BoolDataPoint.java @@ -16,6 +16,7 @@ package org.thingsboard.server.edqs.data.dp; import lombok.Getter; +import org.thingsboard.server.common.data.edqs.DataPoint; import org.thingsboard.server.common.data.kv.DataType; public class BoolDataPoint extends AbstractDataPoint { @@ -43,4 +44,8 @@ public class BoolDataPoint extends AbstractDataPoint { return Boolean.toString(value); } + @Override + public int compareTo(DataPoint dataPoint) { + return Boolean.compare(value, dataPoint.getBool()); + } }