From 4caa78bf661a13905c5ba79101a254d9c10ba24c Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Fri, 26 Jan 2024 23:43:34 +0800 Subject: [PATCH] =?UTF-8?q?=E8=80=83=E6=A0=B8=E5=B0=8F=E7=A8=8B=E5=BA=8F?= =?UTF-8?q?=E6=8C=87=E6=A0=87=E5=88=97=E8=A1=A8=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ClassifyServiceImpl.java | 23 +++++++++++++++---- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java index cd5e41bb4..062227e79 100644 --- a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java +++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java @@ -36,6 +36,7 @@ import com.logpm.supervise.service.IPointsService; import com.logpm.supervise.vo.ClassifyVO; import com.logpm.supervise.vo.IndicatorsVO; import com.logpm.supervise.vo.api.ClassifyApiVO; +import com.logpm.supervise.wrapper.ClassifyWrapper; import com.logpm.supervise.wrapper.IndicatorsWrapper; import com.logpm.supervise.wrapper.PointsWrapper; import lombok.AllArgsConstructor; @@ -48,6 +49,7 @@ import org.springblade.core.tool.utils.Func; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Objects; @@ -198,13 +200,24 @@ public class ClassifyServiceImpl extends BaseServiceImpl classifyEntities = getClassifyList(pid); for (ClassifyApiVO classifyEntity : classifyEntities) { if (classifyEntity.getPId().equals(0L)){ - List classifyList = getClassifyList(classifyEntity.getId()); - List list = pointsService.list(Wrappers.query().lambda().eq(PointsEntity::getClassifyId, classifyEntity.getId())); + List classifyList = new ArrayList<>(); + List entityList = this.list(Wrappers.query().lambda() + .eq(ClassifyEntity::getPId, classifyEntity.getId()) + .ne(ClassifyEntity::getPId, 0L) + ); + for (ClassifyEntity entity : entityList) { + ClassifyVO classifyVO = ClassifyWrapper.build().entityVO(entity); + ClassifyApiVO classifyApiVO = Func.copy(classifyVO, ClassifyApiVO.class); + List list = pointsService.list(Wrappers.query().lambda() + .eq(PointsEntity::getClassifyId,entity.getId()) + ); + if(Func.isNotEmpty(list)){ + classifyApiVO.setPointsVOS(PointsWrapper.build().listVO(list)); + } + classifyList.add(classifyApiVO); + } if (!Objects.isNull(classifyList)){ classifyEntity.setChildren(classifyList); - if (Func.isNotEmpty(list)){ - classifyEntity.setPointsVOS(PointsWrapper.build().listVO(list)); - } } } }