dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

implemented compare for BoolDataPoint

Browse Source
This commit is contained in:
dashevchenko 2025-03-26 17:41:31 +02:00
parent edcb890434
commit ef27e33d03
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
common/edqs/src/main/java/org/thingsboard/server/edqs/data/dp/AbstractDataPoint.java
View File

@ -17,6 +17,7 @@ package org.thingsboard.server.edqs.data.dp;
import lombok.Getter; import lombok.Getter;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.thingsboard.server.common.data.edqs.DataPoint; import org.thingsboard.server.common.data.edqs.DataPoint;
@RequiredArgsConstructor @RequiredArgsConstructor
@ -56,19 +57,7 @@ public abstract class AbstractDataPoint implements DataPoint {
@Override @Override
public int compareTo(DataPoint dataPoint) { public int compareTo(DataPoint dataPoint) {
String str1 = this.valueToString(); return StringUtils.compareIgnoreCase(valueToString(), dataPoint.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);
} }
} }

5
common/edqs/src/main/java/org/thingsboard/server/edqs/data/dp/BoolDataPoint.java
View File

@ -16,6 +16,7 @@
package org.thingsboard.server.edqs.data.dp; package org.thingsboard.server.edqs.data.dp;
import lombok.Getter; import lombok.Getter;
import org.thingsboard.server.common.data.edqs.DataPoint;
import org.thingsboard.server.common.data.kv.DataType; import org.thingsboard.server.common.data.kv.DataType;
public class BoolDataPoint extends AbstractDataPoint { public class BoolDataPoint extends AbstractDataPoint {
@ -43,4 +44,8 @@ public class BoolDataPoint extends AbstractDataPoint {
return Boolean.toString(value); return Boolean.toString(value);
} }
@Override
public int compareTo(DataPoint dataPoint) {
return Boolean.compare(value, dataPoint.getBool());
}
} }