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

Fixed user ID for JPA impl

Browse Source
This commit is contained in:
Volodymyr Babak 2018-02-12 19:12:08 +02:00
parent 69422fea0e
commit ead30d700b
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dao/src/main/java/org/thingsboard/server/dao/model/sql/AuditLogEntity.java
View File

@ -25,10 +25,7 @@ import org.thingsboard.server.common.data.EntityType;
import org.thingsboard.server.common.data.audit.ActionStatus; import org.thingsboard.server.common.data.audit.ActionStatus;
import org.thingsboard.server.common.data.audit.ActionType; import org.thingsboard.server.common.data.audit.ActionType;
import org.thingsboard.server.common.data.audit.AuditLog; import org.thingsboard.server.common.data.audit.AuditLog;
import org.thingsboard.server.common.data.id.AuditLogId; import org.thingsboard.server.common.data.id.*;
import org.thingsboard.server.common.data.id.CustomerId;
import org.thingsboard.server.common.data.id.EntityIdFactory;
import org.thingsboard.server.common.data.id.TenantId;
import org.thingsboard.server.dao.model.BaseEntity; import org.thingsboard.server.dao.model.BaseEntity;
import org.thingsboard.server.dao.model.BaseSqlEntity; import org.thingsboard.server.dao.model.BaseSqlEntity;
import org.thingsboard.server.dao.model.ModelConstants; import org.thingsboard.server.dao.model.ModelConstants;
@ -100,6 +97,9 @@ public class AuditLogEntity extends BaseSqlEntity<AuditLog> implements BaseEntit
this.entityId = toString(auditLog.getEntityId().getId()); this.entityId = toString(auditLog.getEntityId().getId());
this.entityType = auditLog.getEntityId().getEntityType(); this.entityType = auditLog.getEntityId().getEntityType();
} }
if (auditLog.getUserId() != null) {
this.userId = toString(auditLog.getUserId().getId());
}
this.entityName = auditLog.getEntityName(); this.entityName = auditLog.getEntityName();
this.userName = auditLog.getUserName(); this.userName = auditLog.getUserName();
this.actionType = auditLog.getActionType(); this.actionType = auditLog.getActionType();
@ -121,6 +121,9 @@ public class AuditLogEntity extends BaseSqlEntity<AuditLog> implements BaseEntit
if (entityId != null) { if (entityId != null) {
auditLog.setEntityId(EntityIdFactory.getByTypeAndId(entityType.name(), toUUID(entityId).toString())); auditLog.setEntityId(EntityIdFactory.getByTypeAndId(entityType.name(), toUUID(entityId).toString()));
} }
if (userId != null) {
auditLog.setUserId(new UserId(toUUID(entityId)));
}
auditLog.setEntityName(this.entityName); auditLog.setEntityName(this.entityName);
auditLog.setUserName(this.userName); auditLog.setUserName(this.userName);
auditLog.setActionType(this.actionType); auditLog.setActionType(this.actionType);