diff --git a/application/src/main/data/upgrade/3.2.2/schema_update.sql b/application/src/main/data/upgrade/3.2.2/schema_update.sql index 479e2979e1..50f538d5dc 100644 --- a/application/src/main/data/upgrade/3.2.2/schema_update.sql +++ b/application/src/main/data/upgrade/3.2.2/schema_update.sql @@ -67,6 +67,7 @@ CREATE TABLE IF NOT EXISTS ota_package ( type varchar(32) NOT NULL, title varchar(255) NOT NULL, version varchar(255) NOT NULL, + tag varchar(255), url varchar(255), file_name varchar(255), content_type varchar(255), diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/OtaPackageInfo.java b/common/data/src/main/java/org/thingsboard/server/common/data/OtaPackageInfo.java index f27c90c20b..b6a6df3b7e 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/OtaPackageInfo.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/OtaPackageInfo.java @@ -37,6 +37,7 @@ public class OtaPackageInfo extends SearchTextBasedWithAdditionalInfo implements Searc @Column(name = OTA_PACKAGE_VERSION_COLUMN) private String version; + @Column(name = OTA_PACKAGE_TAG_COLUMN) + private String tag; + @Column(name = OTA_PACKAGE_URL_COLUMN) private String url; @@ -112,24 +116,25 @@ public class OtaPackageEntity extends BaseSqlEntity implements Searc super(); } - public OtaPackageEntity(OtaPackage firmware) { - this.createdTime = firmware.getCreatedTime(); - this.setUuid(firmware.getUuidId()); - this.tenantId = firmware.getTenantId().getId(); - if (firmware.getDeviceProfileId() != null) { - this.deviceProfileId = firmware.getDeviceProfileId().getId(); + public OtaPackageEntity(OtaPackage otaPackage) { + this.createdTime = otaPackage.getCreatedTime(); + this.setUuid(otaPackage.getUuidId()); + this.tenantId = otaPackage.getTenantId().getId(); + if (otaPackage.getDeviceProfileId() != null) { + this.deviceProfileId = otaPackage.getDeviceProfileId().getId(); } - this.type = firmware.getType(); - this.title = firmware.getTitle(); - this.version = firmware.getVersion(); - this.url = firmware.getUrl(); - this.fileName = firmware.getFileName(); - this.contentType = firmware.getContentType(); - this.checksumAlgorithm = firmware.getChecksumAlgorithm(); - this.checksum = firmware.getChecksum(); - this.data = firmware.getData().array(); - this.dataSize = firmware.getDataSize(); - this.additionalInfo = firmware.getAdditionalInfo(); + this.type = otaPackage.getType(); + this.title = otaPackage.getTitle(); + this.version = otaPackage.getVersion(); + this.tag = otaPackage.getTag(); + this.url = otaPackage.getUrl(); + this.fileName = otaPackage.getFileName(); + this.contentType = otaPackage.getContentType(); + this.checksumAlgorithm = otaPackage.getChecksumAlgorithm(); + this.checksum = otaPackage.getChecksum(); + this.data = otaPackage.getData().array(); + this.dataSize = otaPackage.getDataSize(); + this.additionalInfo = otaPackage.getAdditionalInfo(); } @Override @@ -144,26 +149,27 @@ public class OtaPackageEntity extends BaseSqlEntity implements Searc @Override public OtaPackage toData() { - OtaPackage firmware = new OtaPackage(new OtaPackageId(id)); - firmware.setCreatedTime(createdTime); - firmware.setTenantId(new TenantId(tenantId)); + OtaPackage otaPackage = new OtaPackage(new OtaPackageId(id)); + otaPackage.setCreatedTime(createdTime); + otaPackage.setTenantId(new TenantId(tenantId)); if (deviceProfileId != null) { - firmware.setDeviceProfileId(new DeviceProfileId(deviceProfileId)); + otaPackage.setDeviceProfileId(new DeviceProfileId(deviceProfileId)); } - firmware.setType(type); - firmware.setTitle(title); - firmware.setVersion(version); - firmware.setUrl(url); - firmware.setFileName(fileName); - firmware.setContentType(contentType); - firmware.setChecksumAlgorithm(checksumAlgorithm); - firmware.setChecksum(checksum); - firmware.setDataSize(dataSize); + otaPackage.setType(type); + otaPackage.setTitle(title); + otaPackage.setVersion(version); + otaPackage.setTag(tag); + otaPackage.setUrl(url); + otaPackage.setFileName(fileName); + otaPackage.setContentType(contentType); + otaPackage.setChecksumAlgorithm(checksumAlgorithm); + otaPackage.setChecksum(checksum); + otaPackage.setDataSize(dataSize); if (data != null) { - firmware.setData(ByteBuffer.wrap(data)); - firmware.setHasData(true); + otaPackage.setData(ByteBuffer.wrap(data)); + otaPackage.setHasData(true); } - firmware.setAdditionalInfo(additionalInfo); - return firmware; + otaPackage.setAdditionalInfo(additionalInfo); + return otaPackage; } } diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/OtaPackageInfoEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/OtaPackageInfoEntity.java index db16251f71..d3453c2061 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/OtaPackageInfoEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/OtaPackageInfoEntity.java @@ -48,6 +48,7 @@ import static org.thingsboard.server.dao.model.ModelConstants.OTA_PACKAGE_DATA_S import static org.thingsboard.server.dao.model.ModelConstants.OTA_PACKAGE_DEVICE_PROFILE_ID_COLUMN; import static org.thingsboard.server.dao.model.ModelConstants.OTA_PACKAGE_FILE_NAME_COLUMN; import static org.thingsboard.server.dao.model.ModelConstants.OTA_PACKAGE_TABLE_NAME; +import static org.thingsboard.server.dao.model.ModelConstants.OTA_PACKAGE_TAG_COLUMN; import static org.thingsboard.server.dao.model.ModelConstants.OTA_PACKAGE_TENANT_ID_COLUMN; import static org.thingsboard.server.dao.model.ModelConstants.OTA_PACKAGE_TILE_COLUMN; import static org.thingsboard.server.dao.model.ModelConstants.OTA_PACKAGE_TYPE_COLUMN; @@ -78,6 +79,9 @@ public class OtaPackageInfoEntity extends BaseSqlEntity implemen @Column(name = OTA_PACKAGE_VERSION_COLUMN) private String version; + @Column(name = OTA_PACKAGE_TAG_COLUMN) + private String tag; + @Column(name = OTA_PACKAGE_URL_COLUMN) private String url; @@ -111,26 +115,27 @@ public class OtaPackageInfoEntity extends BaseSqlEntity implemen super(); } - public OtaPackageInfoEntity(OtaPackageInfo firmware) { - this.createdTime = firmware.getCreatedTime(); - this.setUuid(firmware.getUuidId()); - this.tenantId = firmware.getTenantId().getId(); - this.type = firmware.getType(); - if (firmware.getDeviceProfileId() != null) { - this.deviceProfileId = firmware.getDeviceProfileId().getId(); + public OtaPackageInfoEntity(OtaPackageInfo otaPackageInfo) { + this.createdTime = otaPackageInfo.getCreatedTime(); + this.setUuid(otaPackageInfo.getUuidId()); + this.tenantId = otaPackageInfo.getTenantId().getId(); + this.type = otaPackageInfo.getType(); + if (otaPackageInfo.getDeviceProfileId() != null) { + this.deviceProfileId = otaPackageInfo.getDeviceProfileId().getId(); } - this.title = firmware.getTitle(); - this.version = firmware.getVersion(); - this.url = firmware.getUrl(); - this.fileName = firmware.getFileName(); - this.contentType = firmware.getContentType(); - this.checksumAlgorithm = firmware.getChecksumAlgorithm(); - this.checksum = firmware.getChecksum(); - this.dataSize = firmware.getDataSize(); - this.additionalInfo = firmware.getAdditionalInfo(); + this.title = otaPackageInfo.getTitle(); + this.version = otaPackageInfo.getVersion(); + this.tag = otaPackageInfo.getTag(); + this.url = otaPackageInfo.getUrl(); + this.fileName = otaPackageInfo.getFileName(); + this.contentType = otaPackageInfo.getContentType(); + this.checksumAlgorithm = otaPackageInfo.getChecksumAlgorithm(); + this.checksum = otaPackageInfo.getChecksum(); + this.dataSize = otaPackageInfo.getDataSize(); + this.additionalInfo = otaPackageInfo.getAdditionalInfo(); } - public OtaPackageInfoEntity(UUID id, long createdTime, UUID tenantId, UUID deviceProfileId, OtaPackageType type, String title, String version, + public OtaPackageInfoEntity(UUID id, long createdTime, UUID tenantId, UUID deviceProfileId, OtaPackageType type, String title, String version, String tag, String url, String fileName, String contentType, ChecksumAlgorithm checksumAlgorithm, String checksum, Long dataSize, Object additionalInfo, boolean hasData) { this.id = id; @@ -162,23 +167,24 @@ public class OtaPackageInfoEntity extends BaseSqlEntity implemen @Override public OtaPackageInfo toData() { - OtaPackageInfo firmware = new OtaPackageInfo(new OtaPackageId(id)); - firmware.setCreatedTime(createdTime); - firmware.setTenantId(new TenantId(tenantId)); + OtaPackageInfo otaPackageInfo = new OtaPackageInfo(new OtaPackageId(id)); + otaPackageInfo.setCreatedTime(createdTime); + otaPackageInfo.setTenantId(new TenantId(tenantId)); if (deviceProfileId != null) { - firmware.setDeviceProfileId(new DeviceProfileId(deviceProfileId)); + otaPackageInfo.setDeviceProfileId(new DeviceProfileId(deviceProfileId)); } - firmware.setType(type); - firmware.setTitle(title); - firmware.setVersion(version); - firmware.setUrl(url); - firmware.setFileName(fileName); - firmware.setContentType(contentType); - firmware.setChecksumAlgorithm(checksumAlgorithm); - firmware.setChecksum(checksum); - firmware.setDataSize(dataSize); - firmware.setAdditionalInfo(additionalInfo); - firmware.setHasData(hasData); - return firmware; + otaPackageInfo.setType(type); + otaPackageInfo.setTitle(title); + otaPackageInfo.setVersion(version); + otaPackageInfo.setTag(tag); + otaPackageInfo.setUrl(url); + otaPackageInfo.setFileName(fileName); + otaPackageInfo.setContentType(contentType); + otaPackageInfo.setChecksumAlgorithm(checksumAlgorithm); + otaPackageInfo.setChecksum(checksum); + otaPackageInfo.setDataSize(dataSize); + otaPackageInfo.setAdditionalInfo(additionalInfo); + otaPackageInfo.setHasData(hasData); + return otaPackageInfo; } } diff --git a/dao/src/main/java/org/thingsboard/server/dao/ota/BaseOtaPackageService.java b/dao/src/main/java/org/thingsboard/server/dao/ota/BaseOtaPackageService.java index b9942ec6e6..5b034f7d00 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/ota/BaseOtaPackageService.java +++ b/dao/src/main/java/org/thingsboard/server/dao/ota/BaseOtaPackageService.java @@ -51,6 +51,7 @@ import org.thingsboard.server.dao.tenant.TenantDao; import java.nio.ByteBuffer; import java.util.Collections; import java.util.List; +import java.util.Objects; import java.util.Optional; import static org.thingsboard.server.common.data.CacheConstants.OTA_PACKAGE_CACHE; @@ -318,6 +319,10 @@ public class BaseOtaPackageService implements OtaPackageService { throw new DataValidationException("Updating otaPackage version is prohibited!"); } + if (!Objects.equals(otaPackage.getTag(), otaPackageOld.getTag())) { + throw new DataValidationException("Updating otaPackage tag is prohibited!"); + } + if (!otaPackageOld.getDeviceProfileId().equals(otaPackage.getDeviceProfileId())) { throw new DataValidationException("Updating otaPackage deviceProfile is prohibited!"); } diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/ota/OtaPackageInfoRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/ota/OtaPackageInfoRepository.java index b380f8a150..112b6dd222 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/ota/OtaPackageInfoRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/ota/OtaPackageInfoRepository.java @@ -26,14 +26,14 @@ import org.thingsboard.server.dao.model.sql.OtaPackageInfoEntity; import java.util.UUID; public interface OtaPackageInfoRepository extends CrudRepository { - @Query("SELECT new OtaPackageInfoEntity(f.id, f.createdTime, f.tenantId, f.deviceProfileId, f.type, f.title, f.version, f.url, f.fileName, f.contentType, f.checksumAlgorithm, f.checksum, f.dataSize, f.additionalInfo, CASE WHEN (f.data IS NOT NULL OR f.url IS NOT NULL) THEN true ELSE false END) FROM OtaPackageEntity f WHERE " + + @Query("SELECT new OtaPackageInfoEntity(f.id, f.createdTime, f.tenantId, f.deviceProfileId, f.type, f.title, f.version, f.tag, f.url, f.fileName, f.contentType, f.checksumAlgorithm, f.checksum, f.dataSize, f.additionalInfo, CASE WHEN (f.data IS NOT NULL OR f.url IS NOT NULL) THEN true ELSE false END) FROM OtaPackageEntity f WHERE " + "f.tenantId = :tenantId " + "AND LOWER(f.searchText) LIKE LOWER(CONCAT(:searchText, '%'))") Page findAllByTenantId(@Param("tenantId") UUID tenantId, @Param("searchText") String searchText, Pageable pageable); - @Query("SELECT new OtaPackageInfoEntity(f.id, f.createdTime, f.tenantId, f.deviceProfileId, f.type, f.title, f.version, f.url, f.fileName, f.contentType, f.checksumAlgorithm, f.checksum, f.dataSize, f.additionalInfo, true) FROM OtaPackageEntity f WHERE " + + @Query("SELECT new OtaPackageInfoEntity(f.id, f.createdTime, f.tenantId, f.deviceProfileId, f.type, f.title, f.version, f.tag, f.url, f.fileName, f.contentType, f.checksumAlgorithm, f.checksum, f.dataSize, f.additionalInfo, true) FROM OtaPackageEntity f WHERE " + "f.tenantId = :tenantId " + "AND f.deviceProfileId = :deviceProfileId " + "AND f.type = :type " + @@ -45,7 +45,7 @@ public interface OtaPackageInfoRepository extends CrudRepository