Browse Source

added check for jsonDataEntry

pull/13509/head
IrynaMatveieva 1 year ago
parent
commit
7fb1a4f20a
  1. 14
      application/src/main/java/org/thingsboard/server/service/cf/ctx/state/SingleValueArgumentEntry.java

14
application/src/main/java/org/thingsboard/server/service/cf/ctx/state/SingleValueArgumentEntry.java

@ -25,6 +25,7 @@ import org.thingsboard.script.api.tbel.TbelCfArg;
import org.thingsboard.script.api.tbel.TbelCfSingleValueArg; import org.thingsboard.script.api.tbel.TbelCfSingleValueArg;
import org.thingsboard.server.common.data.kv.AttributeKvEntry; import org.thingsboard.server.common.data.kv.AttributeKvEntry;
import org.thingsboard.server.common.data.kv.BasicKvEntry; import org.thingsboard.server.common.data.kv.BasicKvEntry;
import org.thingsboard.server.common.data.kv.JsonDataEntry;
import org.thingsboard.server.common.data.kv.KvEntry; import org.thingsboard.server.common.data.kv.KvEntry;
import org.thingsboard.server.common.data.kv.TsKvEntry; import org.thingsboard.server.common.data.kv.TsKvEntry;
import org.thingsboard.server.common.util.ProtoUtils; import org.thingsboard.server.common.util.ProtoUtils;
@ -92,12 +93,13 @@ public class SingleValueArgumentEntry implements ArgumentEntry {
@Override @Override
public TbelCfArg toTbelCfArg() { public TbelCfArg toTbelCfArg() {
Object value; Object value = kvEntryValue.getValue();
try { if (kvEntryValue instanceof JsonDataEntry) {
value = JacksonUtil.readValue(kvEntryValue.getValueAsString(), new TypeReference<>() { try {
}); value = JacksonUtil.readValue(kvEntryValue.getValueAsString(), new TypeReference<>() {
} catch (Exception e) { });
value = kvEntryValue.getValue(); } catch (Exception e) {
}
} }
return new TbelCfSingleValueArg(ts, value); return new TbelCfSingleValueArg(ts, value);
} }

Loading…
Cancel
Save