fetch attribute types for upgrade improvements
This commit is contained in:
YevhenBondarenko
parent
a9dabe14ca
commit
2d2d78ae6b
@ -34,12 +34,13 @@ import org.thingsboard.server.common.data.queue.ProcessingStrategyType;
|
||||
import org.thingsboard.server.common.data.queue.Queue;
|
||||
import org.thingsboard.server.common.data.queue.SubmitStrategy;
|
||||
import org.thingsboard.server.common.data.queue.SubmitStrategyType;
|
||||
import org.thingsboard.server.dao.asset.AssetDao;
|
||||
import org.thingsboard.server.dao.asset.AssetProfileService;
|
||||
import org.thingsboard.server.dao.dashboard.DashboardService;
|
||||
import org.thingsboard.server.dao.device.DeviceProfileService;
|
||||
import org.thingsboard.server.dao.device.DeviceService;
|
||||
import org.thingsboard.server.dao.model.sql.TbPair;
|
||||
import org.thingsboard.server.dao.queue.QueueService;
|
||||
import org.thingsboard.server.dao.sql.asset.AssetRepository;
|
||||
import org.thingsboard.server.dao.tenant.TenantService;
|
||||
import org.thingsboard.server.dao.usagerecord.ApiUsageStateService;
|
||||
import org.thingsboard.server.queue.settings.TbRuleEngineQueueConfiguration;
|
||||
@ -57,7 +58,10 @@ import java.sql.SQLSyntaxErrorException;
|
||||
import java.sql.SQLWarning;
|
||||
import java.sql.Statement;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
import java.util.UUID;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
import static org.thingsboard.server.service.install.DatabaseHelper.ADDITIONAL_INFO;
|
||||
@ -111,7 +115,7 @@ public class SqlDatabaseUpgradeService implements DatabaseEntitiesUpgradeService
|
||||
private DeviceService deviceService;
|
||||
|
||||
@Autowired
|
||||
private AssetRepository assetRepository;
|
||||
private AssetDao assetDao;
|
||||
|
||||
@Autowired
|
||||
private DeviceProfileService deviceProfileService;
|
||||
@ -619,24 +623,27 @@ public class SqlDatabaseUpgradeService implements DatabaseEntitiesUpgradeService
|
||||
loadSql(schemaUpdateFile, conn);
|
||||
|
||||
log.info("Creating default asset profiles...");
|
||||
PageLink pageLink = new PageLink(100);
|
||||
PageData<Tenant> pageData;
|
||||
PageLink pageLink = new PageLink(1000);
|
||||
PageData<TbPair<UUID, String>> pageData;
|
||||
List<ListenableFuture<?>> futures = new ArrayList<>();
|
||||
Set<TenantId> tenants = new HashSet<>();
|
||||
do {
|
||||
pageData = tenantService.findTenants(pageLink);
|
||||
for (Tenant tenant : pageData.getData()) {
|
||||
List<String> assetTypes = assetRepository.findTenantAssetTypes(tenant.getUuidId());
|
||||
assetTypes.remove("default");
|
||||
|
||||
try {
|
||||
futures.add(dbUpgradeExecutor.submit(() -> assetProfileService.createDefaultAssetProfile(tenant.getId())));
|
||||
} catch (Exception e) {
|
||||
}
|
||||
for (String assetType : assetTypes) {
|
||||
pageData = assetDao.getAllAssetTypes(pageLink);
|
||||
for (TbPair<UUID, String> pair : pageData.getData()) {
|
||||
TenantId tenantId = new TenantId(pair.getFirst());
|
||||
String assetType = pair.getSecond();
|
||||
if (tenants.add(tenantId)) {
|
||||
try {
|
||||
futures.add(dbUpgradeExecutor.submit(() -> assetProfileService.findOrCreateAssetProfile(tenant.getId(), assetType)));
|
||||
} catch (Exception e) {
|
||||
}
|
||||
futures.add(dbUpgradeExecutor.submit(() ->
|
||||
assetProfileService.createDefaultAssetProfile(tenantId)));
|
||||
} catch (Exception e) {}
|
||||
}
|
||||
|
||||
if (!"default".equals(assetType)) {
|
||||
try {
|
||||
futures.add(dbUpgradeExecutor.submit(() ->
|
||||
assetProfileService.findOrCreateAssetProfile(tenantId, assetType)));
|
||||
} catch (Exception e) {}
|
||||
}
|
||||
}
|
||||
pageLink = pageLink.nextPageLink();
|
||||
|
||||
@ -26,6 +26,7 @@ import org.thingsboard.server.common.data.page.PageLink;
|
||||
import org.thingsboard.server.dao.Dao;
|
||||
import org.thingsboard.server.dao.ExportableEntityDao;
|
||||
import org.thingsboard.server.dao.TenantEntityDao;
|
||||
import org.thingsboard.server.dao.model.sql.TbPair;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
@ -222,4 +223,6 @@ public interface AssetDao extends Dao<Asset>, TenantEntityDao, ExportableEntityD
|
||||
* @return the list of asset objects
|
||||
*/
|
||||
PageData<Asset> findAssetsByTenantIdAndEdgeIdAndType(UUID tenantId, UUID edgeId, String type, PageLink pageLink);
|
||||
|
||||
PageData<TbPair<UUID, String>> getAllAssetTypes(PageLink pageLink);
|
||||
}
|
||||
|
||||
@ -0,0 +1,26 @@
|
||||
/**
|
||||
* Copyright © 2016-2022 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.sql;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
public class TbPair<S, T> {
|
||||
private S first;
|
||||
private T second;
|
||||
}
|
||||
@ -23,6 +23,7 @@ import org.springframework.data.repository.query.Param;
|
||||
import org.thingsboard.server.dao.ExportableEntityRepository;
|
||||
import org.thingsboard.server.dao.model.sql.AssetEntity;
|
||||
import org.thingsboard.server.dao.model.sql.AssetInfoEntity;
|
||||
import org.thingsboard.server.dao.model.sql.TbPair;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
@ -70,9 +71,9 @@ public interface AssetRepository extends JpaRepository<AssetEntity, UUID>, Expor
|
||||
"AND a.assetProfileId = :profileId " +
|
||||
"AND LOWER(a.searchText) LIKE LOWER(CONCAT('%', :searchText, '%'))")
|
||||
Page<AssetEntity> findByTenantIdAndProfileId(@Param("tenantId") UUID tenantId,
|
||||
@Param("profileId") UUID profileId,
|
||||
@Param("searchText") String searchText,
|
||||
Pageable pageable);
|
||||
@Param("profileId") UUID profileId,
|
||||
@Param("searchText") String searchText,
|
||||
Pageable pageable);
|
||||
|
||||
@Query("SELECT new org.thingsboard.server.dao.model.sql.AssetInfoEntity(a, c.title, c.additionalInfo, p.name) " +
|
||||
"FROM AssetEntity a " +
|
||||
@ -186,14 +187,17 @@ public interface AssetRepository extends JpaRepository<AssetEntity, UUID>, Expor
|
||||
"AND a.type = :type " +
|
||||
"AND LOWER(a.searchText) LIKE LOWER(CONCAT('%', :searchText, '%'))")
|
||||
Page<AssetEntity> findByTenantIdAndEdgeIdAndType(@Param("tenantId") UUID tenantId,
|
||||
@Param("edgeId") UUID edgeId,
|
||||
@Param("type") String type,
|
||||
@Param("searchText") String searchText,
|
||||
Pageable pageable);
|
||||
@Param("edgeId") UUID edgeId,
|
||||
@Param("type") String type,
|
||||
@Param("searchText") String searchText,
|
||||
Pageable pageable);
|
||||
|
||||
Long countByTenantIdAndTypeIsNot(UUID tenantId, String type);
|
||||
|
||||
@Query("SELECT externalId FROM AssetEntity WHERE id = :id")
|
||||
UUID getExternalIdById(@Param("id") UUID id);
|
||||
|
||||
@Query(value = "SELECT DISTINCT new org.thingsboard.server.dao.model.sql.TbPair(a.tenantId , a.type) FROM AssetEntity a")
|
||||
Page<TbPair<UUID, String>> getAllAssetTypes(Pageable pageable);
|
||||
|
||||
}
|
||||
|
||||
@ -28,14 +28,17 @@ import org.thingsboard.server.common.data.id.AssetId;
|
||||
import org.thingsboard.server.common.data.id.TenantId;
|
||||
import org.thingsboard.server.common.data.page.PageData;
|
||||
import org.thingsboard.server.common.data.page.PageLink;
|
||||
import org.thingsboard.server.common.data.page.SortOrder;
|
||||
import org.thingsboard.server.dao.DaoUtil;
|
||||
import org.thingsboard.server.dao.asset.AssetDao;
|
||||
import org.thingsboard.server.dao.model.sql.AssetEntity;
|
||||
import org.thingsboard.server.dao.model.sql.AssetInfoEntity;
|
||||
import org.thingsboard.server.dao.model.sql.TbPair;
|
||||
import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao;
|
||||
import org.thingsboard.server.dao.util.SqlDao;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
@ -243,6 +246,12 @@ public class JpaAssetDao extends JpaAbstractSearchTextDao<AssetEntity, Asset> im
|
||||
DaoUtil.toPageable(pageLink)));
|
||||
}
|
||||
|
||||
public PageData<TbPair<UUID, String>> getAllAssetTypes(PageLink pageLink) {
|
||||
log.debug("Try to find all asset types and pageLink [{}]", pageLink);
|
||||
return DaoUtil.pageToPageData(assetRepository.getAllAssetTypes(
|
||||
DaoUtil.toPageable(pageLink, Arrays.asList(new SortOrder("tenantId"), new SortOrder("type")))));
|
||||
}
|
||||
|
||||
@Override
|
||||
public Long countByTenantId(TenantId tenantId) {
|
||||
return assetRepository.countByTenantIdAndTypeIsNot(tenantId.getId(), TB_SERVICE_QUEUE);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user