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

Refactoring Device Profile upgrade

Browse Source
This commit is contained in:
Swoq 2021-09-13 18:03:10 +03:00 committed by Andrii Shvaika
parent 22ce8cf063
commit 5599ab5650
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
application/src/main/java/org/thingsboard/server/service/install/update/DefaultDataUpdateService.java
View File

@ -147,22 +147,22 @@ public class DefaultDataUpdateService implements DataUpdateService {
if (deviceProfile.getProfileData().has("alarms") && if (deviceProfile.getProfileData().has("alarms") &&
!deviceProfile.getProfileData().get("alarms").isNull()) { !deviceProfile.getProfileData().get("alarms").isNull()) {
boolean isUpdated = false; boolean isUpdated = false;
JsonNode array = deviceProfile.getProfileData().get("alarms"); JsonNode alarms = deviceProfile.getProfileData().get("alarms");
for (JsonNode node : array) { for (JsonNode alarm : alarms) {
if (node.has("createRules")) { if (alarm.has("createRules")) {
JsonNode createRules = node.get("createRules"); JsonNode createRules = alarm.get("createRules");
for (AlarmSeverity severity : AlarmSeverity.values()) { for (AlarmSeverity severity : AlarmSeverity.values()) {
if (createRules.has(severity.name())) { if (createRules.has(severity.name())) {
JsonNode spec = createRules.get(severity.name()).get("condition").get("spec"); JsonNode spec = createRules.get(severity.name()).get("condition").get("spec");
boolean convertResult = convertDeviceProfileAlarmRulesForVersion330(spec); if (convertDeviceProfileAlarmRulesForVersion330(spec))
isUpdated = convertResult || isUpdated; isUpdated = true;
} }
} }
} }
if (node.has("clearRule") && !node.get("clearRule").isNull()) { if (alarm.has("clearRule") && !alarm.get("clearRule").isNull()) {
JsonNode spec = node.get("clearRule").get("condition").get("spec"); JsonNode spec = alarm.get("clearRule").get("condition").get("spec");
boolean convertResult = convertDeviceProfileAlarmRulesForVersion330(spec); if (convertDeviceProfileAlarmRulesForVersion330(spec))
isUpdated = convertResult || isUpdated; isUpdated = true;
} }
} }
if (isUpdated) { if (isUpdated) {