Browse Source

added useLatestTs check when CF updated

pull/14141/head
IrynaMatveieva 11 months ago
parent
commit
5857e40d56
  1. 5
      application/src/main/java/org/thingsboard/server/service/cf/ctx/state/CalculatedFieldCtx.java
  2. 3
      application/src/main/java/org/thingsboard/server/service/cf/ctx/state/aggregation/function/CountUniqueAggEntry.java

5
application/src/main/java/org/thingsboard/server/service/cf/ctx/state/CalculatedFieldCtx.java

@ -574,6 +574,11 @@ public class CalculatedFieldCtx implements Closeable {
if (!Objects.equals(output, other.output)) {
return true;
}
if (calculatedField.getConfiguration() instanceof SimpleCalculatedFieldConfiguration thisConfig
&& other.calculatedField.getConfiguration() instanceof SimpleCalculatedFieldConfiguration otherConfig
&& thisConfig.isUseLatestTs() != otherConfig.isUseLatestTs()) {
return true;
}
if (cfType == CalculatedFieldType.ALARM) {
if (!calculatedField.getName().equals(other.getCalculatedField().getName())) {
return true;

3
application/src/main/java/org/thingsboard/server/service/cf/ctx/state/aggregation/function/CountUniqueAggEntry.java

@ -15,7 +15,6 @@
*/
package org.thingsboard.server.service.cf.ctx.state.aggregation.function;
import org.thingsboard.common.util.JacksonUtil;
import org.thingsboard.server.common.data.cf.configuration.aggregation.AggFunction;
import java.util.Optional;
@ -28,7 +27,7 @@ public class CountUniqueAggEntry implements AggEntry {
@Override
public void update(Object value) {
if (value != null) {
items.add(JacksonUtil.toString(value));
items.add(String.valueOf(value));
}
}

Loading…
Cancel
Save