From 36dc899615aee282944b09e5abd92f45d0084553 Mon Sep 17 00:00:00 2001
From: yujt <work@yujt.net.cn>
Date: Tue, 1 Sep 2020 13:50:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9app=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD=EF=BC=8C=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E7=B1=BB=E5=88=AB=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/elink/esua/epdc/dto/AppMenuDTO.java   |  5 +++
 .../elink/esua/epdc/dto/AppMenuGroupDTO.java  | 29 ++++++++++++++++
 .../esua/epdc/dto/AppMenuTemplateDTO.java     |  5 +++
 .../esua/epdc/enums/AppMenuCategoryEnum.java  | 33 +++++++++++++++++++
 4 files changed, 72 insertions(+)
 create mode 100644 epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/AppMenuGroupDTO.java
 create mode 100644 epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/enums/AppMenuCategoryEnum.java

diff --git a/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/AppMenuDTO.java b/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/AppMenuDTO.java
index beb5bc8..62025b9 100644
--- a/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/AppMenuDTO.java
+++ b/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/AppMenuDTO.java
@@ -61,6 +61,11 @@ public class AppMenuDTO extends TreeNode<SysMenuDTO> implements Serializable {
     @Range(min = 0, max = 1, message = "{sysmenu.type.range}", groups = DefaultGroup.class)
     private Integer type;
 
+    /**
+     * {@link com.elink.esua.epdc.enums.AppMenuCategoryEnum}
+     */
+    private String category;
+
     /**
      * 菜单图标
      */
diff --git a/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/AppMenuGroupDTO.java b/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/AppMenuGroupDTO.java
new file mode 100644
index 0000000..3a6a2c7
--- /dev/null
+++ b/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/AppMenuGroupDTO.java
@@ -0,0 +1,29 @@
+package com.elink.esua.epdc.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 移动端菜单分组
+ *
+ * @author work@yujt.net.cn
+ * @date 2020/9/1 10:52
+ */
+@Data
+public class AppMenuGroupDTO implements Serializable {
+
+
+    private static final long serialVersionUID = 8979318364775500637L;
+
+    /**
+     * 工作端菜单
+     */
+    private List<AppMenuDTO> workMenu;
+
+    /**
+     * 数据端菜单
+     */
+    private List<AppMenuDTO> analysisMenu;
+}
diff --git a/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/AppMenuTemplateDTO.java b/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/AppMenuTemplateDTO.java
index 9ccf57c..7ccf002 100644
--- a/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/AppMenuTemplateDTO.java
+++ b/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/AppMenuTemplateDTO.java
@@ -68,6 +68,11 @@ public class AppMenuTemplateDTO implements Serializable {
      */
 	private Integer columnAmount;
 
+    /**
+     * {@link com.elink.esua.epdc.enums.AppMenuCategoryEnum}
+     */
+    private String category;
+
     /**
      * 乐观锁
      */
diff --git a/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/enums/AppMenuCategoryEnum.java b/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/enums/AppMenuCategoryEnum.java
new file mode 100644
index 0000000..2aed806
--- /dev/null
+++ b/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/enums/AppMenuCategoryEnum.java
@@ -0,0 +1,33 @@
+package com.elink.esua.epdc.enums;
+
+/**
+ * 移动端菜单类别枚举
+ * ALTER TABLE sys_app_menu ADD COLUMN `category` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '菜单所属类别work(工作端);analysis(数据端)';
+ * ALTER TABLE sys_app_menu_template ADD COLUMN `category` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '菜单所属类别work(工作端);analysis(数据端)';
+ * UPDATE sys_app_menu SET category = 'work';
+ * UPDATE sys_app_menu_template SET category = 'work';
+ *
+ * @author work@yujt.net.cn
+ * @date 2020/9/1 13:34
+ */
+public enum AppMenuCategoryEnum {
+    /**
+     * 工作端/领导端
+     */
+    WORK("work"),
+
+    /**
+     * 数据端
+     */
+    ANALYSIS("analysis");
+
+    private String value;
+
+    AppMenuCategoryEnum(String value) {
+        this.value = value;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}