-- 功能点管理 完成80%，还差最后保存；完成功能点应该可以很快完成菜单管理

plus-admin/admin-console/README.md

+# 功能列表
+### 基础管理
+    用户管理 - 已完成
+    组织机构管理
+    角色管理
+    菜单项 - （需要功能点做前置）
+    功能点管理 - 进行中
+    字典数据管理
+    角色功能授权
+    角色数据授权
+
 # 角色设计说明：关乎于路由表
 
 以集团为一个最大组织,可切换集团。
@@ -7,4 +18,4 @@
 # 开发规范
 - controller以ElController结尾
 - 以El开始的注解是前端视图类注解
-- 所有的字典类型都从数据库中加载进缓存中，任何字典类型都应该以常量访问，任何的字典名称和值都应该以枚举访问。
+- 所有的字典类型都从数据库中加载进缓存中，任何字典类型都应该以常量访问，任何的字典名称和值都应该以枚举访问。
\ No newline at end of file

plus-admin/admin-console/src/main/java/com/ibeetl/admin/console/service/FunctionConsoleService.java

 package com.ibeetl.admin.console.service;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import org.beetl.sql.core.engine.PageQuery;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
+import cn.hutool.core.collection.CollUtil;
 import com.ibeetl.admin.console.dao.FunctionConsoleDao;
 import com.ibeetl.admin.console.dao.RoleFunctionConsoleDao;
 import com.ibeetl.admin.console.web.dto.RoleDataAccessFunction;
@@ -22,23 +14,83 @@ import com.ibeetl.admin.core.rbac.tree.FunctionItem;
 import com.ibeetl.admin.core.service.CoreBaseService;
 import com.ibeetl.admin.core.service.CorePlatformService;
 import com.ibeetl.admin.core.util.PlatformException;
-/** @author lijiazhi */
+import com.ibeetl.admin.core.util.enums.DelFlagEnum;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+import javax.validation.constraints.NotNull;
+import org.beetl.sql.core.engine.PageQuery;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * @author lijiazhi
+ */
 @Service
 @Transactional
 public class FunctionConsoleService extends CoreBaseService<CoreFunction> {
 
-  @Autowired FunctionConsoleDao functionDao;
-  @Autowired CoreMenuDao menuDao;
-  @Autowired RoleFunctionConsoleDao roleFunctionConsoleDao;
-  @Autowired CoreRoleMenuDao sysRoleMenuDao;
-  @Autowired CorePlatformService platformService;
+  @Autowired
+  FunctionConsoleDao functionConsoleDao;
+
+  @Autowired
+  CoreMenuDao coreMenuDao;
+
+  @Autowired
+  RoleFunctionConsoleDao roleFunctionConsoleDao;
+
+  @Autowired
+  CoreRoleMenuDao coreRoleMenuDao;
+
+  @Autowired
+  CorePlatformService corePlatformService;
+
+  public List<CoreFunction> getFuncTree() {
+
+    List<CoreFunction> coreFunctionList = functionConsoleDao.getSQLManager()
+        .lambdaQuery(CoreFunction.class)
+        .andEq(CoreFunction::getDelFlag,
+            DelFlagEnum.NORMAL).select();
+    System.out.println(coreFunctionList);
+
+    CoreFunction root = new CoreFunction();
+    root.setId(-1L);
+    buildTree(root, coreFunctionList);
+    return root.getChildren();
+  }
+
+  /**
+   * 深度优先算法递归构建功能点树
+   *
+   * @param root
+   * @param allNodes
+   * @return
+   */
+  private void buildTree(CoreFunction root, @NotNull List<CoreFunction> allNodes) {
+    if (CollUtil.isEmpty(allNodes)) {
+      return;
+    }
+    List<CoreFunction> childNodes =
+        allNodes.stream()
+            .filter(route -> route.getParentId().equals(root.getId()))
+            .collect(Collectors.toList());
+    root.setChildren(childNodes);
+    allNodes.removeAll(childNodes);
+    List<CoreFunction> rootChildrenList = root.getChildren();
+    for (CoreFunction coreFunction : rootChildrenList) {
+      buildTree(coreFunction, allNodes);
+    }
+  }
 
   public void queryByCondtion(PageQuery<CoreFunction> query) {
-    functionDao.queryByCondtion(query);
+
+    functionConsoleDao.queryByCondtion(query);
     List<CoreFunction> list = query.getList();
     this.queryListAfter(list);
     // 处理父功能名称显示
-    FunctionItem root = platformService.buildFunction();
+    FunctionItem root = corePlatformService.buildFunction();
     for (CoreFunction function : list) {
       Long parentId = function.getParentId();
       String name = "";
@@ -52,70 +104,71 @@ public class FunctionConsoleService extends CoreBaseService<CoreFunction> {
 
   public Long saveFunction(CoreFunction function) {
 
-    functionDao.insert(function, true);
-    platformService.clearFunctionCache();
+    functionConsoleDao.insert(function, true);
+    corePlatformService.clearFunctionCache();
     return function.getId();
   }
 
   /**
    * 删除功能点，跟菜单有关联的无法删除,删除功能点导致所有缓存都需要更新
-   *
-   * @param functionId
-   * @return
    */
   public void deleteFunction(Long functionId) {
+
     deleteFunctionId(functionId);
-    platformService.clearFunctionCache();
+    corePlatformService.clearFunctionCache();
   }
 
   public void batchDeleteFunction(List<Long> functionIds) {
+
     for (Long id : functionIds) {
       deleteFunctionId(id);
     }
-    platformService.clearFunctionCache();
+    corePlatformService.clearFunctionCache();
   }
 
   public void updateFunction(CoreFunction function) {
-    functionDao.updateById(function);
-    platformService.clearFunctionCache();
+
+    functionConsoleDao.updateById(function);
+    corePlatformService.clearFunctionCache();
   }
 
   public CoreFunction getFunction(Long functionId) {
-    return functionDao.unique(functionId);
+
+    return functionConsoleDao.unique(functionId);
   }
 
   public CoreFunction getFunction(String code) {
+
     CoreFunction query = new CoreFunction();
     query.setCode(code);
-    CoreFunction db = functionDao.templateOne(query);
+    CoreFunction db = functionConsoleDao.templateOne(query);
     return db;
   }
 
   /**
    * 得到角色对应的所有功能点
-   *
-   * @param roleId
-   * @return
    */
   public List<Long> getFunctionByRole(Long roleId) {
+
     return this.roleFunctionConsoleDao.getFunctionIdByRole(roleId);
   }
 
   /**
    * 得到角色对应的所有数据权限功能点
-   *
-   * @param roleId
-   * @return
    */
   public List<RoleDataAccessFunction> getQueryFunctionByRole(Long roleId) {
+
     return this.roleFunctionConsoleDao.getQueryFunctionAndRoleData(roleId);
   }
+
   /**
    * 更新角色对应的功能点所有,
    *
-   * @param data，必须包含id,和 dataAcerssType，采用模板更新
+   * @param data，必须包含id,和
+   *     dataAcerssType，采用模板更新
    */
   public void updateFunctionAccessByRole(List<RoleDataAccessFunction> data) {
+
     for (RoleDataAccessFunction fun : data) {
       Long roleId = fun.getRoleId();
       Long functionId = fun.getId();
@@ -139,11 +192,10 @@ public class FunctionConsoleService extends CoreBaseService<CoreFunction> {
   /**
    * 给角色赋予功能同时，根据赋予的功能权限，更新能访问的菜单
    *
-   * @param adds
-   * @param dels
    * @return 返回增加的项的id，用于前端
    */
   public void updateSysRoleFunction(Long roleId, List<Long> adds, List<Long> dels) {
+
     for (Long del : dels) {
       // 获得功能关联的菜单
       CoreRoleFunction temp = new CoreRoleFunction();
@@ -159,7 +211,7 @@ public class FunctionConsoleService extends CoreBaseService<CoreFunction> {
         // 同时，需要删除与此功能关联的菜单
         CoreRoleMenu sysRoleMenu = querySysRoleMenu(roleFunction.getRoleId(), menu.getId());
         if (sysRoleMenu != null) {
-          sysRoleMenuDao.deleteById(sysRoleMenu.getId());
+          coreRoleMenuDao.deleteById(sysRoleMenu.getId());
         }
       }
     }
@@ -176,36 +228,37 @@ public class FunctionConsoleService extends CoreBaseService<CoreFunction> {
         CoreRoleMenu roleMenu = new CoreRoleMenu();
         roleMenu.setMenuId(menu.getId());
         roleMenu.setRoleId(roleId);
-        sysRoleMenuDao.insert(roleMenu);
+        coreRoleMenuDao.insert(roleMenu);
       }
     }
 
     // 清楚缓存
-    platformService.clearFunctionCache();
+    corePlatformService.clearFunctionCache();
   }
 
   private CoreMenu queryFunctionMenu(Long functionId) {
+
     CoreMenu query = new CoreMenu();
     query.setFunctionId(functionId);
-    List<CoreMenu> menus = menuDao.template(query);
+    List<CoreMenu> menus = coreMenuDao.template(query);
     return menus.isEmpty() ? null : menus.get(0);
   }
 
   private CoreRoleMenu querySysRoleMenu(Long roleId, Long menuId) {
+
     CoreRoleMenu query = new CoreRoleMenu();
     query.setMenuId(menuId);
     query.setRoleId(roleId);
-    List<CoreRoleMenu> menus = sysRoleMenuDao.template(query);
+    List<CoreRoleMenu> menus = coreRoleMenuDao.template(query);
     return menus.isEmpty() ? null : menus.get(0);
   }
 
   /**
    * 删除某一个功能点及其子功能，对应的role-function 需要删除，菜单对应的function需要设置成空
-   *
-   * @param functionId
    */
   private void deleteFunctionId(Long functionId) {
-    FunctionItem root = platformService.buildFunction();
+
+    FunctionItem root = corePlatformService.buildFunction();
     FunctionItem fun = root.findChild(functionId);
     List<FunctionItem> all = fun.findAllItem();
     // 也删除自身
@@ -214,14 +267,16 @@ public class FunctionConsoleService extends CoreBaseService<CoreFunction> {
   }
 
   private void realDeleteFunction(List<FunctionItem> all) {
+
     List<Long> ids = new ArrayList<>(all.size());
     for (FunctionItem item : all) {
       ids.add(item.getId());
-      this.functionDao.deleteById(item.getId());
+      this.functionConsoleDao.deleteById(item.getId());
     }
     // 删除角色和功能的关系
     this.roleFunctionConsoleDao.deleteRoleFunction(ids);
     // 设置菜单对应的功能项为空
-    menuDao.clearMenuFunction(ids);
+    coreMenuDao.clearMenuFunction(ids);
   }
+
 }

plus-admin/admin-console/src/main/java/com/ibeetl/admin/console/web/FunctionController.java

@@ -138,7 +138,7 @@ public class FunctionController {
     }
     // 删除功能和所有子功能
     functionConsoleService.deleteFunction(id);
-    return new JsonResult().success();
+    return JsonResult.success();
   }
 
   /**

plus-admin/admin-console/src/main/java/com/ibeetl/admin/console/web/FunctionElController.java

+package com.ibeetl.admin.console.web;
+
+import com.ibeetl.admin.console.service.FunctionConsoleService;
+import com.ibeetl.admin.core.annotation.Function;
+import com.ibeetl.admin.core.entity.CoreFunction;
+import com.ibeetl.admin.core.service.CorePlatformService;
+import com.ibeetl.admin.core.web.JsonResult;
+import java.util.List;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 功能点管理
+ *
+ * @author 一日看尽长安花
+ */
+@Slf4j
+@RestController
+@RequestMapping("/functions")
+public class FunctionElController {
+
+  @Autowired
+  CorePlatformService platformService;
+
+  @Autowired
+  private FunctionConsoleService functionConsoleService;
+
+  /**
+   * @return 功能点树
+   */
+  @GetMapping
+  @Function("function.query")
+  @ResponseBody
+  public JsonResult<List<CoreFunction>> funcsTree() {
+
+    List<CoreFunction> functionTreeNodes = functionConsoleService.getFuncTree();
+    return JsonResult.success(functionTreeNodes);
+  }
+
+}

plus-admin/admin-console/src/main/java/com/ibeetl/admin/console/web/UserConsoleElController.java

@@ -3,7 +3,7 @@ package com.ibeetl.admin.console.web;
 import com.ibeetl.admin.console.service.UserConsoleService;
 import com.ibeetl.admin.console.util.VOUtil;
 import com.ibeetl.admin.console.web.dto.UserExcelExportData;
-import com.ibeetl.admin.console.web.query.CoreUserElQuery;
+import com.ibeetl.admin.console.web.mo.CoreUserElMetadata;
 import com.ibeetl.admin.console.web.query.UserRoleQuery;
 import com.ibeetl.admin.core.annotation.Function;
 import com.ibeetl.admin.core.annotation.RequestBodyPlus;
@@ -53,7 +53,7 @@ public class UserConsoleElController {
   @Function("user.query")
   @GetMapping("/metadata")
   public JsonResult<Map> usersMetedata() {
-    return JsonResult.success(VOUtil.resolveElColumn(CoreUserElQuery.class));
+    return JsonResult.success(VOUtil.resolveElColumn(CoreUserElMetadata.class));
   }
 
   @Function("user.query")

plus-admin/admin-console/src/main/java/com/ibeetl/admin/console/web/query/CoreUserElQuery.java → plus-admin/admin-console/src/main/java/com/ibeetl/admin/console/web/mo/CoreUserElMetadata.java

-package com.ibeetl.admin.console.web.query;
+package com.ibeetl.admin.console.web.mo;
 
 import static com.ibeetl.admin.core.util.enums.ElColumnType.DATE;
 import static com.ibeetl.admin.core.util.enums.ElColumnType.DICT;
@@ -9,13 +9,13 @@ import java.util.Date;
 import lombok.Data;
 
 /**
- * Class CoreUserElQuery : <br>
+ * Class CoreUserElMetadata : <br>
  * 描述：用户管理页面的metadata元数据
  *
  * @author 一日看尽长安花 Created on 2019/12/29
  */
 @Data
-public class CoreUserElQuery {
+public class CoreUserElMetadata {
 
   @ElColumn(
       name = "ID",

plus-admin/admin-console/src/main/resources/sql/console/function.md

@@ -3,7 +3,7 @@ queryByCondtion
 
     select 
     @pageTag(){
-    f.*
+        f.*
     @}
     from core_function f where 1=1 
     @if(!isEmpty(functionIds)){
@@ -22,6 +22,6 @@ queryByCondtion
         and  f.parent_id = #parentFunctionId#
     @}
     @pageIgnoreTag(){
-		   order by id
-		@}
+       order by id
+    @}
 	

plus-admin/admin-console/src/test/java/CustomBeanProcessorTest.java

-import cn.hutool.core.collection.CollUtil;
 import com.ibeetl.admin.ConsoleApplication;
 import com.ibeetl.admin.core.dao.CoreFunctionDao;
 import com.ibeetl.admin.core.entity.CoreRoute;
 import entity.CmsBlog;
-import entity.CmsBlogTypeEnum;
-import java.util.Collections;
-import java.util.EnumSet;
+import entity.FunctionTypeEnum;
 import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.function.BiConsumer;
-import java.util.function.BinaryOperator;
-import java.util.function.Function;
-import java.util.function.Supplier;
-import java.util.stream.Collector;
-import java.util.stream.Collectors;
 import org.beetl.sql.core.SQLManager;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -42,7 +31,7 @@ public class CustomBeanProcessorTest {
     CmsBlog blog = new CmsBlog();
     blog.setTitle("test title");
     blog.setContent("test content");
-    blog.setType(CmsBlogTypeEnum.FN1);
+    blog.setType(FunctionTypeEnum.FN1);
     blog.setCreateUserId(1L);
     sqlManager.lambdaQuery(CmsBlog.class).insert(blog);
   }

plus-admin/admin-console/src/test/java/entity/CmsBlog.java

@@ -10,6 +10,6 @@ public class CmsBlog {
   private String title;
   private String content;
   private Long createUserId;
-  private CmsBlogTypeEnum type;
+  private FunctionTypeEnum type;
   private Long createTime;
 }

plus-admin/admin-console/src/test/java/entity/CmsBlogTypeEnum.java → plus-admin/admin-console/src/test/java/entity/FunctionTypeEnum.java

 package entity;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import com.ibeetl.admin.core.util.enums.DictTypeEnum;
 import org.beetl.sql.core.annotatoin.EnumMapping;
 
 @EnumMapping("value")
-public enum CmsBlogTypeEnum {
-  FN0("FN0", "普通功能", "function_type"),
-  FN1("FN1", "含数据权限", "function_type"),
-  FN2("FN2", "菜单功能", "function_type");
+public enum FunctionTypeEnum implements DictTypeEnum<FunctionTypeEnum> {
+  FN0("FN0", "导航访问", "function_type"),
+  FN1("FN1", "功能访问", "function_type"),
+  FN2("FN2", "菜单访问", "function_type");
+
   private String value;
+
   private String name;
+
   private String type;
 
-  CmsBlogTypeEnum(String value, String name, String type) {
+  FunctionTypeEnum(String value, String name, String type) {
+
     this.value = value;
     this.name = name;
     this.type = type;
   }
 
+  @JsonValue
   public String getValue() {
+
     return value;
   }
 
+
   public void setValue(String value) {
+
     this.value = value;
   }
 
   public String getName() {
+
     return name;
   }
 
   public void setName(String name) {
+
     this.name = name;
   }
 
   public String getType() {
+
     return type;
   }
 
   public void setType(String type) {
+
     this.type = type;
   }
+
+  @JsonCreator
+  @Override
+  public FunctionTypeEnum findEnum(String value) {
+
+    FunctionTypeEnum[] values = values();
+    for (FunctionTypeEnum typeEnum : values) {
+      if (typeEnum.value.equals(value)) {
+        return typeEnum;
+      }
+    }
+    return null;
+  }
 }

plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreFunction.java

@@ -2,9 +2,11 @@ package com.ibeetl.admin.core.entity;
 
 import java.util.Date;
 
+import java.util.List;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
+import lombok.Data;
 import org.beetl.sql.core.annotatoin.AutoID;
 import org.beetl.sql.core.annotatoin.SeqID;
 import org.beetl.sql.core.annotatoin.UpdateIgnore;
@@ -13,6 +15,7 @@ import com.ibeetl.admin.core.annotation.Dict;
 import com.ibeetl.admin.core.util.ValidateConfig;
 import com.ibeetl.admin.core.util.enums.CoreDictType;
 
+@Data
 public class CoreFunction extends BaseEntity {
 
   @NotNull(message = "ID不能为空", groups = ValidateConfig.UPDATE.class)
@@ -20,74 +23,33 @@ public class CoreFunction extends BaseEntity {
   @AutoID
   protected Long id;
 
-  // 创建时间
-  @UpdateIgnore protected Date createTime;
-  private String accessUrl;
-  @NotBlank private String code;
-  @NotBlank private String name;
-  @NotBlank private Long parentId;
-
-  @Dict(type = CoreDictType.FUNCTION_TYPE)
   @NotBlank
-  private String type = null; // "FN0" ;
-
-  public String getAccessUrl() {
-    return accessUrl;
-  }
-
-  public void setAccessUrl(String accessUrl) {
-    this.accessUrl = accessUrl;
-  }
-
-  public String getCode() {
-    return code;
-  }
-
-  public void setCode(String code) {
-    this.code = code;
-  }
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
+  private String code;
 
-  public Date getCreateTime() {
-    return createTime;
-  }
+  @NotBlank
+  private String name;
 
-  public void setCreateTime(Date createTime) {
-    this.createTime = createTime;
-  }
+  private String accessUrl;
 
-  public Long getParentId() {
-    return parentId;
-  }
+  private String component;
 
-  public void setParentId(Long parentId) {
-    this.parentId = parentId;
-  }
+  @NotBlank
+  private Long parentId;
 
-  public Long getId() {
-    return id;
-  }
+  @UpdateIgnore
+  private Date createTime;
 
-  public void setId(Long id) {
-    this.id = id;
-  }
+  private short delFlag;
 
-  public String getType() {
-    return type;
-  }
+  @Dict(type = CoreDictType.FUNCTION_TYPE)
+  @NotBlank
+  private String type;
 
-  public void setType(String type) {
-    this.type = type;
-  }
+  private List<CoreFunction> children;
 
   public boolean hasParent() {
+
     return this.parentId != null && this.parentId > 0;
   }
+
 }

plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreRoute.java

@@ -20,77 +20,84 @@ import java.util.Objects;
 @Data
 public class CoreRoute extends BaseEntity implements Comparable<CoreRoute> {
 
-    private Long id;
-
-    private Long parentId;
-
-    /**
-     * 路由路径，完全参照vue router规范
-     */
-    private String path;
-
-    /**
-     * 路由名称，请确保唯一性
-     */
-    private String name;
-
-    /**
-     * 路由组件component
-     */
-    private String component;
-
-    /**
-     * 路由顺序
-     */
-    private Long seq = -999L;
-
-    /**
-     * 路由元数据信息
-     */
-    private CoreRouteMeta meta;
-
-    /**
-     * 子路由项
-     */
-    private List<CoreRoute> children = CollUtil.newArrayList();
-
-    public CoreRouteMeta getMeta() {
-        if (ObjectUtil.isNotEmpty(this.meta)) {
-            return this.meta;
-        }
-        Map<String, Object> metaMap = MapUtil.builder(getTails()).build();
-        this.meta = BeanUtil.mapToBean(metaMap, CoreRouteMeta.class, true);
-        return this.meta;
-    }
+  private Long id;
+
+  private Long parentId;
+
+  /**
+   * 路由路径，完全参照vue router规范
+   */
+  private String path;
+
+  /**
+   * 路由名称，请确保唯一性
+   */
+  private String name;
+
+  /**
+   * 路由组件component
+   */
+  private String component;
+
+  /**
+   * 路由顺序
+   */
+  private Long seq = -999L;
+
+  /**
+   * 路由元数据信息
+   */
+  private CoreRouteMeta meta;
 
-    @Override
-    public boolean equals(Object o) {
-        if (o != null && o instanceof CoreRoute) {
-            CoreRoute othRoute = (CoreRoute) o;
-            if (this.getId().equals(othRoute.getId())) {
-                return true;
-            }
-            if (this.getParentId().equals(othRoute.getParentId())) {
-                return StrUtil.equals(this.getPath(), othRoute.getPath())
-                        && StrUtil.equals(this.getName(), othRoute.getName());
-            } else {
-                return false;
-            }
-        } else {
-            return false;
-        }
+  /**
+   * 子路由项
+   */
+  private List<CoreRoute> children = CollUtil.newArrayList();
+
+  public CoreRouteMeta getMeta() {
+
+    if (ObjectUtil.isNotEmpty(this.meta)) {
+      return this.meta;
     }
+    Map<String, Object> metaMap = MapUtil.builder(getTails()).build();
+    this.meta = BeanUtil.mapToBean(metaMap, CoreRouteMeta.class, true);
+    return this.meta;
+  }
 
-    @Override
-    public int hashCode() {
-        return Objects.hash(id, parentId, path, name);
+  @Override
+  public boolean equals(Object o) {
+
+    if (o != null && o instanceof CoreRoute) {
+      CoreRoute othRoute = (CoreRoute) o;
+      if (this.getId().equals(othRoute.getId())) {
+        return true;
+      }
+      if (this.getParentId().equals(othRoute.getParentId())) {
+        return StrUtil.equals(this.getPath(), othRoute.getPath())
+            && StrUtil.equals(this.getName(), othRoute.getName());
+      } else {
+        return false;
+      }
+    } else {
+      return false;
     }
+  }
+
+  @Override
+  public int hashCode() {
 
-    @Override
-    public int compareTo(CoreRoute o) {
-        if (null == o) return -1;
-        Long seq1 = this.getSeq() == null ? -999L : this.getSeq();
-        Long seq2 = o.getSeq() == null ? -999L : o.getSeq();
-        return seq1.compareTo(seq2);
+    return Objects.hash(id, parentId, path, name);
+  }
+
+  @Override
+  public int compareTo(CoreRoute o) {
+
+    if (null == o) {
+      return -1;
     }
+    Long seq1 = this.getSeq() == null ? -999L : this.getSeq();
+    Long seq2 = o.getSeq() == null ? -999L : o.getSeq();
+    return seq1.compareTo(seq2);
+  }
+
 }

plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/util/enums/FunctionTypeEnum.java

+package com.ibeetl.admin.core.util.enums;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import org.beetl.sql.core.annotatoin.EnumMapping;
+
+@EnumMapping("value")
+public enum FunctionTypeEnum implements DictTypeEnum<FunctionTypeEnum> {
+  FN0("FN0", "导航访问", "function_type"),
+  FN1("FN1", "功能访问", "function_type"),
+  FN2("FN2", "菜单访问", "function_type");
+
+  private String value;
+
+  private String name;
+
+  private String type;
+
+  FunctionTypeEnum(String value, String name, String type) {
+
+    this.value = value;
+    this.name = name;
+    this.type = type;
+  }
+
+  @JsonValue
+  public String getValue() {
+
+    return value;
+  }
+
+
+  public void setValue(String value) {
+
+    this.value = value;
+  }
+
+  public String getName() {
+
+    return name;
+  }
+
+  public void setName(String name) {
+
+    this.name = name;
+  }
+
+  public String getType() {
+
+    return type;
+  }
+
+  public void setType(String type) {
+
+    this.type = type;
+  }
+
+  @JsonCreator
+  @Override
+  public FunctionTypeEnum findEnum(String value) {
+
+    FunctionTypeEnum[] values = values();
+    for (FunctionTypeEnum typeEnum : values) {
+      if (typeEnum.value.equals(value)) {
+        return typeEnum;
+      }
+    }
+    return null;
+  }
+}

plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/util/enums/StateTypeEnum.java

@@ -27,6 +27,7 @@ public enum StateTypeEnum implements DictTypeEnum<StateTypeEnum> {
     this.name = name;
   }
 
+  @Override
   @JsonValue
   public String getValue() {
     return value;

plus-admin/admin-core/src/main/resources/sql/core/coreFunction.md

@@ -13,7 +13,7 @@ select menu.id,
        func.COMPONENT           component,
        role_menu.ROLE_ID
 from core_menu menu
-       left join core_function func on func.ID = menu.FUNCTION_ID
+       left join core_function func on func.ID = menu.FUNCTION_ID and menu.DEL_FLAG=0
        left join core_role_menu role_menu on role_menu.MENU_ID = menu.id
        
 ```

ve-admin/admin-web/src/api/func.js

+/*
+ * @Author: 一日看尽长安花
+ * @since: 2020-05-31 14:38:23
+ * @LastEditTime: 2020-05-31 14:45:16
+ * @LastEditors: 一日看尽长安花
+ * @Description:
+ */
+import request from '@/utils/request';
+
+/**
+ * 用户管理页的数据
+ * @param {*} params
+ */
+export function funcs(params) {
+  return request({
+    url: '/functions',
+    method: 'get',
+    params
+  });
+}

ve-admin/admin-web/src/store/modules/permission.js

@@ -91,6 +91,7 @@ export function handleComponent(routes) {
          * component = () => import(`@/${_route.component}`);
          */
         //这一步多余的赋值遍历必须存在，import的bug
+        //无法直接使用模板字符
         const name = _route.component;
         _route.component = () => import(`@/${name}`);
       }

ve-admin/admin-web/src/views/functions/index.vue

+<!--
+ * @Author: 一日看尽长安花
+ * @since: 2020-05-30 12:53:38
+ * @LastEditTime: 2020-05-31 21:13:33
+ * @LastEditors: 一日看尽长安花
+ * @Description:
+-->
+<template>
+  <!-- vue实例外创建 -->
+  <div id="func-manager" class="sp-transfer_editor--two">
+    <div class="sp-side_panel--left">
+      <el-input v-model="filterText" placeholder="输入关键字进行过滤">
+      </el-input>
+      <el-tree
+        key="treeKey"
+        ref="tree"
+        :data="treeData"
+        node-key="id"
+        default-expand-all
+        :expand-on-click-node="false"
+        :filter-node-method="filterNode"
+      >
+        <template v-slot="{ node: node, data: data }">
+          <div :class="['sp-tree_node', 'sp-tree_node_type--' + data.type]">
+            <span>{{ data.name }}</span>
+            <span>
+              <el-button
+                plain
+                type="primary"
+                size="mini"
+                @click="appendNode(node, data)"
+              >
+                添加
+              </el-button>
+              <el-button
+                v-if="data.id !== -1"
+                plain
+                type="primary"
+                size="mini"
+                @click="editNode(node, data)"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="data.id !== -1"
+                plain
+                type="primary"
+                size="mini"
+                @click="removeNode(node, data)"
+              >
+                删除
+              </el-button>
+            </span>
+          </div>
+        </template>
+      </el-tree>
+    </div>
+    <div class="sp-side_panel--right">
+      <el-form key="formKey" ref="form" :model="formModel" label-width="80px">
+        <el-form-item label="功能名">
+          <el-input v-model="formModel.name"></el-input>
+        </el-form-item>
+        <el-form-item label="功能代码">
+          <el-input v-model="formModel.code"></el-input>
+        </el-form-item>
+        <el-form-item label="功能地址">
+          <el-input
+            v-model="formModel.access_url"
+            :disabled="actType === 'editor'"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="父功能">
+          <el-input
+            v-model="formModel.parent.name"
+            readonly
+            @focus="openSelectParentNodeLayer"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="功能类型">
+          <el-select v-model="formModel.type" placeholder="请选择功能类型">
+            <el-option label="导航访问" value="FN0"></el-option>
+            <el-option label="功能点访问" value="FN1"></el-option>
+            <el-option label="菜单访问" value="FN2"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button
+            type="primary"
+            @click="actType === 'create' ? createNode : updateNode"
+          >保存</el-button
+          >
+          <el-button>取消</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+    <sel-func-dialog :visible.sync="dialogVisible" :tree-data="treeData">
+    </sel-func-dialog>
+  </div>
+</template>
+<script>
+/** 功能点管理 */
+import { funcs } from '@/api/func';
+import SelFuncDialog from './select_dialog';
+
+export default {
+  name: 'FunctionMange',
+  components: { SelFuncDialog },
+  props: {},
+  data() {
+    return {
+      filterText: '',
+      treeData: [],
+      formModel: {
+        parent: {
+          id: undefined,
+          name: undefined
+        }
+      },
+      actType: 'create',
+      dialogVisible: false
+    };
+  },
+  watch: {
+    filterText(val) {
+      this.$refs.tree.filter(val);
+    }
+  },
+  mounted() {
+    funcs().then(res => {
+      const { code, message, data } = { ...res };
+      const vmNode = [
+        {
+          id: -1,
+          name: '平台',
+          children: data
+        }
+      ];
+      this.treeData = vmNode;
+    });
+  },
+  methods: {
+    filterNode(value, data) {
+      if (!value) return true;
+      return data.name.indexOf(value) !== -1;
+    },
+    appendNode(node, data) {
+      this.formModel = {};
+      this.formModel.parent = data;
+      this.actType = 'create';
+    },
+    editNode(node, data) {
+      this.formModel = data;
+      this.formModel.parent = node.parent.data;
+      this.actType = 'editor';
+    },
+    removeNode(node, data) {},
+    createNode() {},
+    updateNode() {},
+    openSelectParentNodeLayer() {
+      console.log(Math.random());
+      this.dialogVisible = true;
+    }
+  }
+};
+</script>
+<style lang="scss" scoped>
+.sp-transfer_editor--two {
+  display: flex;
+  justify-content: space-between;
+  align-items: stretch;
+  margin: 10px;
+  min-height: 84vh;
+  max-height: 84vh;
+}
+%sp-side_panel--common {
+  flex-grow: 1;
+  flex-shrink: 1;
+  flex-basis: 0%;
+  box-shadow: 2px 2px 6px 1px #aaa;
+  padding: 10px;
+  margin: 0 10px;
+}
+.sp-side_panel--left {
+  @extend %sp-side_panel--common;
+  overflow-y: scroll;
+}
+.sp-side_panel--right {
+  @extend %sp-side_panel--common;
+}
+.sp-tree_node {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  width: 100%;
+  padding-left: 6px;
+  border-radius: 5px;
+}
+%sp-tree_node_type {
+  box-shadow: 1px 1px 1px 1px #e8f4ff;
+}
+.sp-tree_node_type--FN0 {
+  @extend %sp-tree_node_type;
+  background: linear-gradient(to right, #ff03035e, transparent);
+}
+.sp-tree_node_type--FN1 {
+  @extend %sp-tree_node_type;
+  background: linear-gradient(to right, #fff5035e, transparent);
+}
+.sp-tree_node_type--FN2 {
+  @extend %sp-tree_node_type;
+  background: linear-gradient(to right, #033cff5e, transparent);
+}
+</style>
+<style lang="scss">
+.el-tree-node {
+  margin-top: 5px;
+}
+</style>

ve-admin/admin-web/src/views/functions/select_dialog.vue

+<!--
+ * @Author: 一日看尽长安花
+ * @since: 2020-05-30 12:53:38
+ * @LastEditTime: 2020-05-31 21:28:18
+ * @LastEditors: 一日看尽长安花
+ * @Description:
+-->
+<template>
+  <el-dialog
+    id="sel-func-dialog"
+    title="功能点选择"
+    :visible="visible"
+    @update:visible="$emit('update:visible', $event)"
+  >
+    <el-input v-model="filterText" placeholder="输入关键字进行过滤"> </el-input>
+    <el-tree
+      :key="Math.random()"
+      ref="tree"
+      :data="treeData"
+      node-key="id"
+      :show-checkbox="true"
+      default-expand-all
+      :expand-on-click-node="false"
+      :filter-node-method="filterNode"
+    >
+      <template v-slot="{ node: node, data: data }">
+        <div :class="['sp-tree_node', 'sp-tree_node_type--' + data.type]">
+          <span>{{ data.name }}</span>
+        </div>
+      </template>
+    </el-tree>
+    <div slot="footer" class="dialog-footer">
+      <el-button
+        type="primary"
+        @click="dialogFormVisible = false"
+      >确 定</el-button
+      >
+    </div>
+  </el-dialog>
+</template>
+<script>
+/** 功能点管理 */
+import { funcs } from '@/api/func';
+
+export default {
+  name: 'SelFuncDialog',
+  components: {},
+  props: {
+    visible: {
+      type: Boolean,
+      default: false
+    },
+    treeData: {
+      type: Array,
+      default: function() {
+        return [];
+      }
+    }
+  },
+  data() {
+    return {
+      filterText: ''
+    };
+  },
+  watch: {
+    filterText(val) {
+      this.$refs.tree.filter(val);
+    }
+  },
+  methods: {
+    filterNode(value, data) {
+      if (!value) return true;
+      return data.name.indexOf(value) !== -1;
+    }
+  }
+};
+</script>
+<style lang="scss" scoped>
+.sp-tree_node {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  width: 100%;
+  padding-left: 6px;
+  border-radius: 5px;
+}
+%sp-tree_node_type {
+  box-shadow: 1px 1px 1px 1px #e8f4ff;
+}
+.sp-tree_node_type--FN0 {
+  @extend %sp-tree_node_type;
+  background: linear-gradient(to right, #ff03035e, transparent);
+}
+.sp-tree_node_type--FN1 {
+  @extend %sp-tree_node_type;
+  background: linear-gradient(to right, #fff5035e, transparent);
+}
+.sp-tree_node_type--FN2 {
+  @extend %sp-tree_node_type;
+  background: linear-gradient(to right, #033cff5e, transparent);
+}
+</style>
+<style lang="scss">
+.el-tree-node {
+  margin-top: 5px;
+}
+</style>