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

Fix ota save when saving url

Browse Source
This commit is contained in:
Andrii Landiak 2025-06-20 15:15:15 +03:00
parent cb319f92ec
commit b76909ce05
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,6 +19,7 @@ import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.thingsboard.server.common.data.EntityType; import org.thingsboard.server.common.data.EntityType;
import org.thingsboard.server.common.data.OtaPackage; import org.thingsboard.server.common.data.OtaPackage;
import org.thingsboard.server.common.data.OtaPackageInfo;
import org.thingsboard.server.common.data.id.OtaPackageId; import org.thingsboard.server.common.data.id.OtaPackageId;
import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.id.TenantId;
import org.thingsboard.server.common.data.sync.ie.OtaPackageExportData; import org.thingsboard.server.common.data.sync.ie.OtaPackageExportData;
@ -60,6 +61,10 @@ public class OtaPackageImportService extends BaseEntityImportService<OtaPackageI
@Override @Override
protected OtaPackage saveOrUpdate(EntitiesImportCtx ctx, OtaPackage otaPackage, OtaPackageExportData exportData, IdProvider idProvider, CompareResult compareResult) { protected OtaPackage saveOrUpdate(EntitiesImportCtx ctx, OtaPackage otaPackage, OtaPackageExportData exportData, IdProvider idProvider, CompareResult compareResult) {
if (otaPackage.hasUrl()) {
OtaPackageInfo info = new OtaPackageInfo(otaPackage);
return (OtaPackage) otaPackageService.saveOtaPackageInfo(info, info.hasUrl());
}
return otaPackageService.saveOtaPackage(otaPackage); return otaPackageService.saveOtaPackage(otaPackage);
} }

1
dao/src/main/java/org/thingsboard/server/dao/service/validator/OtaPackageDataValidator.java
View File

@ -103,4 +103,5 @@ public class OtaPackageDataValidator extends BaseOtaPackageDataValidator<OtaPack
} }
return otaPackageOld; return otaPackageOld;
} }
} }