Commit 0d8f9582e7cb9099abea4449f5a88635964e9fab

Authored by xp.Huang
2 parents 9c738deb 8c32d67e

Merge branch '20230912' into 'master_dev'

fix: 告警详情被清空问题修复。

See merge request yunteng/thingskit!229
... ... @@ -433,10 +433,10 @@ class ReactState {
433 433 ObjectNode clearResult = clearState.process(ctx, msg, true);
434 434 if(!clearResult.isEmpty()){
435 435 ctx.getAlarmService()
436   - .clearAlarmForResult(
  436 + .clearAlarm(
437 437 ctx.getTenantId(),
438 438 currentAlarms.get(deviceId).getId(),
439   - clearResult,
  439 + null,
440 440 System.currentTimeMillis());
441 441 ytDeviceService.freshAlarmStatus(new DeviceId(UUID.fromString(deviceId)), 0);
442 442 alarmMsg(ctx, msg, currentAlarms.get(deviceId), "Alarm Cleared");
... ...