Browse Source

Fix created edge version

pull/11568/head
ViacheslavKlimov 2 years ago
parent
commit
591cc91733
  1. 2
      application/src/main/java/org/thingsboard/server/service/entitiy/edge/DefaultTbEdgeService.java
  2. 4
      common/data/src/main/java/org/thingsboard/server/common/data/edge/Edge.java

2
application/src/main/java/org/thingsboard/server/service/entitiy/edge/DefaultTbEdgeService.java

@ -54,7 +54,7 @@ public class DefaultTbEdgeService extends AbstractTbEntityService implements TbE
if (ActionType.ADDED.equals(actionType)) {
ruleChainService.assignRuleChainToEdge(tenantId, edgeTemplateRootRuleChain.getId(), edgeId);
edgeService.setEdgeRootRuleChain(tenantId, savedEdge, edgeTemplateRootRuleChain.getId());
savedEdge = edgeService.setEdgeRootRuleChain(tenantId, savedEdge, edgeTemplateRootRuleChain.getId());
edgeService.assignDefaultRuleChainsToEdge(tenantId, edgeId);
}

4
common/data/src/main/java/org/thingsboard/server/common/data/edge/Edge.java

@ -75,9 +75,9 @@ public class Edge extends BaseDataWithAdditionalInfo<EdgeId> implements HasLabel
this.tenantId = edge.getTenantId();
this.customerId = edge.getCustomerId();
this.rootRuleChainId = edge.getRootRuleChainId();
this.name = edge.getName();
this.type = edge.getType();
this.label = edge.getLabel();
this.name = edge.getName();
this.routingKey = edge.getRoutingKey();
this.secret = edge.getSecret();
this.version = edge.getVersion();
@ -87,9 +87,9 @@ public class Edge extends BaseDataWithAdditionalInfo<EdgeId> implements HasLabel
this.tenantId = edge.getTenantId();
this.customerId = edge.getCustomerId();
this.rootRuleChainId = edge.getRootRuleChainId();
this.name = edge.getName();
this.type = edge.getType();
this.label = edge.getLabel();
this.name = edge.getName();
this.routingKey = edge.getRoutingKey();
this.secret = edge.getSecret();
this.version = edge.getVersion();

Loading…
Cancel
Save