github/dataease
github/dataease
3
0
Fork 1
mirror of https://github.com/dataease/dataease.git synced 2025-02-24 11:32:57 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

feat(仪表板): 仪表板资源树支持排序

Browse Source
This commit is contained in:
wangjiahao 2024-03-15 12:27:08 +08:00
parent adf8ac9113
commit cc32e4f257
3 changed files with 39 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sdk/common/src/main/java/io/dataease/constant/SortConstants.java Normal file
View File

@ -0,0 +1,14 @@
package io.dataease.constant;
public class SortConstants {
// 名称倒序
public static final String NAME_DESC = "name_desc";
// 名称正序
public static final String NAME_ASC = "name_asc";
// 时间倒序
public static final String TIME_DESC = "time_desc";
// 时间正序
public static final String TIME_ASC = "time_asc";
}

2
sdk/common/src/main/java/io/dataease/model/BusiNodeRequest.java
View File

@ -17,4 +17,6 @@ public class BusiNodeRequest implements Serializable {
private Boolean leaf; private Boolean leaf;
private Integer weight; private Integer weight;
private String sortType;
} }

31
sdk/common/src/main/java/io/dataease/utils/TreeUtils.java
View File

@ -1,17 +1,14 @@
package io.dataease.utils; package io.dataease.utils;
import io.dataease.model.ITreeBase; import io.dataease.constant.SortConstants;
import io.dataease.model.TreeBaseModel; import io.dataease.model.*;
import io.dataease.model.TreeModel;
import io.dataease.model.TreeResultModel;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.util.Assert; import org.springframework.util.Assert;
import java.util.ArrayList; import java.text.Collator;
import java.util.Arrays; import java.util.*;
import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicBoolean;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -167,4 +164,22 @@ public class TreeUtils {
return result; return result;
} }
public static List<BusiNodeVO> customSortVO(List<BusiNodeVO> list, String sortType) {
Collator collator = Collator.getInstance(Locale.CHINA);
if (StringUtils.equalsIgnoreCase(SortConstants.NAME_DESC, sortType)) {
Set<BusiNodeVO> poSet = new TreeSet<>(Comparator.comparing(BusiNodeVO::getName, collator));
poSet.addAll(list);
return poSet.stream().collect(Collectors.toList());
} else if (StringUtils.equalsIgnoreCase(SortConstants.NAME_ASC, sortType)) {
Set<BusiNodeVO> poSet = new TreeSet<>(Comparator.comparing(BusiNodeVO::getName, collator).reversed());
poSet.addAll(list);
return poSet.stream().collect(Collectors.toList());
} else if (StringUtils.equalsIgnoreCase(SortConstants.TIME_ASC, sortType)) {
Collections.reverse(list);
return list;
} else {
// 默认时间倒序
return list;
}
}
} }