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

minor refactoring code to get OTA package id

Browse Source
This commit is contained in:
Peter Chen 2022-11-24 11:21:28 +11:00 committed by Andrii Shvaika
parent cc3372d963
commit 7914f3d1d0
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -181,22 +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 = null; OtaPackageId packageId = otaPackageType.equals(FIRMWARE)? deviceProfile.getFirmwareId() : deviceProfile.getSoftwareId();
if (otaPackageType.equals(FIRMWARE)) {
if (deviceProfile.getFirmwareId() != null) {
packageId = deviceProfile.getFirmwareId();
}
}
else if (otaPackageType.equals(SOFTWARE)) {
if (deviceProfile.getSoftwareId() != null) {
packageId = deviceProfile.getSoftwareId();
}
}
if (packageId != null) { if (packageId != null) {
long ts = System.currentTimeMillis(); long ts = System.currentTimeMillis();
OtaPackageId finalPackageId = packageId; updateConsumer = d -> send(d.getTenantId(), d.getId(), packageId, ts, otaPackageType);
updateConsumer = d -> send(d.getTenantId(), d.getId(), finalPackageId, ts, otaPackageType);
} else { } else {
updateConsumer = d -> remove(d, otaPackageType); updateConsumer = d -> remove(d, otaPackageType);
} }