From cb596647401b669d1b20a0c3bc753502dd05678b Mon Sep 17 00:00:00 2001
From: "wei.peng" <pengwei940613@163.com>
Date: Fri, 18 Jan 2019 10:11:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=8E=B7=E5=8F=96=E7=9B=AE?=
 =?UTF-8?q?=E5=BD=95=E7=B1=BB=E5=9E=8B=E6=8E=A5=E5=8F=A3=20=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=9F=A5=E8=AF=A2=E5=85=B3=E8=81=94=E8=A7=92=E8=89=B2?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=20=E6=9E=9A=E4=B8=BE=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...BlockEnumUtil.java => BlockReportEnumUtil.java} | 51 +++++++++++++++++++++-
 .../i3plus/pojo/base/enumutil/CommonEnumUtil.java  |  5 ++-
 .../estsh/i3plus/pojo/report/bean/BrElement.java   |  2 +-
 3 files changed, 55 insertions(+), 3 deletions(-)
 rename modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/{BlockEnumUtil.java => BlockReportEnumUtil.java} (63%)

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java
similarity index 63%
rename from modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockEnumUtil.java
rename to modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java
index d8350d6..32d1887 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockEnumUtil.java
+++ b/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;
+        }
     }
+
 }
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java
index b6fa846..24e4496 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java
+++ b/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;
diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrElement.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrElement.java
index e3bf5aa..165dcd9 100644
--- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrElement.java
+++ b/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")