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

Fix compilation errors. UI: Add entity view VC support.

Browse Source
This commit is contained in:
Igor Kulikov 2022-06-14 11:18:38 +03:00
parent f25dd50254
commit 86b88c2699
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
application/src/main/java/org/thingsboard/server/service/sync/ie/importing/impl/EntityViewImportService.java
View File

@ -20,14 +20,15 @@ import org.springframework.stereotype.Service;
import org.thingsboard.server.common.data.EntityType; import org.thingsboard.server.common.data.EntityType;
import org.thingsboard.server.common.data.EntityView; import org.thingsboard.server.common.data.EntityView;
import org.thingsboard.server.common.data.audit.ActionType; import org.thingsboard.server.common.data.audit.ActionType;
import org.thingsboard.server.common.data.edge.EdgeEventActionType;
import org.thingsboard.server.common.data.exception.ThingsboardException; import org.thingsboard.server.common.data.exception.ThingsboardException;
import org.thingsboard.server.common.data.id.EntityViewId; import org.thingsboard.server.common.data.id.EntityViewId;
import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.id.TenantId;
import org.thingsboard.server.common.data.sync.ie.EntityExportData; import org.thingsboard.server.common.data.sync.ie.EntityExportData;
import org.thingsboard.server.common.data.sync.ie.EntityImportSettings;
import org.thingsboard.server.dao.entityview.EntityViewService; import org.thingsboard.server.dao.entityview.EntityViewService;
import org.thingsboard.server.queue.util.TbCoreComponent; import org.thingsboard.server.queue.util.TbCoreComponent;
import org.thingsboard.server.service.security.model.SecurityUser; import org.thingsboard.server.service.security.model.SecurityUser;
import org.thingsboard.server.service.sync.vc.data.EntitiesImportCtx;
@Service @Service
@TbCoreComponent @TbCoreComponent
@ -43,15 +44,17 @@ public class EntityViewImportService extends BaseEntityImportService<EntityViewI
} }
@Override @Override
protected EntityView prepareAndSave(TenantId tenantId, EntityView entityView, EntityExportData<EntityView> exportData, IdProvider idProvider, EntityImportSettings importSettings) { protected EntityView prepareAndSave(EntitiesImportCtx ctx, EntityView entityView, EntityExportData<EntityView> exportData, IdProvider idProvider) {
entityView.setEntityId(idProvider.getInternalId(entityView.getEntityId())); entityView.setEntityId(idProvider.getInternalId(entityView.getEntityId()));
return entityViewService.saveEntityView(entityView); return entityViewService.saveEntityView(entityView);
} }
@Override @Override
protected void onEntitySaved(SecurityUser user, EntityView savedEntityView, EntityView oldEntityView) throws ThingsboardException { protected void onEntitySaved(SecurityUser user, EntityView savedEntityView, EntityView oldEntityView) throws ThingsboardException {
entityNotificationService.notifyCreateOrUpdateEntity(user.getTenantId(), savedEntityView.getId(), savedEntityView, super.onEntitySaved(user, savedEntityView, oldEntityView);
null, oldEntityView == null ? ActionType.ADDED : ActionType.UPDATED, user); if (oldEntityView != null) {
entityActionService.sendEntityNotificationMsgToEdgeService(user.getTenantId(), savedEntityView.getId(), EdgeEventActionType.UPDATED);
}
} }
@Override @Override

6
ui-ngx/src/app/modules/home/pages/entity-view/entity-view-tabs.component.html
View File

@ -49,3 +49,9 @@
label="{{ 'audit-log.audit-logs' | translate }}" #auditLogsTab="matTab"> label="{{ 'audit-log.audit-logs' | translate }}" #auditLogsTab="matTab">
<tb-audit-log-table detailsMode="true" [active]="auditLogsTab.isActive" [auditLogMode]="auditLogModes.ENTITY" [entityId]="entity.id"></tb-audit-log-table> <tb-audit-log-table detailsMode="true" [active]="auditLogsTab.isActive" [auditLogMode]="auditLogModes.ENTITY" [entityId]="entity.id"></tb-audit-log-table>
</mat-tab> </mat-tab>
<mat-tab *ngIf="entity && authUser.authority === authorities.TENANT_ADMIN"
label="{{ 'version-control.version-control' | translate }}" #versionControlTab="matTab">
<tb-version-control detailsMode="true" singleEntityMode="true"
(versionRestored)="entitiesTableConfig.updateData()"
[active]="versionControlTab.isActive" [entityId]="entity.id" [entityName]="entity.name" [externalEntityId]="entity.externalId || entity.id"></tb-version-control>
</mat-tab>

1
ui-ngx/src/app/shared/models/vc.models.ts
View File

@ -24,6 +24,7 @@ import { RuleChain, RuleChainMetaData } from '@shared/models/rule-chain.models';
export const exportableEntityTypes: Array<EntityType> = [ export const exportableEntityTypes: Array<EntityType> = [
EntityType.ASSET, EntityType.ASSET,
EntityType.DEVICE, EntityType.DEVICE,
EntityType.ENTITY_VIEW,
EntityType.DASHBOARD, EntityType.DASHBOARD,
EntityType.CUSTOMER, EntityType.CUSTOMER,
EntityType.DEVICE_PROFILE, EntityType.DEVICE_PROFILE,