From 0eacf47294055d7c292999b3167cbaf6938e50cc Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 12 六月 2024 16:56:26 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/utils/NodeUtils.java | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/utils/NodeUtils.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/utils/NodeUtils.java
index e548dad..8c1be3d 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/utils/NodeUtils.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/utils/NodeUtils.java
@@ -1,9 +1,6 @@
package com.zy.asrs.wcs.utils;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zy.asrs.framework.common.SpringUtils;
-
import java.io.Serializable;
import java.util.function.Function;
@@ -17,21 +14,21 @@
public StringBuilder pathName = new StringBuilder();
public interface NodeSupport<T> {
- T query();
+ T query(T t);
}
- public <T, R extends Serializable> void generatePath(Class<T> cls
+ public <T, R extends Serializable> void generatePath0(
+ NodeSupport<T> support
, T t
- , Function<? super T, ? extends R> idMapper
+ , Function<? super T, ? extends Long> idMapper
, Function<? super T, ? extends String> nameMapper
- , Function<? super T, ? extends R> parentIdMapper) {
- IService<T> bean = (IService<T>) SpringUtils.getBean(cls.getSimpleName() + "Service");
- T parent = bean.getById(parentIdMapper.apply(t));
+ , Function<? super T, ? extends Long> parentIdMapper) {
+ T parent = support.query(t);
if (null != parent) {
path.insert(0, idMapper.apply(parent)).insert(0,",");
pathName.insert(0, nameMapper.apply(parent)).insert(0,",");
- if (parentIdMapper.apply(parent) != null) {
- generatePath(cls, parent, idMapper, nameMapper, parentIdMapper);
+ if (parentIdMapper.apply(parent) != null && parentIdMapper.apply(parent) != 0) {
+ generatePath0(support, parent, idMapper, nameMapper, parentIdMapper);
} else {
path.deleteCharAt(0);
pathName.deleteCharAt(0);
@@ -39,4 +36,5 @@
}
}
+
}
--
Gitblit v1.9.1