From 94759361eff2d28a236d9fe2f19b6d84f1b6c890 Mon Sep 17 00:00:00 2001 From: xlsea Date: Fri, 21 Jun 2024 17:32:36 +0800 Subject: [PATCH] =?UTF-8?q?fix(sj=5Fmap=5Freduce):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E4=BB=BB=E5=8A=A1=E9=A1=B9=E6=A0=91=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/service/impl/JobTaskServiceImpl.java | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/JobTaskServiceImpl.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/JobTaskServiceImpl.java index b549ff9d1..4550b9e34 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/JobTaskServiceImpl.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/JobTaskServiceImpl.java @@ -2,6 +2,7 @@ package com.aizuda.snailjob.server.web.service.impl; import cn.hutool.core.lang.tree.Tree; import cn.hutool.core.lang.tree.TreeNode; +import cn.hutool.core.lang.tree.TreeNodeConfig; import cn.hutool.core.lang.tree.TreeUtil; import com.aizuda.snailjob.common.core.util.JsonUtil; import com.aizuda.snailjob.server.web.model.base.PageResult; @@ -62,15 +63,11 @@ public class JobTaskServiceImpl implements JobTaskService { // SQLServer 分页必须 ORDER BY .orderByAsc(JobTask::getJobId)); - List> treeNodes = new ArrayList<>(); - for (final JobTask jobTask : jobTasks) { - TreeNode treeNode = new TreeNode<>(); - treeNode.setId(jobTask.getId()); - treeNode.setName(jobTask.getTaskName()); - treeNode.setExtra(JsonUtil.parseHashMap(JsonUtil.toJsonString(jobTask), Object.class)); - treeNodes.add(treeNode); - } - - return TreeUtil.build(treeNodes, 0L); + return TreeUtil.build(jobTasks, 0L, (jobTask, tree) -> { + tree.setId(jobTask.getId()); + tree.setName(jobTask.getTaskName()); + tree.setParentId(jobTask.getParentId()); + tree.putExtra("jobTask", jobTask); + }); } }