Browse Source

修改树形结构treecode字段为path

zhouhao 8 years ago
parent
commit
f6869ac481
20 changed files with 46 additions and 68 deletions
  1. 5 7
      hsweb-commons/hsweb-commons-entity/src/main/java/org/hswebframework/web/commons/entity/SimpleTreeSortSupportEntity.java
  2. 18 19
      hsweb-commons/hsweb-commons-entity/src/main/java/org/hswebframework/web/commons/entity/TreeSupportEntity.java
  3. 3 5
      hsweb-commons/hsweb-commons-service/hsweb-commons-service-simple/src/main/java/org/hswebframework/web/service/AbstractTreeSortService.java
  4. 1 1
      hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-dao/hsweb-system-dictionary-dao-mybatis/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/dictionary/DictionaryItemMapper.xml
  5. 1 1
      hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-entity/src/main/java/org/hswebframework/web/entity/dictionary/DictionaryItemEntity.java
  6. 1 1
      hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-starter/src/main/resources/hsweb-starter.js
  7. 1 1
      hsweb-system/hsweb-system-menu/hsweb-system-menu-dao/hsweb-system-menu-dao-mybatis/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/menu/MenuGroupBindMapper.xml
  8. 1 1
      hsweb-system/hsweb-system-menu/hsweb-system-menu-dao/hsweb-system-menu-dao-mybatis/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/menu/MenuGroupMapper.xml
  9. 1 1
      hsweb-system/hsweb-system-menu/hsweb-system-menu-dao/hsweb-system-menu-dao-mybatis/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/menu/MenuMapper.xml
  10. 1 1
      hsweb-system/hsweb-system-menu/hsweb-system-menu-entity/src/main/java/org/hswebframework/web/entity/menu/MenuGroupBindEntity.java
  11. 1 1
      hsweb-system/hsweb-system-menu/hsweb-system-menu-entity/src/main/java/org/hswebframework/web/entity/menu/MenuGroupEntity.java
  12. 3 3
      hsweb-system/hsweb-system-menu/hsweb-system-menu-starter/src/main/resources/hsweb-starter.js
  13. 1 1
      hsweb-system/hsweb-system-organizational/hsweb-system-organizational-dao/hsweb-system-organizational-dao-mybatis/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/organizational/DepartmentMapper.xml
  14. 1 1
      hsweb-system/hsweb-system-organizational/hsweb-system-organizational-dao/hsweb-system-organizational-dao-mybatis/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/organizational/OrganizationalMapper.xml
  15. 1 1
      hsweb-system/hsweb-system-organizational/hsweb-system-organizational-dao/hsweb-system-organizational-dao-mybatis/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/organizational/PositionMapper.xml
  16. 1 1
      hsweb-system/hsweb-system-organizational/hsweb-system-organizational-entity/src/main/java/org/hswebframework/web/entity/organizational/DepartmentEntity.java
  17. 1 1
      hsweb-system/hsweb-system-organizational/hsweb-system-organizational-entity/src/main/java/org/hswebframework/web/entity/organizational/OrganizationalEntity.java
  18. 1 1
      hsweb-system/hsweb-system-organizational/hsweb-system-organizational-entity/src/main/java/org/hswebframework/web/entity/organizational/PositionEntity.java
  19. 0 17
      hsweb-system/hsweb-system-organizational/hsweb-system-organizational-entity/src/main/java/org/hswebframework/web/entity/organizational/SimpleOrganizationalEntity.java
  20. 3 3
      hsweb-system/hsweb-system-organizational/hsweb-system-organizational-starter/src/main/resources/hsweb-starter.js

+ 5 - 7
hsweb-commons/hsweb-commons-entity/src/main/java/org/hswebframework/web/commons/entity/SimpleTreeSortSupportEntity.java

@@ -33,7 +33,7 @@ public abstract class SimpleTreeSortSupportEntity<PK> extends SimpleGenericEntit
      * 树结构编码,用于快速查找, 每一层由4位字符组成,用-分割
      * 如第一层:0001 第二层:0001-0001 第三层:0001-0001-0001
      */
-    private String treeCode;
+    private String path;
 
     /**
      * 排序索引
@@ -42,14 +42,12 @@ public abstract class SimpleTreeSortSupportEntity<PK> extends SimpleGenericEntit
 
     private Integer level;
 
-    @Override
-    public String getTreeCode() {
-        return treeCode;
+    public String getPath() {
+        return path;
     }
 
-    @Override
-    public void setTreeCode(String treeCode) {
-        this.treeCode = treeCode;
+    public void setPath(String path) {
+        this.path = path;
     }
 
     @Override

+ 18 - 19
hsweb-commons/hsweb-commons-entity/src/main/java/org/hswebframework/web/commons/entity/TreeSupportEntity.java

@@ -25,7 +25,6 @@ import org.hswebframwork.utils.StringUtils;
 
 import java.util.*;
 import java.util.function.BiConsumer;
-import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
@@ -34,13 +33,13 @@ public interface TreeSupportEntity<PK> extends GenericEntity<PK> {
 
     String id = "id";
 
-    String treeCode = "treeCode";
+    String path = "path";
 
     String parentId = "parentId";
 
-    String getTreeCode();
+    String getPath();
 
-    void setTreeCode(String treeCode);
+    void setPath(String path);
 
     PK getParentId();
 
@@ -50,28 +49,28 @@ public interface TreeSupportEntity<PK> extends GenericEntity<PK> {
 
     void setLevel(Integer level);
 
-    default void setLevelFromTreeCode() {
-        if (getTreeCode() != null)
-            setLevel(getTreeCode().split("-").length);
+    default void setLevelFromPath() {
+        if (getPath() != null)
+            setLevel(getPath().split("-").length);
     }
 
     <T extends TreeSupportEntity<PK>> List<T> getChildren();
 
     /**
-     * 根据treeCode获取父节点的treeCode
+     * 根据path获取父节点的path
      *
-     * @param treeCode treeCode
-     * @return 父节点treeCode
+     * @param path path
+     * @return 父节点path
      */
-    static String getParentTreeCode(String treeCode) {
-        if (treeCode == null || treeCode.length() < 4) return null;
-        return treeCode.substring(0, treeCode.length() - 5);
+    static String getParentPath(String path) {
+        if (path == null || path.length() < 4) return null;
+        return path.substring(0, path.length() - 5);
     }
 
     /**
      * 将树形结构转为列表结构,并填充对应的数据。<br>
      * 如树结构数据: {name:'父节点',children:[{name:'子节点1'},{name:'子节点2'}]}<br>
-     * 解析后:[{id:'id1',name:'父节点',treeCode:'<b>aoSt</b>'},{id:'id2',name:'子节点1',treeCode:'<b>aoSt</b>-oS5a'},{id:'id3',name:'子节点2',treeCode:'<b>aoSt</b>-uGpM'}]
+     * 解析后:[{id:'id1',name:'父节点',path:'<b>aoSt</b>'},{id:'id2',name:'子节点1',path:'<b>aoSt</b>-oS5a'},{id:'id3',name:'子节点2',path:'<b>aoSt</b>-uGpM'}]
      *
      * @param parent      树结构的根节点
      * @param target      目标集合,转换后的数据将直接添加({@link List#add(Object)})到这个集合.
@@ -81,9 +80,9 @@ public interface TreeSupportEntity<PK> extends GenericEntity<PK> {
      */
     static <T extends TreeSupportEntity<PK>, PK> void expandTree2List(TreeSupportEntity<PK> parent, List<T> target, IDGenerator<PK> idGenerator) {
         List<T> children = parent.getChildren();
-        if (parent.getTreeCode() == null) {
-            parent.setTreeCode(RandomUtil.randomChar(4));
-            parent.setLevelFromTreeCode();
+        if (parent.getPath() == null) {
+            parent.setPath(RandomUtil.randomChar(4));
+            parent.setLevelFromPath();
         }
         if (children != null) {
             PK pid = parent.getId();
@@ -97,8 +96,8 @@ public interface TreeSupportEntity<PK> extends GenericEntity<PK> {
                     ((SortSupportEntity) child).setSortIndex(StringUtils.toLong(((SortSupportEntity) parent).getSortIndex() + "0" + (i + 1)));
                 }
                 child.setParentId(pid);
-                child.setTreeCode(parent.getTreeCode() + "-" + RandomUtil.randomChar(4));
-                child.setLevelFromTreeCode();
+                child.setPath(parent.getPath() + "-" + RandomUtil.randomChar(4));
+                child.setLevelFromPath();
                 target.add(child);
                 expandTree2List(child, target, idGenerator);
             }

+ 3 - 5
hsweb-commons/hsweb-commons-service/hsweb-commons-service-simple/src/main/java/org/hswebframework/web/service/AbstractTreeSortService.java

@@ -19,9 +19,7 @@ package org.hswebframework.web.service;
 
 import org.hswebframework.web.commons.entity.TreeSortSupportEntity;
 import org.hswebframework.web.commons.entity.TreeSupportEntity;
-import org.hswebframework.web.id.IDGenerator;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.Assert;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -44,7 +42,7 @@ public abstract class AbstractTreeSortService<E extends TreeSortSupportEntity<PK
         assertNotNull(parentId);
         E old = selectByPk(parentId);
         assertNotNull(old);
-        return createQuery().where().like$(TreeSupportEntity.treeCode, old.getTreeCode()).noPaging().list();
+        return createQuery().where().like$(TreeSupportEntity.path, old.getPath()).noPaging().list();
     }
 
     @Override
@@ -103,8 +101,8 @@ public abstract class AbstractTreeSortService<E extends TreeSortSupportEntity<PK
         E old = selectByPk(id);
         assertNotNull(old);
         return DefaultDSLDeleteService.createDelete(getDao())
-                // where tree_code like 'treeCode%'
-                .where().like$(TreeSupportEntity.treeCode, old.getTreeCode())
+                // where path like 'path%'
+                .where().like$(TreeSupportEntity.path, old.getPath())
                 .exec();
     }
 }

+ 1 - 1
hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-dao/hsweb-system-dictionary-dao-mybatis/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/dictionary/DictionaryItemMapper.xml

@@ -29,7 +29,7 @@
         <result property="enabled" column="enabled" javaType="Long" jdbcType="DECIMAL"/>
         <result property="describe" column="describe" javaType="String" jdbcType="VARCHAR"/>
         <result property="parentId" column="parent_id" javaType="String" jdbcType="VARCHAR"/>
-        <result property="treeCode" column="tree_code" javaType="String" jdbcType="VARCHAR"/>
+        <result property="path" column="path" javaType="String" jdbcType="VARCHAR"/>
         <result property="searchCode" column="search_code" javaType="String" jdbcType="VARCHAR"/>
         <result property="sortIndex" column="sort_index" javaType="Long" jdbcType="DECIMAL"/>
         <result property="level" column="level" javaType="Long" jdbcType="DECIMAL"/>

+ 1 - 1
hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-entity/src/main/java/org/hswebframework/web/entity/dictionary/DictionaryItemEntity.java

@@ -62,7 +62,7 @@ public interface DictionaryItemEntity extends TreeSortSupportEntity<String> {
     /**
      * 树编码
      */
-    String treeCode   = "treeCode";
+    String path   = "path";
     /**
      * 快速搜索码
      */

+ 1 - 1
hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-starter/src/main/resources/hsweb-starter.js

@@ -56,7 +56,7 @@ function install(context) {
         .addColumn().name("is_enabled").alias("enabled").comment("是否启用").jdbcType(java.sql.JDBCType.DECIMAL).length(4,0).commit()
         .addColumn().name("describe").alias("describe").comment("说明").jdbcType(java.sql.JDBCType.VARCHAR).length(128).commit()
         .addColumn().name("parent_id").alias("parentId").comment("父级选项").jdbcType(java.sql.JDBCType.VARCHAR).length(32).commit()
-        .addColumn().name("tree_code").alias("treeCode").comment("树编码").jdbcType(java.sql.JDBCType.VARCHAR).length(3000).commit()
+        .addColumn().name("path").alias("path").comment("树编码").jdbcType(java.sql.JDBCType.VARCHAR).length(3000).commit()
         .addColumn().name("search_code").alias("searchCode").comment("快速搜索码").jdbcType(java.sql.JDBCType.VARCHAR).length(128).commit()
         .addColumn().name("sort_index").alias("sortIndex").comment("排序索引").jdbcType(java.sql.JDBCType.DECIMAL).length(32,0).commit()
         .addColumn().name("level").alias("level").comment("树结构层级").jdbcType(java.sql.JDBCType.DECIMAL).length(32,0).commit()

+ 1 - 1
hsweb-system/hsweb-system-menu/hsweb-system-menu-dao/hsweb-system-menu-dao-mybatis/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/menu/MenuGroupBindMapper.xml

@@ -21,7 +21,7 @@
 <mapper namespace="org.hswebframework.web.dao.menu.MenuGroupBindDao">
     <resultMap id="MenuGroupBindResultMap" type="org.hswebframework.web.entity.menu.SimpleMenuGroupBindEntity">
         <id property="id" column="u_id" javaType="string" jdbcType="VARCHAR"/>
-            <result property="treeCode" column="tree_code" javaType="String" jdbcType="VARCHAR"/>
+            <result property="path" column="path" javaType="String" jdbcType="VARCHAR"/>
             <result property="parentId" column="parent_id" javaType="String" jdbcType="VARCHAR"/>
             <result property="level" column="level" javaType="Integer" jdbcType="DECIMAL"/>
             <result property="sortIndex" column="sort_index" javaType="Long" jdbcType="DECIMAL"/>

+ 1 - 1
hsweb-system/hsweb-system-menu/hsweb-system-menu-dao/hsweb-system-menu-dao-mybatis/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/menu/MenuGroupMapper.xml

@@ -24,7 +24,7 @@
             <result property="name" column="name" javaType="String" jdbcType="VARCHAR"/>
             <result property="describe" column="describe" javaType="String" jdbcType="VARCHAR"/>
             <result property="defaultGroup" column="default_group" javaType="Boolean" jdbcType="DECIMAL"/>
-            <result property="treeCode" column="tree_code" javaType="String" jdbcType="VARCHAR"/>
+            <result property="path" column="path" javaType="String" jdbcType="VARCHAR"/>
             <result property="parentId" column="parent_id" javaType="String" jdbcType="VARCHAR"/>
             <result property="level" column="level" javaType="Integer" jdbcType="DECIMAL"/>
             <result property="sortIndex" column="sort_index" javaType="Long" jdbcType="DECIMAL"/>

+ 1 - 1
hsweb-system/hsweb-system-menu/hsweb-system-menu-dao/hsweb-system-menu-dao-mybatis/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/menu/MenuMapper.xml

@@ -26,7 +26,7 @@
         <result property="describe" column="describe" javaType="String" jdbcType="VARCHAR"/>
         <result property="parentId" column="parent_id" javaType="String" jdbcType="VARCHAR"/>
         <result property="name" column="name" javaType="String" jdbcType="VARCHAR"/>
-        <result property="treeCode" column="tree_code" javaType="String" jdbcType="VARCHAR"/>
+        <result property="path" column="path" javaType="String" jdbcType="VARCHAR"/>
         <result property="permissionId" column="permission_id" javaType="String" jdbcType="VARCHAR"/>
         <result property="enabled" column="enabled" javaType="boolean" jdbcType="NUMERIC"/>
         <result property="sortIndex" column="sort_index" javaType="long" jdbcType="NUMERIC"/>

+ 1 - 1
hsweb-system/hsweb-system-menu/hsweb-system-menu-entity/src/main/java/org/hswebframework/web/entity/menu/MenuGroupBindEntity.java

@@ -34,7 +34,7 @@ public interface MenuGroupBindEntity extends TreeSortSupportEntity<String> {
     /**
      * 树结构编码
      */
-    String treeCode      = "treeCode";
+    String path      = "path";
     /**
      * 父级id
      */

+ 1 - 1
hsweb-system/hsweb-system-menu/hsweb-system-menu-entity/src/main/java/org/hswebframework/web/entity/menu/MenuGroupEntity.java

@@ -44,7 +44,7 @@ public interface MenuGroupEntity extends TreeSortSupportEntity<String> {
     /**
      * 树结构编码
      */
-    String treeCode     = "treeCode";
+    String path     = "path";
     /**
      * 父级id
      */

+ 3 - 3
hsweb-system/hsweb-system-menu/hsweb-system-menu-starter/src/main/resources/hsweb-starter.js

@@ -41,7 +41,7 @@ function install(context) {
         .addColumn().name("name").varchar(64).notNull().comment("名称").commit()
         .addColumn().name("parent_id").varchar(32).comment("父级ID").commit()
         .addColumn().name("permission_id").varchar(32).comment("权限ID").commit()
-        .addColumn().name("tree_code").varchar(2048).notNull().comment("树编码").commit()
+        .addColumn().name("path").varchar(2048).notNull().comment("树编码").commit()
         .addColumn().name("sort_index").number(32).notNull().comment("树编码").commit()
         .addColumn().name("describe").varchar(128).comment("备注").commit()
         .addColumn().name("url").varchar(2000).comment("URL").commit()
@@ -54,7 +54,7 @@ function install(context) {
         .addColumn().name("name").alias("name").comment("分组名称").jdbcType(java.sql.JDBCType.VARCHAR).length(32).commit()
         .addColumn().name("describe").alias("describe").comment("分组描述").jdbcType(java.sql.JDBCType.VARCHAR).length(64).commit()
         .addColumn().name("default_group").alias("defaultGroup").comment("是否默认").jdbcType(java.sql.JDBCType.DECIMAL).length(4, 0).commit()
-        .addColumn().name("tree_code").alias("treeCode").comment("树结构编码").jdbcType(java.sql.JDBCType.VARCHAR).length(4000).commit()
+        .addColumn().name("path").alias("path").comment("树路径").jdbcType(java.sql.JDBCType.VARCHAR).length(4000).commit()
         .addColumn().name("parent_id").alias("parentId").comment("父级id").jdbcType(java.sql.JDBCType.VARCHAR).length(32).commit()
         .addColumn().name("level").alias("level").comment("树层级").jdbcType(java.sql.JDBCType.DECIMAL).length(32, 0).commit()
         .addColumn().name("sort_index").alias("sortIndex").comment("排序序号").jdbcType(java.sql.JDBCType.DECIMAL).length(32, 0).commit()
@@ -65,7 +65,7 @@ function install(context) {
         .addColumn().name("u_id").alias("id").comment("ID").jdbcType(java.sql.JDBCType.VARCHAR).length(32).primaryKey().commit()
         .addColumn().name("menu_id").alias("menuId").comment("菜单id").jdbcType(java.sql.JDBCType.VARCHAR).length(32).commit()
         .addColumn().name("group_id").alias("groupId").comment("分组id").jdbcType(java.sql.JDBCType.VARCHAR).length(32).commit()
-        .addColumn().name("tree_code").alias("treeCode").comment("树结构编码").jdbcType(java.sql.JDBCType.VARCHAR).length(4000).commit()
+        .addColumn().name("path").alias("path").comment("树结构编码").jdbcType(java.sql.JDBCType.VARCHAR).length(4000).commit()
         .addColumn().name("parent_id").alias("parentId").comment("父级id").jdbcType(java.sql.JDBCType.VARCHAR).length(32).commit()
         .addColumn().name("level").alias("level").comment("树层级").jdbcType(java.sql.JDBCType.DECIMAL).length(32, 0).commit()
         .addColumn().name("sort_index").alias("sortIndex").comment("排序序号").jdbcType(java.sql.JDBCType.DECIMAL).length(32, 0).commit()

+ 1 - 1
hsweb-system/hsweb-system-organizational/hsweb-system-organizational-dao/hsweb-system-organizational-dao-mybatis/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/organizational/DepartmentMapper.xml

@@ -25,7 +25,7 @@
             <result property="orgId" column="org_id" javaType="String" jdbcType="VARCHAR"/>
             <result property="code" column="code" javaType="String" jdbcType="VARCHAR"/>
             <result property="parentId" column="parent_id" javaType="String" jdbcType="VARCHAR"/>
-            <result property="treeCode" column="tree_code" javaType="String" jdbcType="VARCHAR"/>
+            <result property="path" column="path" javaType="String" jdbcType="VARCHAR"/>
             <result property="sortIndex" column="sort_index" javaType="Long" jdbcType="DECIMAL"/>
             <result property="enabled" column="enabled" javaType="Boolean" jdbcType="DECIMAL"/>
             <result property="level" column="level" javaType="Integer" jdbcType="DECIMAL"/>

+ 1 - 1
hsweb-system/hsweb-system-organizational/hsweb-system-organizational-dao/hsweb-system-organizational-dao-mybatis/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/organizational/OrganizationalMapper.xml

@@ -26,7 +26,7 @@
             <result property="code" column="code" javaType="String" jdbcType="VARCHAR"/>
             <result property="optionalRoles" column="optional_roles" javaType="java.util.List" jdbcType="CLOB"/>
             <result property="parentId" column="parent_id" javaType="String" jdbcType="VARCHAR"/>
-            <result property="treeCode" column="tree_code" javaType="String" jdbcType="VARCHAR"/>
+            <result property="path" column="path" javaType="String" jdbcType="VARCHAR"/>
             <result property="sortIndex" column="sort_index" javaType="Long" jdbcType="DECIMAL"/>
             <result property="enabled" column="enabled" javaType="Boolean" jdbcType="DECIMAL"/>
             <result property="level" column="level" javaType="Integer" jdbcType="DECIMAL"/>

+ 1 - 1
hsweb-system/hsweb-system-organizational/hsweb-system-organizational-dao/hsweb-system-organizational-dao-mybatis/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/organizational/PositionMapper.xml

@@ -26,7 +26,7 @@
             <result property="roles" column="roles" javaType="String" jdbcType="CLOB"/>
             <result property="remark" column="remark" javaType="String" jdbcType="VARCHAR"/>
             <result property="parentId" column="parent_id" javaType="String" jdbcType="VARCHAR"/>
-            <result property="treeCode" column="tree_code" javaType="String" jdbcType="VARCHAR"/>
+            <result property="path" column="path" javaType="String" jdbcType="VARCHAR"/>
             <result property="sortIndex" column="sort_index" javaType="Long" jdbcType="DECIMAL"/>
             <result property="level" column="level" javaType="Integer" jdbcType="DECIMAL"/>
     </resultMap>

+ 1 - 1
hsweb-system/hsweb-system-organizational/hsweb-system-organizational-entity/src/main/java/org/hswebframework/web/entity/organizational/DepartmentEntity.java

@@ -46,7 +46,7 @@ public interface DepartmentEntity extends TreeSortSupportEntity<String> {
     /**
      * 树结构编码
      */
-    String treeCode  = "treeCode";
+    String path  = "path";
     /**
      * 排序序号
      */

+ 1 - 1
hsweb-system/hsweb-system-organizational/hsweb-system-organizational-entity/src/main/java/org/hswebframework/web/entity/organizational/OrganizationalEntity.java

@@ -50,7 +50,7 @@ public interface OrganizationalEntity extends TreeSortSupportEntity<String> {
     /**
      * 树定位码
      */
-    String treeCode      = "treeCode";
+    String path      = "path";
     /**
      * 树结构编码
      */

+ 1 - 1
hsweb-system/hsweb-system-organizational/hsweb-system-organizational-entity/src/main/java/org/hswebframework/web/entity/organizational/PositionEntity.java

@@ -53,7 +53,7 @@ public interface PositionEntity extends TreeSortSupportEntity<String> {
     /**
      * 树结构编码
      */
-    String treeCode     = "treeCode";
+    String path     = "path";
     /**
      * 排序索引
      */

+ 0 - 17
hsweb-system/hsweb-system-organizational/hsweb-system-organizational-entity/src/main/java/org/hswebframework/web/entity/organizational/SimpleOrganizationalEntity.java

@@ -16,9 +16,7 @@
  */
 package org.hswebframework.web.entity.organizational;
 
-import org.hswebframework.web.commons.entity.SimpleGenericEntity;
 import org.hswebframework.web.commons.entity.SimpleTreeSortSupportEntity;
-import org.hswebframework.web.commons.entity.TreeSupportEntity;
 
 import java.util.List;
 
@@ -97,13 +95,6 @@ public class SimpleOrganizationalEntity extends SimpleTreeSortSupportEntity<Stri
         this.optionalRoles = optionalRoles;
     }
 
-    /**
-     * @return 上级机构id
-     */
-    public String getParentId() {
-        return this.parentId;
-    }
-
     @Override
     @SuppressWarnings("unchecked")
     public List<SimpleOrganizationalEntity> getChildren() {
@@ -114,14 +105,6 @@ public class SimpleOrganizationalEntity extends SimpleTreeSortSupportEntity<Stri
         this.children = children;
     }
 
-    /**
-     * @return 树定位码
-     */
-    public String getTreeCode() {
-        return this.treeCode;
-    }
-
-
     /**
      * @return 是否启用
      */

+ 3 - 3
hsweb-system/hsweb-system-organizational/hsweb-system-organizational-starter/src/main/resources/hsweb-starter.js

@@ -43,7 +43,7 @@ function install(context) {
         .addColumn().name("code").alias("code").comment("机构编码").jdbcType(java.sql.JDBCType.VARCHAR).length(32).commit()
         .addColumn().name("optional_roles").alias("optionalRoles").comment("可选角色").jdbcType(java.sql.JDBCType.CLOB).commit()
         .addColumn().name("parent_id").alias("parentId").comment("上级机构id").jdbcType(java.sql.JDBCType.VARCHAR).length(32).commit()
-        .addColumn().name("tree_code").alias("treeCode").comment("树定位码").jdbcType(java.sql.JDBCType.VARCHAR).length(1024).commit()
+        .addColumn().name("path").alias("path").comment("树定位码").jdbcType(java.sql.JDBCType.VARCHAR).length(1024).commit()
         .addColumn().name("sort_index").alias("sortIndex").comment("树结构编码").jdbcType(java.sql.JDBCType.DECIMAL).length(32, 0).commit()
         .addColumn().name("enabled").alias("enabled").comment("是否启用").jdbcType(java.sql.JDBCType.DECIMAL).length(32, 0).commit()
         .addColumn().name("level").alias("level").comment("级别").jdbcType(java.sql.JDBCType.DECIMAL).length(32, 0).commit()
@@ -55,7 +55,7 @@ function install(context) {
         .addColumn().name("org_id").alias("orgId").comment("所在组织id").jdbcType(java.sql.JDBCType.VARCHAR).length(32).commit()
         .addColumn().name("code").alias("code").comment("部门编码").jdbcType(java.sql.JDBCType.VARCHAR).length(32).commit()
         .addColumn().name("parent_id").alias("parentId").comment("父级id").jdbcType(java.sql.JDBCType.VARCHAR).length(32).commit()
-        .addColumn().name("tree_code").alias("treeCode").comment("树结构编码").jdbcType(java.sql.JDBCType.VARCHAR).length(3000).commit()
+        .addColumn().name("path").alias("path").comment("树结构编码").jdbcType(java.sql.JDBCType.VARCHAR).length(3000).commit()
         .addColumn().name("sort_index").alias("sortIndex").comment("排序序号").jdbcType(java.sql.JDBCType.DECIMAL).length(32, 0).commit()
         .addColumn().name("enabled").alias("enabled").comment("是否启用").jdbcType(java.sql.JDBCType.DECIMAL).length(32, 0).commit()
         .addColumn().name("level").alias("level").comment("级别").jdbcType(java.sql.JDBCType.DECIMAL).length(32, 0).commit()
@@ -68,7 +68,7 @@ function install(context) {
         .addColumn().name("roles").alias("roles").comment("持有的角色").jdbcType(java.sql.JDBCType.CLOB).commit()
         .addColumn().name("remark").alias("remark").comment("备注").jdbcType(java.sql.JDBCType.VARCHAR).length(256).commit()
         .addColumn().name("parent_id").alias("parentId").comment("父级id").jdbcType(java.sql.JDBCType.VARCHAR).length(32).commit()
-        .addColumn().name("tree_code").alias("treeCode").comment("树结构编码").jdbcType(java.sql.JDBCType.VARCHAR).length(4000).commit()
+        .addColumn().name("path").alias("path").comment("树结构编码").jdbcType(java.sql.JDBCType.VARCHAR).length(4000).commit()
         .addColumn().name("sort_index").alias("sortIndex").comment("排序索引").jdbcType(java.sql.JDBCType.DECIMAL).length(32, 0).commit()
         .addColumn().name("level").alias("level").comment("级别").jdbcType(java.sql.JDBCType.DECIMAL).length(32, 0).commit()
         .comment("职位").commit();