diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java index f470c2d..6d94127 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java @@ -1905,4 +1905,111 @@ public class BlockFormEnumUtil { } } + /** + * 数据状态 + * 1 启用 + * 2 禁用 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum DATA_STATUS { + ENABLE(1, "启用", "fa fa-success cell-fa fa-check"), + DISABLE(2, "禁用", "fa fa-disabled cell-fa fa-times-circle"); + + private int value; + private String name; + private String description; + + DATA_STATUS() { + } + + DATA_STATUS(int value, String name, String description) { + this.value = value; + this.name = name; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getName() { + return name; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].getName(); + } + } + return tmp; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].name.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + + /** + * 按钮位置类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BUTTON_POSITION_TYPE { + FORM_METHOD(1, "FORM_METHOD", "表单功能"), + FORM_METHOD_DETAIL(2, "FORM_ETHOD_DETAIL", "表单功能明细"); + + private int value; + private String name; + private String description; + + BUTTON_POSITION_TYPE(int value, String name, String description) { + this.value = value; + this.name = name; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getName() { + return name; + } + + public static BUTTON_POSITION_TYPE valueOf(int val) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].name.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + } diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfButton.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfButton.java index bc8a73b..2b9622f 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfButton.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfButton.java @@ -60,4 +60,8 @@ public class BfButton extends BaseBean { @Column(name = "METHOD_CONTENT") @ApiParam(value = "执行内容") private String methodContent; + + @Column(name = "BUTTON_DESCRIPTION") + @ApiParam(value = "按钮描述") + private String buttonDescription; } 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 054e5cd..859a7e4 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 @@ -55,6 +55,7 @@ public class BfMenu extends BaseBean { @ApiParam(value ="菜单样式") private String menuStyle; + // @Column(name="MENU_TYPE") @ApiParam(value ="菜单类型") private Integer menuType; @@ -68,6 +69,10 @@ public class BfMenu extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long methodId; + @Column(name="METHOD_NAME_RDD") + @ApiParam(value ="功能名称") + private String methodNameRdd; + @Column(name = "MENU_STATUS") @ApiParam(value = "菜单状态") private Integer menuStatus; 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 c45c4e6..b58d288 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 @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.form.sqlpack; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.base.tool.HqlPack; import cn.estsh.i3plus.pojo.form.bean.*; @@ -124,15 +125,16 @@ public final class FormHqlPack { * @param bfMenu 菜单目录 * @return hql */ - public static String packHqlBfMenu(BfMenu bfMenu) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlBfMenu(BfMenu bfMenu) { + DdlPackBean result = new DdlPackBean(); - HqlPack.getStringLikerPack(bfMenu.getMenuName(), "menuName", result); - HqlPack.getNumEqualPack(bfMenu.getParentId(), "parentId", result); - HqlPack.getNumEqualPack(bfMenu.getIsDeleted(), "isDeleted", result); - result.append(bfMenu.orderBy()); + DdlPreparedPack.getStringLikerPack(bfMenu.getMenuName(), "menuName", result); + DdlPreparedPack.getNumEqualPack(bfMenu.getParentId(), "parentId", result); + DdlPreparedPack.getNumEqualPack(bfMenu.getMenuStatus(), "menuStatus", result); + DdlPreparedPack.getNumEqualPack(bfMenu.getIsDeleted(), "isDeleted", result); + result.setOrderByStr(bfMenu.orderBy()); - return result.toString(); + return result; } /** @@ -152,6 +154,22 @@ public final class FormHqlPack { } /** + * 表单功能明细复杂查询 + * @param bfMethodDetail 表单功能明细查询条件 + * @return hql + */ + public static DdlPackBean packHqlBfMethodDetail(BfMethodDetail bfMethodDetail) { + DdlPackBean ddlPackBean = new DdlPackBean(); + + DdlPreparedPack.getStringLikerPack(bfMethodDetail.getMethodDetailName(), "methodDetailName", ddlPackBean); + DdlPreparedPack.getNumEqualPack(bfMethodDetail.getMethodId(), "layoutId", ddlPackBean); + DdlPreparedPack.getNumEqualPack(bfMethodDetail.getIsDeleted(), "isDeleted", ddlPackBean); + ddlPackBean.setOrderByStr(bfMethodDetail.orderBy()); + + return ddlPackBean; + } + + /** * 表单拦截器复杂查询 * @param bfIntercept 查询条件 * @return hql @@ -170,15 +188,30 @@ public final class FormHqlPack { /** * 表单按钮复杂查询 * @param bfButton 查询条件 + * @return 查询条件 */ - public static String packHqlBfButton(BfButton bfButton){ - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlBfButton(BfButton bfButton){ + DdlPackBean ddlPackBean = new DdlPackBean(); - HqlPack.getStringLikerPack(bfButton.getButtonName(), "buttonName", result); - HqlPack.getNumEqualPack(bfButton.getTriggerMode(), "triggerMode", result); - HqlPack.getNumEqualPack(bfButton.getIsDeleted(), "isDeleted", result); - result.append(bfButton.orderBy()); + DdlPreparedPack.getStringLikerPack(bfButton.getButtonName(), "buttonName", ddlPackBean); + DdlPreparedPack.getNumEqualPack(bfButton.getTriggerMode(), "triggerMode", ddlPackBean); + DdlPreparedPack.getNumEqualPack(bfButton.getIsDeleted(), "isDeleted", ddlPackBean); + ddlPackBean.setOrderByStr(bfButton.orderBy()); - return result.toString(); + return ddlPackBean; + } + + /** + * 根据角色id查询关联功能 + * @param roleIds 角色id + * @return 查询条件 + */ + public static DdlPackBean packHqlBfRefMethodRoleByRoleIds(Long[] roleIds){ + DdlPackBean ddlPackBean = new DdlPackBean(); + + DdlPreparedPack.getInPackArray(roleIds, "roleId", ddlPackBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", ddlPackBean); + + return ddlPackBean; } }