Browse Source

增加creatorName和modifierName

zhou-hao 4 years ago
parent
commit
21969c4789

+ 4 - 0
hsweb-commons/hsweb-commons-api/src/main/java/org/hswebframework/web/api/crud/entity/RecordCreationEntity.java

@@ -20,6 +20,10 @@ public interface RecordCreationEntity extends Entity {
 
     void setCreateTime(Long createTime);
 
+    default void setCreatorName(String name) {
+
+    }
+
     default void setCreateTimeNow() {
         setCreateTime(System.currentTimeMillis());
     }

+ 6 - 1
hsweb-commons/hsweb-commons-api/src/main/java/org/hswebframework/web/api/crud/entity/RecordModifierEntity.java

@@ -1,6 +1,6 @@
 package org.hswebframework.web.api.crud.entity;
 
-import org.hswebframework.web.api.crud.entity.Entity;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 
 /**
  * 记录修改信息的实体类,包括修改人和修改时间。
@@ -17,6 +17,10 @@ public interface RecordModifierEntity extends Entity {
 
     void setModifierId(String modifierId);
 
+    default void setModifierName(String modifierName) {
+
+    }
+
     Long getModifyTime();
 
     void setModifyTime(Long modifyTime);
@@ -25,6 +29,7 @@ public interface RecordModifierEntity extends Entity {
         setModifyTime(System.currentTimeMillis());
     }
 
+    @JsonIgnore
     default String getModifierIdProperty() {
         return modifierId;
     }

+ 5 - 5
hsweb-commons/hsweb-commons-crud/src/main/java/org/hswebframework/web/crud/web/reactive/ReactiveSaveController.java

@@ -25,16 +25,16 @@ public interface ReactiveSaveController<E, K> {
         RecordCreationEntity creationEntity = ((RecordCreationEntity) entity);
         creationEntity.setCreateTimeNow();
         creationEntity.setCreatorId(authentication.getUser().getId());
-
+        creationEntity.setCreatorName(authentication.getUser().getName());
         return entity;
     }
 
     @Authorize(ignore = true)
     default E applyModifierEntity(Authentication authentication, E entity) {
-        RecordModifierEntity creationEntity = ((RecordModifierEntity) entity);
-        creationEntity.setModifyTimeNow();
-        creationEntity.setModifierId(authentication.getUser().getId());
-
+        RecordModifierEntity modifierEntity = ((RecordModifierEntity) entity);
+        modifierEntity.setModifyTimeNow();
+        modifierEntity.setModifierId(authentication.getUser().getId());
+        modifierEntity.setModifierName(authentication.getUser().getName());
         return entity;
     }