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

Merge pull request #7707 from thingsboard/bug/6008

Browse Source 
Bug 6008: OTA image assigned to device profile does not populate device shared properties
This commit is contained in:
Andrew Shvayka 2022-11-30 14:21:25 +02:00 committed by GitHub
commit e8c5a71a16
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
application/src/main/java/org/thingsboard/server/service/ota/DefaultOtaPackageStateService.java
View File

@ -181,10 +181,11 @@ public class DefaultOtaPackageStateService implements OtaPackageStateService {
private void update(TenantId tenantId, DeviceProfile deviceProfile, OtaPackageType otaPackageType) { private void update(TenantId tenantId, DeviceProfile deviceProfile, OtaPackageType otaPackageType) {
Consumer<Device> updateConsumer; Consumer<Device> updateConsumer;
OtaPackageId packageId = OtaPackageUtil.getOtaPackageId(deviceProfile, otaPackageType);
if (deviceProfile.getFirmwareId() != null) { if (packageId != null) {
long ts = System.currentTimeMillis(); long ts = System.currentTimeMillis();
updateConsumer = d -> send(d.getTenantId(), d.getId(), deviceProfile.getFirmwareId(), ts, otaPackageType); updateConsumer = d -> send(d.getTenantId(), d.getId(), packageId, ts, otaPackageType);
} else { } else {
updateConsumer = d -> remove(d, otaPackageType); updateConsumer = d -> remove(d, otaPackageType);
} }