Commit 45e6221a0466321263a45310b8399d10548555ef
1 parent
424df706
fix(DEFECT-499): 数据转换启用时,启动数据流转规则链不满足预期问题
Showing
1 changed file
with
4 additions
and
2 deletions
... | ... | @@ -37,6 +37,7 @@ public class ConvertConfigServiceImpl |
37 | 37 | private final String originatorType = |
38 | 38 | "org.thingsboard.rule.engine.metadata.TbGetOriginatorFieldsNode"; |
39 | 39 | private final String scriptType = "org.thingsboard.rule.engine.transform.TbTransformMsgNode"; |
40 | + private final String convertNodeName = "dataConvert@thingskit"; | |
40 | 41 | |
41 | 42 | @Override |
42 | 43 | public YtPageData<ConvertConfigDTO> page(String tenantId, Map<String, Object> queryMap) { |
... | ... | @@ -358,9 +359,10 @@ public class ConvertConfigServiceImpl |
358 | 359 | } |
359 | 360 | |
360 | 361 | int scriptIndex = 0; |
362 | + /**数据流转的脚本转换是否已经存在*/ | |
361 | 363 | boolean hadScript = false; |
362 | 364 | for (RuleNode ruleNode : ruleChainMetaData.getNodes()) { |
363 | - if (ruleNode.getType().equals(scriptType)) { | |
365 | + if (ruleNode.getType().equals(scriptType) && convertNodeName.equals(ruleNode.getName())) { | |
364 | 366 | hadScript = true; |
365 | 367 | break; |
366 | 368 | } |
... | ... | @@ -477,7 +479,7 @@ public class ConvertConfigServiceImpl |
477 | 479 | nodeConnectionInfo.setToIndex(toIndex); |
478 | 480 | ruleChainMetaData.getConnections().add(nodeConnectionInfo); |
479 | 481 | RuleNode ruleNode = new RuleNode(); |
480 | - ruleNode.setName("dataConvert"); | |
482 | + ruleNode.setName(convertNodeName); | |
481 | 483 | ruleNode.setType(type); |
482 | 484 | JsonNode jsonNode = JacksonUtil.toJsonNode(types.get(type)); |
483 | 485 | ruleNode.setConfiguration(jsonNode); | ... | ... |