简柏林 / thingskit · Commits

Commit d94cb9ca4763ffadde89886966121ffa2b58d7a2

Authored by VoBa
Committed by GitHub
1 parent 903e4598

Added correct ts on alarm clear and ack actions (#2550)

Inline Side-by-side
Showing 2 changed files with 7 additions and 3 deletions
@@ -118,7 +118,9 @@ public class AlarmController extends BaseController { @@ -118,7 +118,9 @@ public class AlarmController extends BaseController {
118 try { 118 try {
119 AlarmId alarmId = new AlarmId(toUUID(strAlarmId)); 119 AlarmId alarmId = new AlarmId(toUUID(strAlarmId));
120 Alarm alarm = checkAlarmId(alarmId, Operation.WRITE); 120 Alarm alarm = checkAlarmId(alarmId, Operation.WRITE);
121 - alarmService.ackAlarm(getCurrentUser().getTenantId(), alarmId, System.currentTimeMillis()).get(); 121 + long ackTs = System.currentTimeMillis();
  122 + alarmService.ackAlarm(getCurrentUser().getTenantId(), alarmId, ackTs).get();
  123 + alarm.setAckTs(ackTs);
122 logEntityAction(alarmId, alarm, getCurrentUser().getCustomerId(), ActionType.ALARM_ACK, null); 124 logEntityAction(alarmId, alarm, getCurrentUser().getCustomerId(), ActionType.ALARM_ACK, null);
123 } catch (Exception e) { 125 } catch (Exception e) {
124 throw handleException(e); 126 throw handleException(e);
@@ -133,7 +135,9 @@ public class AlarmController extends BaseController { @@ -133,7 +135,9 @@ public class AlarmController extends BaseController {
133 try { 135 try {
134 AlarmId alarmId = new AlarmId(toUUID(strAlarmId)); 136 AlarmId alarmId = new AlarmId(toUUID(strAlarmId));
135 Alarm alarm = checkAlarmId(alarmId, Operation.WRITE); 137 Alarm alarm = checkAlarmId(alarmId, Operation.WRITE);
136 - alarmService.clearAlarm(getCurrentUser().getTenantId(), alarmId, null, System.currentTimeMillis()).get(); 138 + long clearTs = System.currentTimeMillis();
  139 + alarmService.clearAlarm(getCurrentUser().getTenantId(), alarmId, null, clearTs).get();
  140 + alarm.setClearTs(clearTs);
137 logEntityAction(alarmId, alarm, getCurrentUser().getCustomerId(), ActionType.ALARM_CLEAR, null); 141 logEntityAction(alarmId, alarm, getCurrentUser().getCustomerId(), ActionType.ALARM_CLEAR, null);
138 } catch (Exception e) { 142 } catch (Exception e) {
139 throw handleException(e); 143 throw handleException(e);
@@ -39,7 +39,7 @@ public interface AlarmService { @@ -39,7 +39,7 @@ public interface AlarmService {
39 39
40 ListenableFuture<Boolean> ackAlarm(TenantId tenantId, AlarmId alarmId, long ackTs); 40 ListenableFuture<Boolean> ackAlarm(TenantId tenantId, AlarmId alarmId, long ackTs);
41 41
42 - ListenableFuture<Boolean> clearAlarm(TenantId tenantId, AlarmId alarmId, JsonNode details, long ackTs); 42 + ListenableFuture<Boolean> clearAlarm(TenantId tenantId, AlarmId alarmId, JsonNode details, long clearTs);
43 43
44 ListenableFuture<Alarm> findAlarmByIdAsync(TenantId tenantId, AlarmId alarmId); 44 ListenableFuture<Alarm> findAlarmByIdAsync(TenantId tenantId, AlarmId alarmId);
45 45