Merge branch 'feature/yujt_analysisHomeChange'

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;
+
     /**
      * 菜单图标
      */

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;
+}

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;
+
     /**
      * 乐观锁
      */

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;
+    }
+}