fixed error when json passed as argument
This commit is contained in:
parent
a736f5d212
commit
9b09c6542b
@ -16,9 +16,11 @@
|
|||||||
package org.thingsboard.server.service.cf.ctx.state;
|
package org.thingsboard.server.service.cf.ctx.state;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonIgnore;
|
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||||
|
import com.fasterxml.jackson.core.type.TypeReference;
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.NoArgsConstructor;
|
import lombok.NoArgsConstructor;
|
||||||
|
import org.thingsboard.common.util.JacksonUtil;
|
||||||
import org.thingsboard.script.api.tbel.TbelCfArg;
|
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;
|
||||||
@ -90,7 +92,14 @@ public class SingleValueArgumentEntry implements ArgumentEntry {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public TbelCfArg toTbelCfArg() {
|
public TbelCfArg toTbelCfArg() {
|
||||||
return new TbelCfSingleValueArg(ts, kvEntryValue.getValue());
|
Object value;
|
||||||
|
try {
|
||||||
|
value = JacksonUtil.readValue(kvEntryValue.getValueAsString(), new TypeReference<>() {
|
||||||
|
});
|
||||||
|
} catch (Exception e) {
|
||||||
|
value = kvEntryValue.getValue();
|
||||||
|
}
|
||||||
|
return new TbelCfSingleValueArg(ts, value);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user