diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentService.java index b88b7cc3..08f750d2 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentService.java @@ -133,6 +133,7 @@ public class BomNewOriginalParentService extends ServiceImpl> getChildTree(Long rowId) throws ExecutionException, InterruptedException { List bomTree = getBomTree(rowId); + return TreeUtils.toTree(rowId, bomTree, BomOriginalListVO::getParentRowId, BomOriginalListVO::getChildBomRowId); @@ -149,7 +150,10 @@ public class BomNewOriginalParentService extends ServiceImpl bomDetail = this.getBaseMapper().getParentChild(rowId); OriginalBomDetailTask detailTask = new OriginalBomDetailTask(bomDetail); ForkJoinTask> submit = bomDetailPool.submit(detailTask); - return submit.get(); + + List result = submit.get(); + System.out.println(detailTask.getLevelNum()); + return result; } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomDetailTask.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomDetailTask.java index 0c4e1652..cd309091 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomDetailTask.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomDetailTask.java @@ -7,6 +7,7 @@ import com.nflg.product.bomnew.pojo.entity.BomNewOriginalParentEntity; import com.nflg.product.bomnew.pojo.vo.BomOriginalListVO; import com.nflg.product.bomnew.service.BomNewOriginalParentService; import com.nflg.product.bomnew.util.ListCommonUtil; +import lombok.Getter; import java.util.ArrayList; import java.util.List; @@ -24,11 +25,14 @@ public class OriginalBomDetailTask extends RecursiveTask private List bomDetail; - + @Getter + public static int levelNum=1; List result = new ArrayList<>(); + + public OriginalBomDetailTask(List inBomDetail) { bomDetail = inBomDetail; @@ -72,6 +76,7 @@ public class OriginalBomDetailTask extends RecursiveTask result.addAll(bomDetail); if (CollUtil.isNotEmpty(bomDetail)) { + levelNumAdd(); List childBowIds = bomDetail.stream().filter(u-> u.getChildBomRowId()!=null && u.getChildBomRowId() > 0).map(u->u.getChildBomRowId()).collect(Collectors.toList()); if(CollUtil.isNotEmpty(childBowIds)) { List bom = SpringUtil.getBean(BomNewOriginalParentService.class).getBaseMapper().getParentChildBatch(childBowIds); @@ -86,4 +91,8 @@ public class OriginalBomDetailTask extends RecursiveTask } + + public synchronized void levelNumAdd(){ + levelNum++; + } }