From 09b9a70e9f8153e4a7472299fd4137647019b6e9 Mon Sep 17 00:00:00 2001
From: Guo XIn <371864209@qq.com>
Date: Tue, 22 Aug 2023 18:19:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E7=9B=AE=E5=BD=95?=
=?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E6=8E=92=E5=BA=8F=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
dbsql/update/update202308.sql | 2 ++
.../keyware/shandan/common/entity/TreeVo.java | 4 ++++
.../keyware/shandan/common/util/TreeUtil.java | 2 ++
.../shandan/bianmu/entity/DirectoryVo.java | 18 +++++---------
.../shandan/bianmu/utils/DirectoryUtil.java | 7 +++---
.../mybatis/mapper/bianmu/DirectoryMapper.xml | 1 +
.../static/js/business/directory/dirCommon.js | 24 ++++++++++++++-----
7 files changed, 37 insertions(+), 21 deletions(-)
create mode 100644 dbsql/update/update202308.sql
diff --git a/dbsql/update/update202308.sql b/dbsql/update/update202308.sql
new file mode 100644
index 0000000..bb4d6d2
--- /dev/null
+++ b/dbsql/update/update202308.sql
@@ -0,0 +1,2 @@
+alter table BIANMU.B_DIRECTORY add SORT integer;
+comment on column BIANMU.B_DIRECTORY.SORT is '加载顺序';
\ No newline at end of file
diff --git a/shandan-common/src/main/java/com/keyware/shandan/common/entity/TreeVo.java b/shandan-common/src/main/java/com/keyware/shandan/common/entity/TreeVo.java
index 9435596..ef960c6 100644
--- a/shandan-common/src/main/java/com/keyware/shandan/common/entity/TreeVo.java
+++ b/shandan-common/src/main/java/com/keyware/shandan/common/entity/TreeVo.java
@@ -57,6 +57,10 @@ public class TreeVo implements Serializable {
* 选中状态
*/
private String checked = "0";
+ /**
+ * 加载顺序
+ */
+ private int sort;
/**
* 节点原始数据
*/
diff --git a/shandan-common/src/main/java/com/keyware/shandan/common/util/TreeUtil.java b/shandan-common/src/main/java/com/keyware/shandan/common/util/TreeUtil.java
index ab2a62b..d438459 100644
--- a/shandan-common/src/main/java/com/keyware/shandan/common/util/TreeUtil.java
+++ b/shandan-common/src/main/java/com/keyware/shandan/common/util/TreeUtil.java
@@ -5,6 +5,7 @@ import org.springframework.lang.NonNull;
import org.springframework.lang.Nullable;
import java.text.Collator;
+import java.util.Comparator;
import java.util.List;
import java.util.Locale;
import java.util.stream.Collectors;
@@ -29,6 +30,7 @@ public class TreeUtil {
.filter(node -> (node.getParentId().equals(parentId)))
// 给子节点设置子节点
.peek(child -> child.setChildren(buildDirTree(nodes, child.getId())))
+ .sorted(Comparator.comparingInt(TreeVo::getSort))
.toList();
}
diff --git a/shandan-system/src/main/java/com/keyware/shandan/bianmu/entity/DirectoryVo.java b/shandan-system/src/main/java/com/keyware/shandan/bianmu/entity/DirectoryVo.java
index 67abf19..09bc7a8 100644
--- a/shandan-system/src/main/java/com/keyware/shandan/bianmu/entity/DirectoryVo.java
+++ b/shandan-system/src/main/java/com/keyware/shandan/bianmu/entity/DirectoryVo.java
@@ -130,21 +130,9 @@ public class DirectoryVo extends BaseEntity {
@OrderBy(isDesc = false)
private Date createTime;
- /**
- * 所属部门对象
- */
- /*@TableField(exist = false)
- private SysOrg org;*/
-
@TableField(exist = false)
private String modifyUserName;
- /**
- * 是否有子级
- */
- /*@TableField(exist = false)
- private Boolean hasChild;*/
-
/**
* 子级目录
*/
@@ -157,6 +145,12 @@ public class DirectoryVo extends BaseEntity {
@TableField(exist = false)
private boolean applyChild;
+ /**
+ * 目录顺序
+ */
+ @TableField(value = "SORT")
+ private Integer sort;
+
/**
* 创建人名称
*/
diff --git a/shandan-system/src/main/java/com/keyware/shandan/bianmu/utils/DirectoryUtil.java b/shandan-system/src/main/java/com/keyware/shandan/bianmu/utils/DirectoryUtil.java
index 75873ec..0257989 100644
--- a/shandan-system/src/main/java/com/keyware/shandan/bianmu/utils/DirectoryUtil.java
+++ b/shandan-system/src/main/java/com/keyware/shandan/bianmu/utils/DirectoryUtil.java
@@ -29,13 +29,14 @@ public class DirectoryUtil {
tree.setType("DIRECTORY");
tree.setPath(dir.getDirectoryPath());
tree.setBasicData(dir);
- if(dir.getDirectoryType() == DirectoryType.FILE || dir.getDirectoryType() == DirectoryType.LINK_FILE){
+ tree.setSort(dir.getSort() == null ? Integer.MAX_VALUE : dir.getSort());
+ if (dir.getDirectoryType() == DirectoryType.FILE || dir.getDirectoryType() == DirectoryType.LINK_FILE) {
tree.setIconClass("dtree-icon-normal-file");
tree.setLast(true);
- }else if(dir.getDirectoryType() == DirectoryType.METADATA || dir.getDirectoryType() == DirectoryType.LINK_METADATA){
+ } else if (dir.getDirectoryType() == DirectoryType.METADATA || dir.getDirectoryType() == DirectoryType.LINK_METADATA) {
tree.setIconClass("dtree-icon-sort");
tree.setLast(true);
- }else{
+ } else {
tree.setLast(false);
}
}
diff --git a/shandan-system/src/main/resources/mybatis/mapper/bianmu/DirectoryMapper.xml b/shandan-system/src/main/resources/mybatis/mapper/bianmu/DirectoryMapper.xml
index 84290ff..233f71c 100644
--- a/shandan-system/src/main/resources/mybatis/mapper/bianmu/DirectoryMapper.xml
+++ b/shandan-system/src/main/resources/mybatis/mapper/bianmu/DirectoryMapper.xml
@@ -14,6 +14,7 @@