Browse Source

Updated toTbelCfArg implementation for GeofencingArgumentEntry

pull/13920/head
dshvaika 1 year ago
parent
commit
faf842f998
  1. 2
      application/src/main/java/org/thingsboard/server/service/cf/ctx/state/GeofencingArgumentEntry.java
  2. 1
      application/src/main/resources/logback.xml
  3. 2
      common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/RelationQueryDynamicSourceConfiguration.java
  4. 11
      common/script/script-api/src/main/java/org/thingsboard/script/api/tbel/TbelCfTsGeofencingArg.java

2
application/src/main/java/org/thingsboard/server/service/cf/ctx/state/GeofencingArgumentEntry.java

@ -72,7 +72,7 @@ public class GeofencingArgumentEntry implements ArgumentEntry {
@Override @Override
public TbelCfArg toTbelCfArg() { public TbelCfArg toTbelCfArg() {
return new TbelCfTsGeofencingArg(); return new TbelCfTsGeofencingArg(zoneStates);
} }
private Map<EntityId, GeofencingZoneState> toZones(Map<EntityId, KvEntry> entityIdKvEntryMap) { private Map<EntityId, GeofencingZoneState> toZones(Map<EntityId, KvEntry> entityIdKvEntryMap) {

1
application/src/main/resources/logback.xml

@ -58,6 +58,7 @@
<!-- CF actors message processors trace --> <!-- CF actors message processors trace -->
<!-- <logger name="org.thingsboard.server.actors.calculatedField" level="TRACE" />--> <!-- <logger name="org.thingsboard.server.actors.calculatedField" level="TRACE" />-->
<logger name="com.microsoft.azure.servicebus.primitives.CoreMessageReceiver" level="OFF" /> <logger name="com.microsoft.azure.servicebus.primitives.CoreMessageReceiver" level="OFF" />
<root level="INFO"> <root level="INFO">

2
common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/RelationQueryDynamicSourceConfiguration.java

@ -15,6 +15,7 @@
*/ */
package org.thingsboard.server.common.data.cf.configuration; package org.thingsboard.server.common.data.cf.configuration;
import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Data; import lombok.Data;
import org.thingsboard.server.common.data.EntityType; import org.thingsboard.server.common.data.EntityType;
import org.thingsboard.server.common.data.StringUtils; import org.thingsboard.server.common.data.StringUtils;
@ -59,6 +60,7 @@ public class RelationQueryDynamicSourceConfiguration implements CfArgumentDynami
} }
} }
@JsonIgnore
public boolean isSimpleRelation() { public boolean isSimpleRelation() {
return maxLevel == 1 && CollectionsUtil.isEmpty(entityTypes); return maxLevel == 1 && CollectionsUtil.isEmpty(entityTypes);
} }

11
common/script/script-api/src/main/java/org/thingsboard/script/api/tbel/TbelCfTsGeofencingArg.java

@ -15,11 +15,18 @@
*/ */
package org.thingsboard.script.api.tbel; package org.thingsboard.script.api.tbel;
// TODO: should I add any specific logic for this? import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
@Data
public class TbelCfTsGeofencingArg implements TbelCfArg { public class TbelCfTsGeofencingArg implements TbelCfArg {
public TbelCfTsGeofencingArg() { private final Object value;
@JsonCreator
public TbelCfTsGeofencingArg(@JsonProperty("value") Object value) {
this.value = value;
} }
@Override @Override

Loading…
Cancel
Save