From c0cb31a27522f2b480d7f98784eef37c2fb75f2d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 30 七月 2024 09:10:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/service/src/main/java/com/doumee/service/business/impl/BjParamServiceImpl.java | 40 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 40 insertions(+), 0 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/BjParamServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/BjParamServiceImpl.java
index 3c6b40c..f3dd58e 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/BjParamServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/BjParamServiceImpl.java
@@ -9,6 +9,7 @@
import com.doumee.dao.business.model.BjParam;
import com.doumee.dao.business.model.News;
import com.doumee.dao.system.model.SystemUser;
+import com.doumee.dao.web.response.BjParamConfigResponse;
import com.doumee.service.business.BjParamService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -19,10 +20,13 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
/**
* 蹇楅偊瀹堕�夎绠楀櫒閰嶇疆淇℃伅琛ㄦ姤浠稴ervice瀹炵幇
@@ -206,4 +210,40 @@
QueryWrapper<BjParam> wrapper = new QueryWrapper<>(bjParam);
return bjParamMapper.selectCount(wrapper);
}
+
+
+ @Override
+ public BjParamConfigResponse getBjParamConfig(){
+ BjParamConfigResponse bjParamConfigResponse = new BjParamConfigResponse();
+ List<BjParam> bjParamList = bjParamMapper.selectList(new QueryWrapper<BjParam>()
+ .lambda().eq(BjParam::getIsdeleted,Constants.ZERO).orderByAsc(BjParam::getSortnum));
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(bjParamList)){
+ List<BjParam> roughList = bjParamList.stream().filter(i->i.getType().equals(Constants.ZERO+"")&& StringUtils.isEmpty(i.getParentId())).collect(Collectors.toList());
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(roughList)){
+ for (BjParam bjParam:roughList) {
+ bjParam.setChildren(
+ bjParamList.stream().filter(i->i.getType().equals(Constants.ZERO+"")
+ && Objects.nonNull(i.getParentId())
+ && i.getParentId().equals(bjParam.getId())).collect(Collectors.toList())
+ );
+ }
+ }
+ List<BjParam> exquisiteList = bjParamList.stream().filter(i->i.getType().equals(Constants.ONE+"")&& StringUtils.isEmpty(i.getParentId())).collect(Collectors.toList());
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(exquisiteList)){
+ for (BjParam bjParam:exquisiteList) {
+ bjParam.setChildren(
+ bjParamList.stream().filter(i->i.getType().equals(Constants.ONE+"")
+ && Objects.nonNull(i.getParentId())
+ && i.getParentId().equals(bjParam.getId())).collect(Collectors.toList())
+ );
+ }
+ }
+ bjParamConfigResponse.setRoughList(roughList);
+ bjParamConfigResponse.setExquisiteList(exquisiteList);
+ }
+ return bjParamConfigResponse;
+ }
+
+
+
}
--
Gitblit v1.9.3