diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java index 0f63450..6a404a4 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.form.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; @@ -10,10 +11,7 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.util.List; /** @@ -28,7 +26,9 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="BF_MENU") +@Table(name="BF_MENU",indexes = { + @Index(name="index_bf_menu_parent_id",columnList = "PARENT_ID"), +}) @Api(value="表单菜单目录",description = "表单菜单目录") public class BfMenu extends BaseBean { @@ -41,6 +41,14 @@ public class BfMenu extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long parentId; + public long getParentIdVal(){ + if(parentId == null){ + return CommonEnumUtil.PARENT.DEFAULT.getValue().longValue(); + } else { + return parentId.longValue(); + } + } + @Column(name="PARENT_NAME_RDD") @ApiParam(value ="父级菜单名称") private String parentNameRdd; @@ -80,6 +88,10 @@ public class BfMenu extends BaseBean { private Integer menuStatus; @Transient - @ApiParam(value = "菜单状态") + @ApiParam(value = "菜单子集") private List bfMenuList; + + @Transient + @ApiParam(value = "菜单父级") + private List parentBfMenuList; } diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java index 176e57e..c8ce167 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java @@ -281,4 +281,20 @@ public final class FormHqlPack { return ddlPackBean; } + + /** + * 根据功能id数组查询菜单信息 + * @param methodIds 功能id + * @param status 菜单状态 + * @return + */ + public static DdlPackBean findBfMenuByMethodIdsAndStatus(Long[] methodIds, int status) { + DdlPackBean ddlPackBean = new DdlPackBean(); + + DdlPreparedPack.getInPackArray(methodIds, "methodId", ddlPackBean); + DdlPreparedPack.getNumEqualPack(status, "menuStatus", ddlPackBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", ddlPackBean); + + return ddlPackBean; + } } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java index da33264..3042a97 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java @@ -27,7 +27,9 @@ import java.util.List; @DynamicUpdate @EqualsAndHashCode(callSuper = true) //@Table(name="SYS_MENU",indexes = {@Index(name="索引名称",columnList = "列名1,列名2")}) -@Table(name="SYS_MENU") +@Table(name="SYS_MENU",indexes = { + @Index(name="index_sys_menu_parent_id",columnList = "PARENT_ID"), +}) @Api(value="系统功能",description = "系统功能") public class SysMenu extends BaseBean {