Merge remote-tracking branch 'remotes/origin/dev' into test

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java

@@ -1429,4 +1429,54 @@ public class BlockFormEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 菜单类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MENU_TYPE {
+        FORM_METHOD(1, "FORM_METHOD", "表单功能"),
+        OUTER_CHAIN(2, "OUTER_CHAIN", "外链");
+
+        private int value;
+        private String name;
+        private String description;
+
+        MENU_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 MENU_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;
+        }
+    }
 }

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java

@@ -62,7 +62,7 @@ public class BfMenu extends BaseBean {
 
     @Column(name="METHOD_ID")
     @ApiParam(value ="功能id")
-    private String methodId;
+    private Long methodId;
 
     @Column(name = "MENU_STATUS")
     @ApiParam(value = "菜单状态")

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetail.java

@@ -32,10 +32,6 @@ public class BfMethodDetail extends BaseBean {
     @ApiParam(value ="功能id")
     private Long methodId;
 
-    @Column(name="METHOD_NAME_RDD")
-    @ApiParam(value ="功能名称")
-    private String methodNameRdd;
-
     @Column(name="layout_column_id")
     @ApiParam(value ="布局列id")
     private Long layoutColumnId;

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java

@@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.form.sqlpack;
 import cn.estsh.i3plus.pojo.base.tool.HqlPack;
 import cn.estsh.i3plus.pojo.form.bean.BfLayout;
 import cn.estsh.i3plus.pojo.form.bean.BfLayoutRow;
+import cn.estsh.i3plus.pojo.form.bean.BfMenu;
+import cn.estsh.i3plus.pojo.form.bean.BfMethod;
 import org.apache.commons.lang3.StringUtils;
 
 /**
@@ -89,4 +91,34 @@ public final class FormHqlPack {
         result.append(bfLayoutRow.orderBy());
         return result.toString();
     }
+
+    /**
+     * 菜单目录复杂查询
+     * @param bfMenu 菜单目录
+     * @return hql
+     */
+    public static String packHqlBfMenu(BfMenu bfMenu) {
+        StringBuffer result =  new StringBuffer();
+
+        HqlPack.getStringLikerPack(bfMenu.getMenuName(), "menuName", result);
+        HqlPack.getNumEqualPack(bfMenu.getParentId(), "parentId", result);
+        HqlPack.getNumEqualPack(bfMenu.getIsDeleted(), "isDeleted", result);
+
+        return result.toString();
+    }
+
+    /**
+     * 表单功能复杂查询
+     * @param bfMethod 表单功能查询条件
+     * @return hql
+     */
+    public static String packHqlBfMethod(BfMethod bfMethod) {
+        StringBuffer result = new StringBuffer();
+
+        HqlPack.getStringLikerPack(bfMethod.getMethodName(), "methodName", result);
+        HqlPack.getNumEqualPack(bfMethod.getLayoutId(), "layoutId", result);
+        HqlPack.getNumEqualPack(bfMethod.getIsDeleted(), "isDeleted", result);
+
+        return result.toString();
+    }
 }