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

Added Rule Chain type

Browse Source
This commit is contained in:
Volodymyr Babak 2019-11-11 19:20:11 +02:00
parent e0881cfc44
commit 66af90bf0a
16 changed files with 146 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/src/main/data/upgrade/2.4.x/schema_update.cql
View File

@ -59,3 +59,5 @@ CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.edge_by_customer_by_type_and_
WHERE tenant_id IS NOT NULL AND customer_id IS NOT NULL AND type IS NOT NULL AND search_text IS NOT NULL AND id IS NOT NULL
PRIMARY KEY ( customer_id, tenant_id, type, search_text, id )
WITH CLUSTERING ORDER BY ( tenant_id DESC, type ASC, search_text ASC, id DESC );
-- VOBA ADD changes for the MATERIALIZED view for DEVICE ASSET ENTITY_VIEW RULE_CHAIN

7
application/src/main/data/upgrade/2.4.x/schema_update.sql
View File

@ -23,10 +23,3 @@ CREATE TABLE IF NOT EXISTS edge (
search_text varchar(255),
tenant_id varchar(31)
);
ALTER TABLE asset ADD edge_id varchar(31);
ALTER TABLE device ADD edge_id varchar(31);
ALTER TABLE entity_view ADD edge_id varchar(31);
ALTER TABLE dashboard ADD assigned_edges varchar(1000000);
ALTER TABLE rule_chain ADD assigned_edges varchar(1000000);

17
application/src/main/java/org/thingsboard/server/actors/tenant/TenantActor.java
View File

@ -37,8 +37,8 @@ import org.thingsboard.server.common.data.EntityType;
import org.thingsboard.server.common.data.id.DeviceId;
import org.thingsboard.server.common.data.id.RuleChainId;
import org.thingsboard.server.common.data.id.TenantId;
import org.thingsboard.server.common.data.plugin.ComponentLifecycleEvent;
import org.thingsboard.server.common.data.rule.RuleChain;
import org.thingsboard.server.common.data.rule.RuleChainType;
import org.thingsboard.server.common.msg.TbActorMsg;
import org.thingsboard.server.common.msg.aware.DeviceAwareMsg;
import org.thingsboard.server.common.msg.aware.RuleChainAwareMsg;
@ -46,9 +46,6 @@ import org.thingsboard.server.common.msg.plugin.ComponentLifecycleMsg;
import org.thingsboard.server.common.msg.system.ServiceToRuleEngineMsg;
import scala.concurrent.duration.Duration;
import java.util.HashMap;
import java.util.Map;
public class TenantActor extends RuleChainManagerActor {
private final TenantId tenantId;
@ -139,11 +136,17 @@ public class TenantActor extends RuleChainManagerActor {
}
private void onComponentLifecycleMsg(ComponentLifecycleMsg msg) {
RuleChain ruleChain = null;
if (msg.getEntityId().getEntityType() == EntityType.RULE_CHAIN) {
ruleChain = systemContext.getRuleChainService().findRuleChainById(tenantId, new RuleChainId(msg.getEntityId().getId()));
if (RuleChainType.SYSTEM.equals(ruleChain.getType())) {
log.debug("[{}] Non SYSTEM rule chains are ignored and not started. Current rule chain type [{}]", tenantId, ruleChain.getType());
return;
}
}
ActorRef target = getEntityActorRef(msg.getEntityId());
if (target != null) {
if (msg.getEntityId().getEntityType() == EntityType.RULE_CHAIN) {
RuleChain ruleChain = systemContext.getRuleChainService().
findRuleChainById(tenantId, new RuleChainId(msg.getEntityId().getId()));
if (msg.getEntityId().getEntityType() == EntityType.RULE_CHAIN && ruleChain != null) {
ruleChainManager.visit(ruleChain, target);
}
target.tell(msg, ActorRef.noSender());

26
application/src/main/java/org/thingsboard/server/service/install/CassandraDatabaseUpgradeService.java
View File

@ -272,6 +272,32 @@ public class CassandraDatabaseUpgradeService implements DatabaseUpgradeService {
log.info("Updating schema ...");
schemaUpdateFile = Paths.get(installScripts.getDataDir(), "upgrade", "2.4.x", SCHEMA_UPDATE_CQL);
loadCql(schemaUpdateFile);
try {
cluster.getSession().execute("alter table asset add edge_id text");
Thread.sleep(2500);
} catch (InvalidQueryException e) {}
try {
cluster.getSession().execute("alter table device add edge_id text");
Thread.sleep(2500);
} catch (InvalidQueryException e) {}
try {
cluster.getSession().execute("alter table entity_view add edge_id text");
Thread.sleep(2500);
} catch (InvalidQueryException e) {}
try {
cluster.getSession().execute("alter table dashboard add assigned_edges text");
Thread.sleep(2500);
} catch (InvalidQueryException e) {}
try {
cluster.getSession().execute("alter table rule_chain add assigned_edges text");
Thread.sleep(2500);
} catch (InvalidQueryException e) {}
try {
cluster.getSession().execute("alter table rule_chain add type text");
Thread.sleep(2500);
} catch (InvalidQueryException e) {}
log.info("Schema updated.");
break;

18
application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java
View File

@ -181,6 +181,24 @@ public class SqlDatabaseUpgradeService implements DatabaseUpgradeService {
log.info("Updating schema ...");
schemaUpdateFile = Paths.get(installScripts.getDataDir(), "upgrade", "2.4.x", SCHEMA_UPDATE_SQL);
loadSql(schemaUpdateFile, conn);
try {
conn.createStatement().execute("ALTER TABLE asset ADD edge_id varchar(31)"); //NOSONAR, ignoring because method used to execute thingsboard database upgrade script
} catch (Exception e) {}
try {
conn.createStatement().execute("ALTER TABLE device ADD edge_id varchar(31)"); //NOSONAR, ignoring because method used to execute thingsboard database upgrade script
} catch (Exception e) {}
try {
conn.createStatement().execute("ALTER TABLE entity_view ADD edge_id varchar(31)"); //NOSONAR, ignoring because method used to execute thingsboard database upgrade script
} catch (Exception e) {}
try {
conn.createStatement().execute("ALTER TABLE dashboard ADD assigned_edges varchar(1000000)"); //NOSONAR, ignoring because method used to execute thingsboard database upgrade script
} catch (Exception e) {}
try {
conn.createStatement().execute("ALTER TABLE rule_chain ADD assigned_edges varchar(1000000)"); //NOSONAR, ignoring because method used to execute thingsboard database upgrade script
} catch (Exception e) {}
try {
conn.createStatement().execute("ALTER TABLE rule_chain ADD type varchar(255) DEFAULT 'SYSTEM'"); //NOSONAR, ignoring because method used to execute thingsboard database upgrade script
} catch (Exception e) {}
log.info("Schema updated.");
}
break;

2
common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChain.java
View File

@ -42,6 +42,7 @@ public class RuleChain extends SearchTextBasedWithAdditionalInfo<RuleChainId> im
private TenantId tenantId;
private String name;
private RuleChainType type;
private RuleNodeId firstRuleNodeId;
private boolean root;
private boolean debugMode;
@ -63,6 +64,7 @@ public class RuleChain extends SearchTextBasedWithAdditionalInfo<RuleChainId> im
super(ruleChain);
this.tenantId = ruleChain.getTenantId();
this.name = ruleChain.getName();
this.type = ruleChain.getType();
this.firstRuleNodeId = ruleChain.getFirstRuleNodeId();
this.root = ruleChain.isRoot();

5
common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChainType.java Normal file
View File

@ -0,0 +1,5 @@
package org.thingsboard.server.common.data.rule;
public enum RuleChainType {
SYSTEM, EDGE
}

1
dao/src/main/java/org/thingsboard/server/dao/model/ModelConstants.java
View File

@ -336,6 +336,7 @@ public class ModelConstants {
public static final String RULE_CHAIN_COLUMN_FAMILY_NAME = "rule_chain";
public static final String RULE_CHAIN_TENANT_ID_PROPERTY = TENANT_ID_PROPERTY;
public static final String RULE_CHAIN_NAME_PROPERTY = "name";
public static final String RULE_CHAIN_TYPE_PROPERTY = "type";
public static final String RULE_CHAIN_FIRST_RULE_NODE_ID_PROPERTY = "first_rule_node_id";
public static final String RULE_CHAIN_ROOT_PROPERTY = "root";
public static final String RULE_CHAIN_CONFIGURATION_PROPERTY = "configuration";

15
dao/src/main/java/org/thingsboard/server/dao/model/nosql/RuleChainEntity.java
View File

@ -35,9 +35,11 @@ import org.thingsboard.server.common.data.id.RuleChainId;
import org.thingsboard.server.common.data.id.RuleNodeId;
import org.thingsboard.server.common.data.id.TenantId;
import org.thingsboard.server.common.data.rule.RuleChain;
import org.thingsboard.server.common.data.rule.RuleChainType;
import org.thingsboard.server.dao.DaoUtil;
import org.thingsboard.server.dao.model.SearchTextEntity;
import org.thingsboard.server.dao.model.type.JsonCodec;
import org.thingsboard.server.dao.model.type.RuleChainTypeCodec;
import java.io.IOException;
import java.util.HashSet;
@ -53,6 +55,7 @@ import static org.thingsboard.server.dao.model.ModelConstants.RULE_CHAIN_FIRST_R
import static org.thingsboard.server.dao.model.ModelConstants.RULE_CHAIN_NAME_PROPERTY;
import static org.thingsboard.server.dao.model.ModelConstants.RULE_CHAIN_ROOT_PROPERTY;
import static org.thingsboard.server.dao.model.ModelConstants.RULE_CHAIN_TENANT_ID_PROPERTY;
import static org.thingsboard.server.dao.model.ModelConstants.RULE_CHAIN_TYPE_PROPERTY;
import static org.thingsboard.server.dao.model.ModelConstants.SEARCH_TEXT_PROPERTY;
@Slf4j
@ -73,6 +76,8 @@ public class RuleChainEntity implements SearchTextEntity<RuleChain> {
private UUID tenantId;
@Column(name = RULE_CHAIN_NAME_PROPERTY)
private String name;
@Column(name = RULE_CHAIN_TYPE_PROPERTY, codec = RuleChainTypeCodec.class)
private RuleChainType type;
@Column(name = SEARCH_TEXT_PROPERTY)
private String searchText;
@Column(name = RULE_CHAIN_FIRST_RULE_NODE_ID_PROPERTY)
@ -101,6 +106,11 @@ public class RuleChainEntity implements SearchTextEntity<RuleChain> {
}
this.tenantId = DaoUtil.getId(ruleChain.getTenantId());
this.name = ruleChain.getName();
if (ruleChain.getType() != null) {
this.type = ruleChain.getType();
} else {
this.type = RuleChainType.SYSTEM;
}
this.searchText = ruleChain.getName();
this.firstRuleNodeId = DaoUtil.getId(ruleChain.getFirstRuleNodeId());
this.root = ruleChain.isRoot();
@ -194,6 +204,11 @@ public class RuleChainEntity implements SearchTextEntity<RuleChain> {
ruleChain.setCreatedTime(UUIDs.unixTimestamp(id));
ruleChain.setTenantId(new TenantId(tenantId));
ruleChain.setName(name);
if (type != null) {
ruleChain.setType(type);
} else {
ruleChain.setType(RuleChainType.SYSTEM);
}
if (this.firstRuleNodeId != null) {
ruleChain.setFirstRuleNodeId(new RuleNodeId(this.firstRuleNodeId));
}

19
dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleChainEntity.java
View File

@ -32,6 +32,7 @@ import org.thingsboard.server.common.data.id.RuleChainId;
import org.thingsboard.server.common.data.id.RuleNodeId;
import org.thingsboard.server.common.data.id.TenantId;
import org.thingsboard.server.common.data.rule.RuleChain;
import org.thingsboard.server.common.data.rule.RuleChainType;
import org.thingsboard.server.dao.DaoUtil;
import org.thingsboard.server.dao.model.BaseSqlEntity;
import org.thingsboard.server.dao.model.ModelConstants;
@ -40,10 +41,14 @@ import org.thingsboard.server.dao.util.mapping.JsonStringType;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
import javax.persistence.Table;
import java.io.IOException;
import java.util.HashSet;
import static org.thingsboard.server.dao.model.ModelConstants.RULE_CHAIN_TYPE_PROPERTY;
@Data
@Slf4j
@EqualsAndHashCode(callSuper = true)
@ -62,6 +67,10 @@ public class RuleChainEntity extends BaseSqlEntity<RuleChain> implements SearchT
@Column(name = ModelConstants.RULE_CHAIN_NAME_PROPERTY)
private String name;
@Enumerated(EnumType.STRING)
@Column(name = RULE_CHAIN_TYPE_PROPERTY)
private RuleChainType type;
@Column(name = ModelConstants.SEARCH_TEXT_PROPERTY)
private String searchText;
@ -94,6 +103,11 @@ public class RuleChainEntity extends BaseSqlEntity<RuleChain> implements SearchT
}
this.tenantId = toString(DaoUtil.getId(ruleChain.getTenantId()));
this.name = ruleChain.getName();
if (ruleChain.getType() != null) {
this.type = ruleChain.getType();
} else {
this.type = RuleChainType.SYSTEM;
}
this.searchText = ruleChain.getName();
if (ruleChain.getFirstRuleNodeId() != null) {
this.firstRuleNodeId = UUIDConverter.fromTimeUUID(ruleChain.getFirstRuleNodeId().getId());
@ -127,6 +141,11 @@ public class RuleChainEntity extends BaseSqlEntity<RuleChain> implements SearchT
ruleChain.setCreatedTime(UUIDs.unixTimestamp(getId()));
ruleChain.setTenantId(new TenantId(toUUID(tenantId)));
ruleChain.setName(name);
if (type != null) {
ruleChain.setType(type);
} else {
ruleChain.setType(RuleChainType.SYSTEM);
}
if (firstRuleNodeId != null) {
ruleChain.setFirstRuleNodeId(new RuleNodeId(UUIDConverter.fromString(firstRuleNodeId)));
}

27
dao/src/main/java/org/thingsboard/server/dao/model/type/RuleChainTypeCodec.java Normal file
View File

@ -0,0 +1,27 @@
/**
* Copyright © 2016-2019 The Thingsboard Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.thingsboard.server.dao.model.type;
import com.datastax.driver.extras.codecs.enums.EnumNameCodec;
import org.thingsboard.server.common.data.rule.RuleChainType;
public class RuleChainTypeCodec extends EnumNameCodec<RuleChainType> {
public RuleChainTypeCodec() {
super(RuleChainType.class);
}
}

1
dao/src/main/resources/sql/schema-entities.sql
View File

@ -214,6 +214,7 @@ CREATE TABLE IF NOT EXISTS rule_chain (
additional_info varchar,
configuration varchar(10000000),
name varchar(255),
type varchar(255),
first_rule_node_id varchar(31),
root boolean,
debug_mode boolean,

2
ui/src/app/common/types.constant.js
View File

@ -606,6 +606,8 @@ export default angular.module('thingsboard.types', [])
clientSide: false
}
},
systemRuleChainType: "SYSTEM",
ruleChainTypes: ["SYSTEM", "EDGE"],
ruleNodeTypeComponentTypes: ["FILTER", "ENRICHMENT", "TRANSFORMATION", "ACTION", "EXTERNAL"],
ruleChainNodeComponent: {
type: 'RULE_CHAIN',

1
ui/src/app/locale/locale.constant-en_US.json
View File

@ -1386,6 +1386,7 @@
"root": "Root",
"delete": "Delete rule chain",
"name": "Name",
"type": "Type",
"name-required": "Name is required.",
"description": "Description",
"add": "Add Rule Chain",

8
ui/src/app/rulechain/rulechain-fieldset.tpl.html
View File

@ -49,6 +49,14 @@
<div translate ng-message="required">rulechain.name-required</div>
</div>
</md-input-container>
<md-input-container class="md-block">
<label translate>rulechain.type</label>
<md-select ng-disabled="$root.loading || !isEdit" name="type" ng-model="ruleChain.type">
<md-option ng-repeat="ruleChainType in ruleChainTypes" value="{{ruleChainType}}">
{{ruleChainType}}
</md-option>
</md-select>
</md-input-container>
<md-input-container class="md-block">
<md-checkbox ng-disabled="$root.loading || !isEdit" aria-label="{{ 'rulechain.debug-mode' | translate }}"
ng-model="ruleChain.debugMode">{{ 'rulechain.debug-mode' | translate }}

7
ui/src/app/rulechain/rulechain.directive.js
View File

@ -22,9 +22,16 @@ import ruleChainFieldsetTemplate from './rulechain-fieldset.tpl.html';
/*@ngInject*/
export default function RuleChainDirective($compile, $templateCache, $mdDialog, $document, $q, $translate, types, toast) {
var linker = function (scope, element) {
var template = $templateCache.get(ruleChainFieldsetTemplate);
element.html(template);
scope.ruleChainTypes = types.ruleChainTypes;
if (angular.isDefined(scope.ruleChain) && scope.ruleChain != null && angular.isUndefined(scope.ruleChain.type)) {
scope.ruleChain.type = types.systemRuleChainType;
}
scope.onRuleChainIdCopied = function() {
toast.showSuccess($translate.instant('rulechain.idCopiedMessage'), 750, angular.element(element).parent().parent(), 'bottom left');
};