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

changed entity type in audit logs to Alarm, add entityId and originatorId to details

Browse Source
This commit is contained in:
IrynaMatveieva 2024-08-14 13:27:56 +03:00
parent ed0a7d5adb
commit ef20700b88
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
application/src/main/java/org/thingsboard/server/service/entitiy/alarm/DefaultTbAlarmService.java
View File

@ -82,7 +82,7 @@ public class DefaultTbAlarmService extends AbstractTbEntityService implements Tb
resultAlarm = unassign(alarm, alarm.getAssignTs(), user); resultAlarm = unassign(alarm, alarm.getAssignTs(), user);
} }
if (result.isModified()) { if (result.isModified()) {
logEntityActionService.logEntityAction(tenantId, alarm.getOriginator(), resultAlarm, logEntityActionService.logEntityAction(tenantId, resultAlarm.getId(), resultAlarm,
resultAlarm.getCustomerId(), actionType, user); resultAlarm.getCustomerId(), actionType, user);
} }
return new Alarm(resultAlarm); return new Alarm(resultAlarm);
@ -107,7 +107,7 @@ public class DefaultTbAlarmService extends AbstractTbEntityService implements Tb
if (result.isModified()) { if (result.isModified()) {
String systemComment = String.format("Alarm was acknowledged by user %s", user.getTitle()); String systemComment = String.format("Alarm was acknowledged by user %s", user.getTitle());
addSystemAlarmComment(alarmInfo, user, "ACK", systemComment); addSystemAlarmComment(alarmInfo, user, "ACK", systemComment);
logEntityActionService.logEntityAction(alarm.getTenantId(), alarm.getOriginator(), alarmInfo, logEntityActionService.logEntityAction(alarm.getTenantId(), alarm.getId(), alarmInfo,
alarmInfo.getCustomerId(), ActionType.ALARM_ACK, user); alarmInfo.getCustomerId(), ActionType.ALARM_ACK, user);
} else { } else {
throw new ThingsboardException("Alarm was already acknowledged!", ThingsboardErrorCode.BAD_REQUEST_PARAMS); throw new ThingsboardException("Alarm was already acknowledged!", ThingsboardErrorCode.BAD_REQUEST_PARAMS);
@ -130,7 +130,7 @@ public class DefaultTbAlarmService extends AbstractTbEntityService implements Tb
if (result.isCleared()) { if (result.isCleared()) {
String systemComment = String.format("Alarm was cleared by user %s", user.getTitle()); String systemComment = String.format("Alarm was cleared by user %s", user.getTitle());
addSystemAlarmComment(alarmInfo, user, "CLEAR", systemComment); addSystemAlarmComment(alarmInfo, user, "CLEAR", systemComment);
logEntityActionService.logEntityAction(alarm.getTenantId(), alarm.getOriginator(), alarmInfo, logEntityActionService.logEntityAction(alarm.getTenantId(), alarm.getId(), alarmInfo,
alarmInfo.getCustomerId(), ActionType.ALARM_CLEAR, user); alarmInfo.getCustomerId(), ActionType.ALARM_CLEAR, user);
} else { } else {
throw new ThingsboardException("Alarm was already cleared!", ThingsboardErrorCode.BAD_REQUEST_PARAMS); throw new ThingsboardException("Alarm was already cleared!", ThingsboardErrorCode.BAD_REQUEST_PARAMS);
@ -149,7 +149,7 @@ public class DefaultTbAlarmService extends AbstractTbEntityService implements Tb
AlarmAssignee assignee = alarmInfo.getAssignee(); AlarmAssignee assignee = alarmInfo.getAssignee();
String systemComment = String.format("Alarm was assigned by user %s to user %s", user.getTitle(), assignee.getTitle()); String systemComment = String.format("Alarm was assigned by user %s to user %s", user.getTitle(), assignee.getTitle());
addSystemAlarmComment(alarmInfo, user, "ASSIGN", systemComment, assignee.getId()); addSystemAlarmComment(alarmInfo, user, "ASSIGN", systemComment, assignee.getId());
logEntityActionService.logEntityAction(alarm.getTenantId(), alarm.getOriginator(), alarmInfo, logEntityActionService.logEntityAction(alarm.getTenantId(), alarm.getId(), alarmInfo,
alarmInfo.getCustomerId(), ActionType.ALARM_ASSIGNED, user); alarmInfo.getCustomerId(), ActionType.ALARM_ASSIGNED, user);
} else { } else {
throw new ThingsboardException("Alarm was already assigned to this user!", ThingsboardErrorCode.BAD_REQUEST_PARAMS); throw new ThingsboardException("Alarm was already assigned to this user!", ThingsboardErrorCode.BAD_REQUEST_PARAMS);
@ -167,7 +167,7 @@ public class DefaultTbAlarmService extends AbstractTbEntityService implements Tb
if (result.isModified()) { if (result.isModified()) {
String systemComment = String.format("Alarm was unassigned by user %s", user.getTitle()); String systemComment = String.format("Alarm was unassigned by user %s", user.getTitle());
addSystemAlarmComment(alarmInfo, user, "ASSIGN", systemComment); addSystemAlarmComment(alarmInfo, user, "ASSIGN", systemComment);
logEntityActionService.logEntityAction(alarm.getTenantId(), alarm.getOriginator(), alarmInfo, logEntityActionService.logEntityAction(alarm.getTenantId(), alarm.getId(), alarmInfo,
alarmInfo.getCustomerId(), ActionType.ALARM_UNASSIGNED, user); alarmInfo.getCustomerId(), ActionType.ALARM_UNASSIGNED, user);
} else { } else {
throw new ThingsboardException("Alarm was already unassigned!", ThingsboardErrorCode.BAD_REQUEST_PARAMS); throw new ThingsboardException("Alarm was already unassigned!", ThingsboardErrorCode.BAD_REQUEST_PARAMS);
@ -195,8 +195,8 @@ public class DefaultTbAlarmService extends AbstractTbEntityService implements Tb
@Override @Override
public Boolean delete(Alarm alarm, User user) { public Boolean delete(Alarm alarm, User user) {
TenantId tenantId = alarm.getTenantId(); TenantId tenantId = alarm.getTenantId();
logEntityActionService.logEntityAction(tenantId, alarm.getOriginator(), alarm, alarm.getCustomerId(), logEntityActionService.logEntityAction(tenantId, alarm.getId(), alarm, alarm.getCustomerId(),
ActionType.ALARM_DELETE, user); ActionType.ALARM_DELETE, user, alarm.getOriginator());
return alarmSubscriptionService.deleteAlarm(tenantId, alarm.getId()); return alarmSubscriptionService.deleteAlarm(tenantId, alarm.getId());
} }
@ -215,7 +215,7 @@ public class DefaultTbAlarmService extends AbstractTbEntityService implements Tb
if (result.isModified()) { if (result.isModified()) {
String comment = String.format("Alarm was unassigned because user %s - was deleted", userTitle); String comment = String.format("Alarm was unassigned because user %s - was deleted", userTitle);
addSystemAlarmComment(result.getAlarm(), null, "ASSIGN", comment); addSystemAlarmComment(result.getAlarm(), null, "ASSIGN", comment);
logEntityActionService.logEntityAction(result.getAlarm().getTenantId(), result.getAlarm().getOriginator(), result.getAlarm(), result.getAlarm().getCustomerId(), ActionType.ALARM_UNASSIGNED, null); logEntityActionService.logEntityAction(result.getAlarm().getTenantId(), result.getAlarm().getId(), result.getAlarm(), result.getAlarm().getCustomerId(), ActionType.ALARM_UNASSIGNED, null);
} }
} }
} }

2
application/src/test/java/org/thingsboard/server/service/entitiy/alarm/DefaultTbAlarmServiceTest.java
View File

@ -129,7 +129,7 @@ public class DefaultTbAlarmServiceTest {
public void testDelete() { public void testDelete() {
service.delete(new Alarm(), new User()); service.delete(new Alarm(), new User());
verify(logEntityActionService, times(1)).logEntityAction(any(), any(), any(), any(), eq(ActionType.ALARM_DELETE), any()); verify(logEntityActionService, times(1)).logEntityAction(any(), any(), any(), any(), eq(ActionType.ALARM_DELETE), any(), any());
verify(alarmSubscriptionService, times(1)).deleteAlarm(any(), any()); verify(alarmSubscriptionService, times(1)).deleteAlarm(any(), any());
} }

4
dao/src/main/java/org/thingsboard/server/dao/audit/AuditLogServiceImpl.java
View File

@ -192,6 +192,10 @@ public class AuditLogServiceImpl implements AuditLogService {
actionData.set("comment", comment.getComment()); actionData.set("comment", comment.getComment());
break; break;
case ALARM_DELETE: case ALARM_DELETE:
actionData.put("entityId", entityId.toString());
EntityId originatorId = extractParameter(EntityId.class, additionalInfo);
actionData.put("originatorId", originatorId != null ? originatorId.toString() : null);
break;
case DELETED: case DELETED:
case ACTIVATED: case ACTIVATED:
case SUSPENDED: case SUSPENDED: