From 2cf1565485060fd56e1f1f1cffbba7a4d70d42a6 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期五, 11 四月 2025 11:06:22 +0800
Subject: [PATCH] 优化dnc，设备结构树查询，优化原有代码
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProductMixServiceImpl.java | 18 ++++++++++++------
1 files changed, 12 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 ef787db..2d4824d 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
@@ -11,9 +11,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
@Service
public class ProductMixServiceImpl extends ServiceImpl<ProductMixMapper, ProductMix> implements IProductMixService {
@@ -21,6 +19,10 @@
@Autowired
private IPermissionStreamNewService permissionStreamNewService;
+ /**
+ * 榛樿缁撴瀯鏍戞煡璇�
+ * @return
+ */
@Override
public List<ProductMix> getTree() {
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
@@ -31,8 +33,10 @@
}else{
//闇�瑕佹潈闄愯繃婊�
String productIds = loginUser.getProductionIds();
- List<String> productIdList = Arrays.asList(productIds.split(","));
- rawData = permissionStreamNewService.loadProductMix(loginUser.getId(),productIdList);
+ 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);
@@ -40,6 +44,8 @@
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;
}
}
--
Gitblit v1.9.3