新增获取目录类型接口

新增查询关联角色接口
枚举名称调整

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

@@ -9,7 +9,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
  * @CreateDate : 2018-12-25 21:08
  * @Modify:
  **/
-public class BlockEnumUtil {
+public class BlockReportEnumUtil {
 
 
     /**
@@ -90,6 +90,55 @@ public class BlockEnumUtil {
             }
             return tmp;
         }
+    }
+
+
+
+    /**
+     * 功能级别
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum METHOD_LEVEL {
+//        PLUGIN(1, "插件"),
+        MODULE(2, "顶级目录"),
+        METHOD(3, "二级目录");
+//        BUTTON(4, "按钮");
+
+        private int value;
+        private String description;
 
+        private METHOD_LEVEL(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        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].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
     }
+
 }

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

@@ -443,7 +443,10 @@ public class CommonEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum METHOD_LEVEL {
-        PLUGIN(1, "插件"),MODULE(2, "模块"), METHOD(3, "功能"), BUTTON(4, "按钮");
+        PLUGIN(1, "插件"),
+        MODULE(2, "顶级目录"),
+        METHOD(3, "二级目录"),
+        BUTTON(4, "按钮");
 
         private int value;
         private String description;

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrElement.java

@@ -38,7 +38,7 @@ public class BrElement extends BaseBean {
 
     @Column(name="ELEMENT_TYPE")
     @ApiParam(value ="元素类型")
-    //BlockEnumUtil.REPORT_ELEMENT_TYPE
+    //BlockReportEnumUtil.REPORT_ELEMENT_TYPE
     private Integer elementType;
 
     @Column(name="ELEMENT_VALUE")