From ec1bf4658e36a17f971a54007920a44c5378b7dc Mon Sep 17 00:00:00 2001
From: cuijian <cuijian@xalxzn.com>
Date: 星期一, 16 六月 2025 10:41:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProductMixServiceImpl.java | 91 ++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 85 insertions(+), 6 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProductMixServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProductMixServiceImpl.java
index 9e0d90f..699b3a6 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProductMixServiceImpl.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProductMixServiceImpl.java
@@ -1,9 +1,7 @@
package org.jeecg.modules.dnc.service.impl;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.shiro.SecurityUtils;
-import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.dnc.entity.ProductMix;
import org.jeecg.modules.dnc.mapper.ProductMixMapper;
@@ -12,7 +10,8 @@
import org.jeecg.modules.dnc.utils.TreeBuilder;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.util.List;
+
+import java.util.*;
@Service
public class ProductMixServiceImpl extends ServiceImpl<ProductMixMapper, ProductMix> implements IProductMixService {
@@ -20,16 +19,96 @@
@Autowired
private IPermissionStreamNewService permissionStreamNewService;
+ /**
+ * 榛樿缁撴瀯鏍戞煡璇�
+ * @return
+ */
@Override
public List<ProductMix> getTree() {
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
- List<ProductMix> rawData = permissionStreamNewService.loadProductMix(loginUser.getId());
+ List<ProductMix> rawData = new ArrayList<>();
+ if (loginUser.getUsername().equals("admin")) {
+ //涓嶉渶瑕佹潈闄愯繃婊�
+ rawData=permissionStreamNewService.loadProductMixAll(loginUser.getId());
+ }else{
+ //闇�瑕佹潈闄愯繃婊�
+ String productIds = loginUser.getProductionIds();
+ if (productIds != null && !productIds.isEmpty()) {
+ List<String> productIdList = Arrays.asList(productIds.split(","));
+ rawData = permissionStreamNewService.loadProductMix(loginUser.getId(),productIdList);
+ }
+ }
TreeBuilder builder = new TreeBuilder();
TreeBuilder.CleanResult cleanResult = builder.preprocessData(rawData);
List<ProductMix> sorted = builder.topologicalSort(
cleanResult.getValidNodes(),
cleanResult.getNodeMap()
);
- return builder.assembleTree(sorted, cleanResult.getNodeMap());
+ List<ProductMix> result =builder.assembleTree(sorted, cleanResult.getNodeMap());
+ result.sort(Comparator.comparing(ProductMix::getCreateTime, Comparator.nullsLast(Date::compareTo)));
+ return result;
}
-}
\ No newline at end of file
+
+ @Override
+ public List<ProductMix> getParentList(String id) {
+ List<ProductMix> parentList = new ArrayList<>();
+ // 1. 鏍规嵁ID鏌ヨ褰撳墠鑺傜偣
+ ProductMix current = this.getById(id);
+ if (current == null) {
+ return parentList; // 鑺傜偣涓嶅瓨鍦ㄦ椂杩斿洖绌哄垪琛�
+ }
+ // 2. 浠庡綋鍓嶈妭鐐瑰紑濮嬪悜涓婃煡鎵剧埗鑺傜偣
+ Long parentId = current.getParentId();
+ while ( parentId != 0L) {
+ ProductMix parent = this.getById(parentId.toString());
+ if (parent == null) {
+ break;
+ }
+ parentList.add(parent);
+ parentId = parent.getParentId();
+ }
+
+ return parentList;
+ }
+
+ @Override
+ public List<ProductMix> getChildrenList(String id) {
+ List<ProductMix> childrenList = new ArrayList<>();
+ ProductMix current = this.getById(id);
+ if (current == null) {
+ return childrenList;
+ }
+
+ // 浣跨敤闃熷垪杩涜BFS
+ Queue<ProductMix> queue = new LinkedList<>();
+ queue.add(current); // 鍔犲叆褰撳墠鑺傜偣浣滀负璧风偣
+
+ // 璁板綍宸茶闂妭鐐圭殑ID锛岄伩鍏嶅惊鐜紩鐢�
+ Set<String> visited = new HashSet<>();
+ visited.add(id); // 璧峰鑺傜偣宸茶闂�
+
+ while (!queue.isEmpty()) {
+ ProductMix node = queue.poll();
+ // 璺宠繃璧峰鑺傜偣锛堝嵆浼犲叆鐨勮妭鐐癸級锛屼笉鍔犲叆缁撴灉鍒楄〃
+ if (!node.getId().toString().equals(id)) {
+ childrenList.add(node);
+ }
+
+ // 鏌ヨ褰撳墠鑺傜偣鐨勭洿鎺ュ瓙鑺傜偣
+ List<ProductMix> directChildren = this.lambdaQuery().eq(ProductMix::getParentId, node.getId()).list();
+ if (directChildren != null && !directChildren.isEmpty()) {
+ for (ProductMix child : directChildren) {
+ String childId = child.getId().toString();
+ // 濡傛灉璇ュ瓙鑺傜偣杩樻湭璁块棶杩�
+ if (!visited.contains(childId)) {
+ visited.add(childId);
+ queue.add(child);
+ }
+ // 鍚﹀垯蹇界暐锛岄伩鍏嶅惊鐜紩鐢ㄥ鑷寸殑姝诲惊鐜�
+ }
+ }
+ }
+ return childrenList;
+ }
+
+}
--
Gitblit v1.9.3