更新文件目录获取
This commit is contained in:
@@ -10,6 +10,8 @@ import java.util.stream.Collectors;
|
||||
import com.jeesite.modules.app.dao.file.FolderItem;
|
||||
import com.jeesite.modules.app.utils.MyUtils;
|
||||
import com.jeesite.modules.app.utils.vDate;
|
||||
import com.jeesite.modules.sys.entity.User;
|
||||
import com.jeesite.modules.sys.utils.UserUtils;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
|
||||
@@ -162,6 +164,7 @@ public class BizFoldersController extends BaseController {
|
||||
@RequestMapping(value = "foldersAll")
|
||||
@ResponseBody
|
||||
public List<Map<String, Object>> foldersAll(BizFolders bizFolders) {
|
||||
User user = UserUtils.getUser();
|
||||
// 构建根节点
|
||||
List<Map<String, Object>> treeData = new ArrayList<>();
|
||||
Map<String, Object> rootNode = new HashMap<>();
|
||||
@@ -171,12 +174,13 @@ public class BizFoldersController extends BaseController {
|
||||
// 1. 一次性查询所有未删除的文件夹
|
||||
BizFolders query = new BizFolders();
|
||||
query.setIsDeleted(0);
|
||||
query.setLoginCode(user.getLoginCode());
|
||||
List<BizFolders> allFolders = bizFoldersService.findList(query);
|
||||
// 2. 按parentId分组,构建映射Map
|
||||
Map<String, List<BizFolders>> folderMap = allFolders.stream()
|
||||
.collect(Collectors.groupingBy(BizFolders::getParentId, Collectors.toList()));
|
||||
// 3. 递归构建树形结构的核心逻辑(内部递归方法)
|
||||
Function<String, List<Map<String, Object>>> buildTree = new Function<String, List<Map<String, Object>>>() {
|
||||
Function<String, List<Map<String, Object>>> buildTree = new Function<>() {
|
||||
@Override
|
||||
public List<Map<String, Object>> apply(String parentId) {
|
||||
List<Map<String, Object>> nodeList = new ArrayList<>();
|
||||
@@ -191,6 +195,7 @@ public class BizFoldersController extends BaseController {
|
||||
}
|
||||
return nodeList;
|
||||
}
|
||||
|
||||
// 辅助方法:根据folderId获取文件夹名称
|
||||
private String getFolderNameById(Map<String, List<BizFolders>> folderMap, String folderId) {
|
||||
for (List<BizFolders> folders : folderMap.values()) {
|
||||
@@ -213,6 +218,7 @@ public class BizFoldersController extends BaseController {
|
||||
@RequestMapping(value = "treeData")
|
||||
@ResponseBody
|
||||
public List<Map<String, Object>> treeFoldersData(BizFolders bizFolders) {
|
||||
User user = UserUtils.getUser();
|
||||
// 1. 构建根节点
|
||||
List<Map<String, Object>> treeData = new ArrayList<>();
|
||||
Map<String, Object> rootNode = new HashMap<>();
|
||||
@@ -222,30 +228,28 @@ public class BizFoldersController extends BaseController {
|
||||
// 2. 一次性查询所有未删除的文件夹(仅1次数据库查询)
|
||||
BizFolders query = new BizFolders();
|
||||
query.setIsDeleted(0);
|
||||
query.setLoginCode(user.getLoginCode());
|
||||
List<BizFolders> allFolders = bizFoldersService.findList(query);
|
||||
// 3. 按parentId分组,快速查找子节点
|
||||
Map<String, List<BizFolders>> folderMap = allFolders.stream()
|
||||
.collect(Collectors.groupingBy(BizFolders::getParentId, Collectors.toList()));
|
||||
final List<java.util.function.BiFunction<String, Integer, List<Map<String, Object>>>> recursiveHolder = new ArrayList<>();
|
||||
// 匿名内部类实现递归逻辑(BiFunction:入参parentId+level,出参节点列表)
|
||||
java.util.function.BiFunction<String, Integer, List<Map<String, Object>>> buildTree = new java.util.function.BiFunction<String, Integer, List<Map<String, Object>>>() {
|
||||
@Override
|
||||
public List<Map<String, Object>> apply(String parentId, Integer level) {
|
||||
List<Map<String, Object>> nodeList = new ArrayList<>();
|
||||
// 空值保护:获取当前父ID下的子文件夹
|
||||
List<BizFolders> childFolders = folderMap.getOrDefault(parentId, new ArrayList<>());
|
||||
for (BizFolders folder : childFolders) {
|
||||
// 原业务逻辑:四级节点特殊处理,其他传false
|
||||
boolean flag = level == 4 ? "add".equals(bizFolders.getDescription()) : false;
|
||||
Map<String, Object> node = MyUtils.convertToTreeNode(folder, flag);
|
||||
// 递归调用自身(通过holder获取)
|
||||
List<Map<String, Object>> children = recursiveHolder.get(0).apply(folder.getFolderId(), level + 1);
|
||||
// 无子节点时设为空列表(和原代码一致)
|
||||
node.put("children", children.isEmpty() ? new ArrayList<>() : children);
|
||||
nodeList.add(node);
|
||||
}
|
||||
return nodeList;
|
||||
java.util.function.BiFunction<String, Integer, List<Map<String, Object>>> buildTree = (parentId, level) -> {
|
||||
List<Map<String, Object>> nodeList = new ArrayList<>();
|
||||
// 空值保护:获取当前父ID下的子文件夹
|
||||
List<BizFolders> childFolders = folderMap.getOrDefault(parentId, new ArrayList<>());
|
||||
for (BizFolders folder : childFolders) {
|
||||
// 原业务逻辑:四级节点特殊处理,其他传false
|
||||
boolean flag = level == 4 ? "add".equals(bizFolders.getDescription()) : false;
|
||||
Map<String, Object> node = MyUtils.convertToTreeNode(folder, flag);
|
||||
// 递归调用自身(通过holder获取)
|
||||
List<Map<String, Object>> children = recursiveHolder.get(0).apply(folder.getFolderId(), level + 1);
|
||||
// 无子节点时设为空列表(和原代码一致)
|
||||
node.put("children", children.isEmpty() ? new ArrayList<>() : children);
|
||||
nodeList.add(node);
|
||||
}
|
||||
return nodeList;
|
||||
};
|
||||
|
||||
// 将递归逻辑放入holder,供内部调用
|
||||
|
||||
Reference in New Issue
Block a user