Commit 0d8f9582e7cb9099abea4449f5a88635964e9fab
Merge branch '20230912' into 'master_dev'
fix: 告警详情被清空问题修复。 See merge request yunteng/thingskit!229
Showing
1 changed file
with
2 additions
and
2 deletions
| @@ -433,10 +433,10 @@ class ReactState { | @@ -433,10 +433,10 @@ class ReactState { | ||
| 433 | ObjectNode clearResult = clearState.process(ctx, msg, true); | 433 | ObjectNode clearResult = clearState.process(ctx, msg, true); |
| 434 | if(!clearResult.isEmpty()){ | 434 | if(!clearResult.isEmpty()){ |
| 435 | ctx.getAlarmService() | 435 | ctx.getAlarmService() |
| 436 | - .clearAlarmForResult( | 436 | + .clearAlarm( |
| 437 | ctx.getTenantId(), | 437 | ctx.getTenantId(), |
| 438 | currentAlarms.get(deviceId).getId(), | 438 | currentAlarms.get(deviceId).getId(), |
| 439 | - clearResult, | 439 | + null, |
| 440 | System.currentTimeMillis()); | 440 | System.currentTimeMillis()); |
| 441 | ytDeviceService.freshAlarmStatus(new DeviceId(UUID.fromString(deviceId)), 0); | 441 | ytDeviceService.freshAlarmStatus(new DeviceId(UUID.fromString(deviceId)), 0); |
| 442 | alarmMsg(ctx, msg, currentAlarms.get(deviceId), "Alarm Cleared"); | 442 | alarmMsg(ctx, msg, currentAlarms.get(deviceId), "Alarm Cleared"); |