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

Fix minor issues. Merged with develop/3.5.2

Browse Source
This commit is contained in:
Andrii Shvaika 2023-06-01 15:10:08 +03:00
parent d09dba8fcb
commit be41ec8bef
6 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -638,7 +638,8 @@ public class SqlDatabaseUpgradeService implements DatabaseEntitiesUpgradeService
futures.add(dbUpgradeExecutor.submit(() -> {
try {
assetProfileService.createDefaultAssetProfile(tenantId);
} catch (Exception e) {}
} catch (Exception e) {
}
}));
}
Futures.allAsList(futures).get();
@ -657,7 +658,8 @@ public class SqlDatabaseUpgradeService implements DatabaseEntitiesUpgradeService
futures.add(dbUpgradeExecutor.submit(() -> {
try {
assetProfileService.findOrCreateAssetProfile(tenantId, assetType);
} catch (Exception e) {}
} catch (Exception e) {
}
}));
}
}
@ -734,12 +736,14 @@ public class SqlDatabaseUpgradeService implements DatabaseEntitiesUpgradeService
schemaUpdateFile = Paths.get(installScripts.getDataDir(), "upgrade", "3.5.1", SCHEMA_UPDATE_SQL);
loadSql(schemaUpdateFile, conn);
try {
String [] entityNames = new String [] {"device", "component_descriptor", "customer", "dashboard", "rule_chain", "rule_node", "asset_profile", "asset", "device_profile", "tb_user", "tenant_profile", "tenant", "widgets_bundle", "entity_view", "edge"};
for (String entityName : entityNames) {
String[] entityNames = new String[]{"device", "component_descriptor", "customer", "dashboard", "rule_chain", "rule_node", "ota_package",
"asset_profile", "asset", "device_profile", "tb_user", "tenant_profile", "tenant", "widgets_bundle", "entity_view", "edge"};
for (String entityName : entityNames) {
try {
conn.createStatement().execute("ALTER TABLE " + entityName + " DROP COLUMN " + SEARCH_TEXT + " CASCADE");
} catch (Exception e) {
}
} catch (Exception e) {}
}
conn.createStatement().execute("UPDATE tb_schema_settings SET schema_version = 3005002;");
}

6
common/data/src/main/java/org/thingsboard/server/common/data/BaseDataWithAdditionalInfo.java
View File

@ -71,11 +71,7 @@ public abstract class BaseDataWithAdditionalInfo<I extends UUIDBased> extends Ba
if (o == null || getClass() != o.getClass()) return false;
if (!super.equals(o)) return false;
BaseDataWithAdditionalInfo<?> that = (BaseDataWithAdditionalInfo<?>) o;
byte [] additionalInfoBytesForEquals = additionalInfoBytes == null || "null".equals(new String(additionalInfoBytes, StandardCharsets.UTF_8)) ?
null : additionalInfoBytes;
byte [] thatAdditionalInfoBytesForEquals = that.additionalInfoBytes == null || "null".equals(new String(that.additionalInfoBytes, StandardCharsets.UTF_8)) ?
null : that.additionalInfoBytes;
return Arrays.equals(additionalInfoBytesForEquals, thatAdditionalInfoBytesForEquals);
return Arrays.equals(additionalInfoBytes, that.additionalInfoBytes);
}
@Override

2
common/data/src/main/java/org/thingsboard/server/common/data/DashboardInfo.java
View File

@ -30,7 +30,7 @@ import java.util.Objects;
import java.util.Set;
@ApiModel
public class DashboardInfo extends BaseDataWithAdditionalInfo<DashboardId> implements HasName, HasTenantId, HasTitle {
public class DashboardInfo extends BaseData<DashboardId> implements HasName, HasTenantId, HasTitle {
private TenantId tenantId;
@NoXss

3
dao/src/main/java/org/thingsboard/server/dao/model/sql/OtaPackageEntity.java
View File

@ -108,9 +108,6 @@ public class OtaPackageEntity extends BaseSqlEntity<OtaPackage> {
@Column(name = ModelConstants.OTA_PACKAGE_ADDITIONAL_INFO_COLUMN)
private JsonNode additionalInfo;
@Column(name = SEARCH_TEXT_PROPERTY)
private String searchText;
public OtaPackageEntity() {
super();
}

3
dao/src/main/java/org/thingsboard/server/dao/model/sql/OtaPackageInfoEntity.java
View File

@ -103,9 +103,6 @@ public class OtaPackageInfoEntity extends BaseSqlEntity<OtaPackageInfo> {
@Column(name = ModelConstants.OTA_PACKAGE_ADDITIONAL_INFO_COLUMN)
private JsonNode additionalInfo;
@Column(name = SEARCH_TEXT_PROPERTY)
private String searchText;
@Transient
private boolean hasData;

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

@ -216,7 +216,6 @@ CREATE TABLE IF NOT EXISTS ota_package (
data oid,
data_size bigint,
additional_info varchar,
search_text varchar(255),
CONSTRAINT ota_package_tenant_title_version_unq_key UNIQUE (tenant_id, title, version)
);