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

ota package tag improvements

Browse Source
This commit is contained in:
YevhenBondarenko 2021-07-23 13:54:07 +03:00
parent 7121fbf8c3
commit c7274b6139
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
application/src/main/java/org/thingsboard/server/controller/OtaPackageController.java
View File

@ -146,6 +146,7 @@ public class OtaPackageController extends BaseController {
otaPackage.setType(info.getType()); otaPackage.setType(info.getType());
otaPackage.setTitle(info.getTitle()); otaPackage.setTitle(info.getTitle());
otaPackage.setVersion(info.getVersion()); otaPackage.setVersion(info.getVersion());
otaPackage.setTag(info.getTag());
otaPackage.setAdditionalInfo(info.getAdditionalInfo()); otaPackage.setAdditionalInfo(info.getAdditionalInfo());
ChecksumAlgorithm checksumAlgorithm = ChecksumAlgorithm.valueOf(checksumAlgorithmStr.toUpperCase()); ChecksumAlgorithm checksumAlgorithm = ChecksumAlgorithm.valueOf(checksumAlgorithmStr.toUpperCase());

2
common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/ota/LwM2MClientOtaInfo.java
View File

@ -75,7 +75,7 @@ public abstract class LwM2MClientOtaInfo<Strategy, State, Result> {
} else if (StringUtils.isNotEmpty(targetTag) && targetTag.equals(currentPackageId)) { } else if (StringUtils.isNotEmpty(targetTag) && targetTag.equals(currentPackageId)) {
return false; return false;
} else if (StringUtils.isNotEmpty(currentVersion3)) { } else if (StringUtils.isNotEmpty(currentVersion3)) {
if (StringUtils.isNotEmpty(targetTag) && !currentVersion3.contains(targetPackageId)) { if (StringUtils.isNotEmpty(targetTag) && currentVersion3.contains(targetTag)) {
return false; return false;
} }
return !currentVersion3.contains(targetPackageId); return !currentVersion3.contains(targetPackageId);