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

Fix import of public dashboard

Browse Source
This commit is contained in:
Viacheslav Klimov 2022-06-02 16:19:22 +03:00
parent 468bc44d5d
commit c51302eaa5
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,6 +24,7 @@ import org.thingsboard.server.common.data.exception.ThingsboardException;
import org.thingsboard.server.common.data.id.CustomerId; import org.thingsboard.server.common.data.id.CustomerId;
import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.id.TenantId;
import org.thingsboard.server.common.data.sync.ie.EntityImportSettings; import org.thingsboard.server.common.data.sync.ie.EntityImportSettings;
import org.thingsboard.server.dao.customer.CustomerDao;
import org.thingsboard.server.dao.customer.CustomerService; import org.thingsboard.server.dao.customer.CustomerService;
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;
@ -35,6 +36,7 @@ import org.thingsboard.server.common.data.sync.ie.EntityExportData;
public class CustomerImportService extends BaseEntityImportService<CustomerId, Customer, EntityExportData<Customer>> { public class CustomerImportService extends BaseEntityImportService<CustomerId, Customer, EntityExportData<Customer>> {
private final CustomerService customerService; private final CustomerService customerService;
private final CustomerDao customerDao;
@Override @Override
protected void setOwner(TenantId tenantId, Customer customer, IdProvider idProvider) { protected void setOwner(TenantId tenantId, Customer customer, IdProvider idProvider) {
@ -43,10 +45,12 @@ public class CustomerImportService extends BaseEntityImportService<CustomerId, C
@Override @Override
protected Customer prepareAndSave(TenantId tenantId, Customer customer, EntityExportData<Customer> exportData, IdProvider idProvider, EntityImportSettings importSettings) { protected Customer prepareAndSave(TenantId tenantId, Customer customer, EntityExportData<Customer> exportData, IdProvider idProvider, EntityImportSettings importSettings) {
if (customer.isPublic()) { if (!customer.isPublic()) {
return customerService.findOrCreatePublicCustomer(tenantId);
} else {
return customerService.saveCustomer(customer); return customerService.saveCustomer(customer);
} else {
Customer publicCustomer = customerService.findOrCreatePublicCustomer(tenantId);
publicCustomer.setExternalId(customer.getExternalId());
return customerDao.save(tenantId, publicCustomer);
} }
} }

2
application/src/main/java/org/thingsboard/server/service/sync/vc/DefaultEntitiesVersionControlService.java
View File

@ -340,7 +340,7 @@ public class DefaultEntitiesVersionControlService implements EntitiesVersionCont
DaoUtil.processInBatches(pageLink -> { DaoUtil.processInBatches(pageLink -> {
return exportableEntitiesService.findEntitiesByTenantId(user.getTenantId(), entityType, pageLink); return exportableEntitiesService.findEntitiesByTenantId(user.getTenantId(), entityType, pageLink);
}, 100, entity -> { }, 100, entity -> {
if (!importedEntities.get(entityType).contains(entity.getId())) { if (importedEntities.get(entityType) == null || !importedEntities.get(entityType).contains(entity.getId())) {
try { try {
exportableEntitiesService.checkPermission(user, entity, entityType, Operation.DELETE); exportableEntitiesService.checkPermission(user, entity, entityType, Operation.DELETE);
} catch (ThingsboardException e) { } catch (ThingsboardException e) {