diff --git a/src/main/java/cn/lihongjie/coal/bizLog/dto/BizLogDto.java b/src/main/java/cn/lihongjie/coal/bizLog/dto/BizLogDto.java index 148eba44..50130dc3 100644 --- a/src/main/java/cn/lihongjie/coal/bizLog/dto/BizLogDto.java +++ b/src/main/java/cn/lihongjie/coal/bizLog/dto/BizLogDto.java @@ -26,6 +26,10 @@ public class BizLogDto extends OrgCommonDto { @Comment("五级菜单") private String level5; + + @Comment("菜单全路径") + private String menuPath; + @Comment("功能点") private String functionPoint; diff --git a/src/main/java/cn/lihongjie/coal/bizLog/dto/CreateBizLogDto.java b/src/main/java/cn/lihongjie/coal/bizLog/dto/CreateBizLogDto.java index caae7e18..93e4b993 100644 --- a/src/main/java/cn/lihongjie/coal/bizLog/dto/CreateBizLogDto.java +++ b/src/main/java/cn/lihongjie/coal/bizLog/dto/CreateBizLogDto.java @@ -26,6 +26,10 @@ public class CreateBizLogDto extends OrgCommonDto { @Comment("五级菜单") private String level5; + + @Comment("菜单全路径") + private String menuPath; + @Comment("功能点") private String functionPoint; diff --git a/src/main/java/cn/lihongjie/coal/bizLog/entity/BizLogEntity.java b/src/main/java/cn/lihongjie/coal/bizLog/entity/BizLogEntity.java index c537c9dc..ac98d924 100644 --- a/src/main/java/cn/lihongjie/coal/bizLog/entity/BizLogEntity.java +++ b/src/main/java/cn/lihongjie/coal/bizLog/entity/BizLogEntity.java @@ -10,14 +10,17 @@ import lombok.Data; import org.hibernate.annotations.Comment; import java.time.LocalDateTime; +import java.util.stream.Stream; @Data @Entity @Table( - indexes = - @jakarta.persistence.Index( - name = "idx_bizLog_org_id", - columnList = "organization_id")) + indexes = { + @jakarta.persistence.Index(name = "idx_bizLog_org_id", columnList = "organization_id"), + @jakarta.persistence.Index(name = "idx_bizLog_createUserId", columnList = "create_user_id"), + @jakarta.persistence.Index(name = "idx_bizLog_menuPath", columnList = "menu_path"), + + }) public class BizLogEntity extends OrgCommonEntity { @Comment("一级菜单") @@ -34,6 +37,9 @@ public class BizLogEntity extends OrgCommonEntity { @Comment("五级菜单") private String level5; + + @Comment("菜单全路径") + private String menuPath; @Comment("功能点") private String functionPoint; @@ -67,4 +73,37 @@ public class BizLogEntity extends OrgCommonEntity { @Comment("备用字段5") private String reverse5; + + + @Override + public void prePersist() { + super.prePersist(); + this.setOperationTime(LocalDateTime.now()); + this.menuPath = + Stream.of( + this.getLevel1(), + this.getLevel2(), + this.getLevel3(), + this.getLevel4(), + this.getLevel5()) + .filter(s -> s != null && !s.isBlank()) + .reduce((a, b) -> a + "/" + b) + .orElse(null); + } + + @Override + public void preUpdate() { + super.preUpdate(); + + this.menuPath = + Stream.of( + this.getLevel1(), + this.getLevel2(), + this.getLevel3(), + this.getLevel4(), + this.getLevel5()) + .filter(s -> s != null && !s.isBlank()) + .reduce((a, b) -> a + "/" + b) + .orElse(null); + } }