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

Minor changes

Browse Source
This commit is contained in:
Igor Kulikov 2022-09-23 19:26:50 +03:00
parent afa69f6f78
commit 34339c6532
5 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
application/src/main/data/upgrade/3.4.1/schema_update_before.sql
View File

@ -15,9 +15,9 @@
-- --
CREATE TABLE IF NOT EXISTS asset_profile ( CREATE TABLE IF NOT EXISTS asset_profile (
id uuid NOT NULL CONSTRAINT asset_profile_pkey PRIMARY KEY, id uuid NOT NULL CONSTRAINT asset_profile_pkey PRIMARY KEY,
created_time bigint NOT NULL, created_time bigint NOT NULL,
name varchar(255), name varchar(255),
image varchar(1000000), image varchar(1000000),
description varchar, description varchar,
search_text varchar(255), search_text varchar(255),

1
application/src/main/java/org/thingsboard/server/service/asset/AssetBulkImportService.java
View File

@ -21,7 +21,6 @@ import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows; import lombok.SneakyThrows;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.thingsboard.common.util.JacksonUtil; import org.thingsboard.common.util.JacksonUtil;
import org.thingsboard.server.common.data.DeviceProfile;
import org.thingsboard.server.common.data.EntityType; import org.thingsboard.server.common.data.EntityType;
import org.thingsboard.server.common.data.StringUtils; import org.thingsboard.server.common.data.StringUtils;
import org.thingsboard.server.common.data.asset.Asset; import org.thingsboard.server.common.data.asset.Asset;

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

@ -28,7 +28,6 @@ import org.thingsboard.server.common.data.plugin.ComponentLifecycleEvent;
import org.thingsboard.server.common.data.sync.ie.EntityExportData; import org.thingsboard.server.common.data.sync.ie.EntityExportData;
import org.thingsboard.server.dao.asset.AssetProfileService; import org.thingsboard.server.dao.asset.AssetProfileService;
import org.thingsboard.server.queue.util.TbCoreComponent; import org.thingsboard.server.queue.util.TbCoreComponent;
import org.thingsboard.server.service.ota.OtaPackageStateService;
import org.thingsboard.server.service.sync.vc.data.EntitiesImportCtx; import org.thingsboard.server.service.sync.vc.data.EntitiesImportCtx;
@Service @Service
@ -37,7 +36,6 @@ import org.thingsboard.server.service.sync.vc.data.EntitiesImportCtx;
public class AssetProfileImportService extends BaseEntityImportService<AssetProfileId, AssetProfile, EntityExportData<AssetProfile>> { public class AssetProfileImportService extends BaseEntityImportService<AssetProfileId, AssetProfile, EntityExportData<AssetProfile>> {
private final AssetProfileService assetProfileService; private final AssetProfileService assetProfileService;
private final OtaPackageStateService otaPackageStateService;
@Override @Override
protected void setOwner(TenantId tenantId, AssetProfile assetProfile, IdProvider idProvider) { protected void setOwner(TenantId tenantId, AssetProfile assetProfile, IdProvider idProvider) {

1
common/data/src/main/java/org/thingsboard/server/common/data/asset/Asset.java
View File

@ -29,7 +29,6 @@ import org.thingsboard.server.common.data.SearchTextBasedWithAdditionalInfo;
import org.thingsboard.server.common.data.id.AssetId; import org.thingsboard.server.common.data.id.AssetId;
import org.thingsboard.server.common.data.id.AssetProfileId; import org.thingsboard.server.common.data.id.AssetProfileId;
import org.thingsboard.server.common.data.id.CustomerId; import org.thingsboard.server.common.data.id.CustomerId;
import org.thingsboard.server.common.data.id.DeviceProfileId;
import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.id.TenantId;
import org.thingsboard.server.common.data.validation.Length; import org.thingsboard.server.common.data.validation.Length;
import org.thingsboard.server.common.data.validation.NoXss; import org.thingsboard.server.common.data.validation.NoXss;

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

@ -226,9 +226,9 @@ CREATE TABLE IF NOT EXISTS queue (
); );
CREATE TABLE IF NOT EXISTS asset_profile ( CREATE TABLE IF NOT EXISTS asset_profile (
id uuid NOT NULL CONSTRAINT asset_profile_pkey PRIMARY KEY, id uuid NOT NULL CONSTRAINT asset_profile_pkey PRIMARY KEY,
created_time bigint NOT NULL, created_time bigint NOT NULL,
name varchar(255), name varchar(255),
image varchar(1000000), image varchar(1000000),
description varchar, description varchar,
search_text varchar(255), search_text varchar(255),
@ -245,12 +245,12 @@ CREATE TABLE IF NOT EXISTS asset_profile (
); );
CREATE TABLE IF NOT EXISTS asset ( CREATE TABLE IF NOT EXISTS asset (
id uuid NOT NULL CONSTRAINT asset_pkey PRIMARY KEY, id uuid NOT NULL CONSTRAINT asset_pkey PRIMARY KEY,
created_time bigint NOT NULL, created_time bigint NOT NULL,
additional_info varchar, additional_info varchar,
customer_id uuid, customer_id uuid,
asset_profile_id uuid NOT NULL, asset_profile_id uuid NOT NULL,
name varchar(255), name varchar(255),
label varchar(255), label varchar(255),
search_text varchar(255), search_text varchar(255),
tenant_id uuid, tenant_id uuid,