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

add ignoreStringNull

Browse Source
This commit is contained in:
Yuriy Lytvynchuk 2022-09-12 17:05:58 +03:00
parent 5c9e9c5433
commit 13130ff257
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetOriginatorFieldsConfiguration.java
View File

@ -25,6 +25,7 @@ import java.util.Map;
public class TbGetOriginatorFieldsConfiguration implements NodeConfiguration<TbGetOriginatorFieldsConfiguration> { public class TbGetOriginatorFieldsConfiguration implements NodeConfiguration<TbGetOriginatorFieldsConfiguration> {
private Map<String, String> fieldsMapping; private Map<String, String> fieldsMapping;
private boolean ignoreStringNull;
@Override @Override
public TbGetOriginatorFieldsConfiguration defaultConfiguration() { public TbGetOriginatorFieldsConfiguration defaultConfiguration() {
@ -33,6 +34,7 @@ public class TbGetOriginatorFieldsConfiguration implements NodeConfiguration<TbG
fieldsMapping.put("name", "originatorName"); fieldsMapping.put("name", "originatorName");
fieldsMapping.put("type", "originatorType"); fieldsMapping.put("type", "originatorType");
configuration.setFieldsMapping(fieldsMapping); configuration.setFieldsMapping(fieldsMapping);
configuration.setIgnoreStringNull(false);
return configuration; return configuration;
} }
} }

4
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetOriginatorFieldsNode.java
View File

@ -46,10 +46,12 @@ import static org.thingsboard.common.util.DonAsynchron.withCallback;
public class TbGetOriginatorFieldsNode implements TbNode { public class TbGetOriginatorFieldsNode implements TbNode {
private TbGetOriginatorFieldsConfiguration config; private TbGetOriginatorFieldsConfiguration config;
private boolean ignoreStringNull;
@Override @Override
public void init(TbContext ctx, TbNodeConfiguration configuration) throws TbNodeException { public void init(TbContext ctx, TbNodeConfiguration configuration) throws TbNodeException {
config = TbNodeUtils.convert(configuration, TbGetOriginatorFieldsConfiguration.class); config = TbNodeUtils.convert(configuration, TbGetOriginatorFieldsConfiguration.class);
ignoreStringNull = config.isIgnoreStringNull();
} }
@Override @Override
@ -70,7 +72,7 @@ public class TbGetOriginatorFieldsNode implements TbNode {
data -> { data -> {
config.getFieldsMapping().forEach((field, metaKey) -> { config.getFieldsMapping().forEach((field, metaKey) -> {
String val = data.getFieldValue(field); String val = data.getFieldValue(field);
if (val != null && !val.equals("null")) { if (val != null && (!val.equals("null") || !ignoreStringNull)) {
msg.getMetaData().putValue(metaKey, val); msg.getMetaData().putValue(metaKey, val);
} }
}); });