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

added to tenant fields isolatedTbCore and isolatedTbRuleEngine (#2611)

Browse Source 
Co-authored-by: Andrew Shvayka <ashvayka@thingsboard.io>
This commit is contained in:
Yevhen Bondarenko 2020-04-13 10:24:40 +03:00 committed by GitHub
parent 8442159811
commit 7869fb5ef4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 134 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -290,6 +290,20 @@ public class CassandraDatabaseUpgradeService extends AbstractCassandraDatabaseUp
log.info("Attributes updated.");
} catch (InvalidQueryException e) {
}
String updateTenantCoreTableStmt = "alter table tenant add isolated_tb_core boolean";
String updateTenantRuleEngineTableStmt = "alter table tenant add isolated_tb_rule_engine boolean";
try {
log.info("Updating tenant...");
cluster.getSession().execute(updateTenantCoreTableStmt);
Thread.sleep(2500);
cluster.getSession().execute(updateTenantRuleEngineTableStmt);
Thread.sleep(2500);
log.info("Tenant updated.");
} catch (InvalidQueryException e) {
}
log.info("Schema updated.");
break;
default:

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

@ -221,6 +221,7 @@ public class SqlDatabaseUpgradeService implements DatabaseEntitiesUpgradeService
}
}
}
conn.createStatement().execute("ALTER TABLE tenant ADD COLUMN isolated_tb_core boolean DEFAULT (false), ADD COLUMN isolated_tb_rule_engine boolean DEFAULT (false)");
log.info("Schema updated.");
}
break;

22
common/data/src/main/java/org/thingsboard/server/common/data/Tenant.java
View File

@ -29,6 +29,8 @@ public class Tenant extends ContactBased<TenantId> implements HasTenantId {
private String title;
private String region;
private boolean isolatedTbCore;
private boolean isolatedTbRuleEngine;
public Tenant() {
super();
@ -72,6 +74,22 @@ public class Tenant extends ContactBased<TenantId> implements HasTenantId {
this.region = region;
}
public boolean isIsolatedTbCore() {
return isolatedTbCore;
}
public void setIsolatedTbCore(boolean isolatedTbCore) {
this.isolatedTbCore = isolatedTbCore;
}
public boolean isIsolatedTbRuleEngine() {
return isolatedTbRuleEngine;
}
public void setIsolatedTbRuleEngine(boolean isolatedTbRuleEngine) {
this.isolatedTbRuleEngine = isolatedTbRuleEngine;
}
@Override
public String getSearchText() {
return getTitle();
@ -84,6 +102,10 @@ public class Tenant extends ContactBased<TenantId> implements HasTenantId {
builder.append(title);
builder.append(", region=");
builder.append(region);
builder.append(", isolatedTbCore=");
builder.append(isolatedTbCore);
builder.append(", isolatedTbRuleEngine=");
builder.append(isolatedTbRuleEngine);
builder.append(", additionalInfo=");
builder.append(getAdditionalInfo());
builder.append(", country=");

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

@ -112,6 +112,8 @@ public class ModelConstants {
public static final String TENANT_TITLE_PROPERTY = TITLE_PROPERTY;
public static final String TENANT_REGION_PROPERTY = "region";
public static final String TENANT_ADDITIONAL_INFO_PROPERTY = ADDITIONAL_INFO_PROPERTY;
public static final String TENANT_ISOLATED_TB_CORE = "isolated_tb_core";
public static final String TENANT_ISOLATED_TB_RULE_ENGINE = "isolated_tb_rule_engine";
public static final String TENANT_BY_REGION_AND_SEARCH_TEXT_COLUMN_FAMILY_NAME = "tenant_by_region_and_search_text";

35
dao/src/main/java/org/thingsboard/server/dao/model/nosql/TenantEntity.java
View File

@ -24,6 +24,7 @@ import lombok.EqualsAndHashCode;
import lombok.ToString;
import org.thingsboard.server.common.data.Tenant;
import org.thingsboard.server.common.data.id.TenantId;
import org.thingsboard.server.dao.model.ModelConstants;
import org.thingsboard.server.dao.model.SearchTextEntity;
import org.thingsboard.server.dao.model.type.JsonCodec;
@ -55,16 +56,16 @@ public final class TenantEntity implements SearchTextEntity<Tenant> {
@Column(name = TENANT_TITLE_PROPERTY)
private String title;
@Column(name = SEARCH_TEXT_PROPERTY)
private String searchText;
@Column(name = TENANT_REGION_PROPERTY)
private String region;
@Column(name = COUNTRY_PROPERTY)
private String country;
@Column(name = STATE_PROPERTY)
private String state;
@ -89,6 +90,12 @@ public final class TenantEntity implements SearchTextEntity<Tenant> {
@Column(name = TENANT_ADDITIONAL_INFO_PROPERTY, codec = JsonCodec.class)
private JsonNode additionalInfo;
@Column(name = ModelConstants.TENANT_ISOLATED_TB_CORE)
private boolean isolatedTbCore;
@Column(name = ModelConstants.TENANT_ISOLATED_TB_RULE_ENGINE)
private boolean isolatedTbRuleEngine;
public TenantEntity() {
super();
}
@ -108,6 +115,8 @@ public final class TenantEntity implements SearchTextEntity<Tenant> {
this.phone = tenant.getPhone();
this.email = tenant.getEmail();
this.additionalInfo = tenant.getAdditionalInfo();
this.isolatedTbCore = tenant.isIsolatedTbCore();
this.isolatedTbRuleEngine = tenant.isIsolatedTbRuleEngine();
}
public UUID getUuid() {
@ -206,6 +215,22 @@ public final class TenantEntity implements SearchTextEntity<Tenant> {
this.additionalInfo = additionalInfo;
}
public boolean isIsolatedTbCore() {
return isolatedTbCore;
}
public void setIsolatedTbCore(boolean isolatedTbCore) {
this.isolatedTbCore = isolatedTbCore;
}
public boolean isIsolatedTbRuleEngine() {
return isolatedTbRuleEngine;
}
public void setIsolatedTbRuleEngine(boolean isolatedTbRuleEngine) {
this.isolatedTbRuleEngine = isolatedTbRuleEngine;
}
@Override
public String getSearchTextSource() {
return getTitle();
@ -215,7 +240,7 @@ public final class TenantEntity implements SearchTextEntity<Tenant> {
public void setSearchText(String searchText) {
this.searchText = searchText;
}
public String getSearchText() {
return searchText;
}
@ -235,6 +260,8 @@ public final class TenantEntity implements SearchTextEntity<Tenant> {
tenant.setPhone(phone);
tenant.setEmail(email);
tenant.setAdditionalInfo(additionalInfo);
tenant.setIsolatedTbCore(isolatedTbCore);
tenant.setIsolatedTbRuleEngine(isolatedTbRuleEngine);
return tenant;
}

10
dao/src/main/java/org/thingsboard/server/dao/model/sql/TenantEntity.java
View File

@ -72,6 +72,12 @@ public final class TenantEntity extends BaseSqlEntity<Tenant> implements SearchT
@Column(name = ModelConstants.EMAIL_PROPERTY)
private String email;
@Column(name = ModelConstants.TENANT_ISOLATED_TB_CORE)
private boolean isolatedTbCore;
@Column(name = ModelConstants.TENANT_ISOLATED_TB_RULE_ENGINE)
private boolean isolatedTbRuleEngine;
@Type(type = "json")
@Column(name = ModelConstants.TENANT_ADDITIONAL_INFO_PROPERTY)
private JsonNode additionalInfo;
@ -95,6 +101,8 @@ public final class TenantEntity extends BaseSqlEntity<Tenant> implements SearchT
this.phone = tenant.getPhone();
this.email = tenant.getEmail();
this.additionalInfo = tenant.getAdditionalInfo();
this.isolatedTbCore = tenant.isIsolatedTbCore();
this.isolatedTbRuleEngine = tenant.isIsolatedTbRuleEngine();
}
@Override
@ -126,6 +134,8 @@ public final class TenantEntity extends BaseSqlEntity<Tenant> implements SearchT
tenant.setPhone(phone);
tenant.setEmail(email);
tenant.setAdditionalInfo(additionalInfo);
tenant.setIsolatedTbCore(isolatedTbCore);
tenant.setIsolatedTbRuleEngine(isolatedTbRuleEngine);
return tenant;
}

2
dao/src/main/resources/cassandra/schema-entities.cql
View File

@ -110,6 +110,8 @@ CREATE TABLE IF NOT EXISTS thingsboard.tenant (
phone text,
email text,
additional_info text,
isolated_tb_core boolean,
isolated_tb_rule_engine boolean,
PRIMARY KEY (id, region)
);

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

@ -183,7 +183,9 @@ CREATE TABLE IF NOT EXISTS tenant (
search_text varchar(255),
state varchar(255),
title varchar(255),
zip varchar(255)
zip varchar(255),
isolated_tb_core boolean,
isolated_tb_rule_engine boolean
);
CREATE TABLE IF NOT EXISTS user_credentials (

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

@ -183,7 +183,9 @@ CREATE TABLE IF NOT EXISTS tenant (
search_text varchar(255),
state varchar(255),
title varchar(255),
zip varchar(255)
zip varchar(255),
isolated_tb_core boolean,
isolated_tb_rule_engine boolean
);
CREATE TABLE IF NOT EXISTS user_credentials (

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

@ -1508,7 +1508,11 @@
"idCopiedMessage": "Tenant Id has been copied to clipboard",
"select-tenant": "Select tenant",
"no-tenants-matching": "No tenants matching '{{entity}}' were found.",
"tenant-required": "Tenant is required"
"tenant-required": "Tenant is required",
"isolated-tb-core": "Processing in isolated ThingsBoard Core container",
"isolated-tb-rule-engine": "Processing in isolated ThingsBoard Rule Engine container",
"isolated-tb-core-details": "Requires separate microservice(s) per isolated Tenant",
"isolated-tb-rule-engine-details": "Requires separate microservice(s) per isolated Tenant"
},
"timeinterval": {
"seconds-interval": "{ seconds, plural, 1 {1 second} other {# seconds} }",

64
ui/src/app/tenant/tenant-fieldset.tpl.html
View File

@ -15,32 +15,50 @@
limitations under the License.
-->
<md-button ng-click="onManageUsers({event: $event})" ng-show="!isEdit" class="md-raised md-primary">{{ 'tenant.manage-tenant-admins' | translate }}</md-button>
<md-button ng-click="onDeleteTenant({event: $event})" ng-show="!isEdit" class="md-raised md-primary">{{ 'tenant.delete' | translate }}</md-button>
<md-button ng-click="onManageUsers({event: $event})" ng-show="!isEdit" class="md-raised md-primary">{{
'tenant.manage-tenant-admins' | translate }}
</md-button>
<md-button ng-click="onDeleteTenant({event: $event})" ng-show="!isEdit" class="md-raised md-primary">{{ 'tenant.delete'
| translate }}
</md-button>
<div layout="row">
<md-button ngclipboard data-clipboard-action="copy"
ngclipboard-success="onTenantIdCopied(e)"
data-clipboard-text="{{tenant.id.id}}" ng-show="!isEdit"
class="md-raised">
<md-icon md-svg-icon="mdi:clipboard-arrow-left"></md-icon>
<span translate>tenant.copyId</span>
</md-button>
<md-button ngclipboard data-clipboard-action="copy"
ngclipboard-success="onTenantIdCopied(e)"
data-clipboard-text="{{tenant.id.id}}" ng-show="!isEdit"
class="md-raised">
<md-icon md-svg-icon="mdi:clipboard-arrow-left"></md-icon>
<span translate>tenant.copyId</span>
</md-button>
</div>
<md-content class="md-padding" layout="column">
<fieldset ng-disabled="$root.loading || !isEdit">
<md-input-container class="md-block">
<label translate>tenant.title</label>
<input required name="title" ng-model="tenant.title">
<div ng-messages="theForm.title.$error">
<div translate ng-message="required">tenant.title-required</div>
</div>
</md-input-container>
<md-input-container class="md-block">
<label translate>tenant.description</label>
<textarea ng-model="tenant.additionalInfo.description" rows="2"></textarea>
</md-input-container>
<tb-contact contact="tenant" the-form="theForm" is-edit="isEdit"></tb-contact>
</fieldset>
<fieldset ng-disabled="$root.loading || !isEdit">
<md-input-container class="md-block">
<label translate>tenant.title</label>
<input required name="title" ng-model="tenant.title">
<div ng-messages="theForm.title.$error">
<div translate ng-message="required">tenant.title-required</div>
</div>
</md-input-container>
<md-input-container class="md-block">
<label translate>tenant.description</label>
<textarea ng-model="tenant.additionalInfo.description" rows="2"></textarea>
</md-input-container>
<tb-contact contact="tenant" the-form="theForm" is-edit="isEdit"></tb-contact>
<md-input-container class="md-block">
<md-checkbox ng-disabled="$root.loading || !isEdit"
ng-model="tenant.isolatedTbCore">
{{'tenant.isolated-tb-core' | translate}}<br/>
<span style="font-size: 10px">{{'tenant.isolated-tb-core-details' | translate}}</span>
</md-checkbox>
</md-input-container>
<md-input-container class="md-block">
<md-checkbox ng-disabled="$root.loading || !isEdit"
ng-model="tenant.isolatedTbRuleEngine">
{{'tenant.isolated-tb-rule-engine' | translate}}<br/>
<span style="font-size: 10px">{{'tenant.isolated-tb-rule-engine-details' | translate}}</span>
</md-checkbox>
</md-input-container>
</fieldset>
</md-content>