From cfcde37231009ca18b67296bd0bbe60f4ff379ec Mon Sep 17 00:00:00 2001
From: xy <748613696@qq.com>
Date: Thu, 15 Aug 2024 14:59:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/CsLedgerServiceImpl.java     | 27 +++++--------------
 1 file changed, 7 insertions(+), 20 deletions(-)

diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java
index f4f50bd..7b86278 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java
@@ -84,33 +84,16 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
         List<String> device = roleEngineerDevService.getDevice();
         engineeringList = allList.stream().filter(item->roleengineer.contains(item.getId())).collect(Collectors.toList());
 
-//        if (Objects.equals(RequestUtil.getUsername(),"root") || Objects.equals(RequestUtil.getUsername(),"njcnser")){
-//            engineeringList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.ENGINEERING_LEVEL.getCode())).sorted(Comparator.comparing(CsLedgerVO::getSort)).collect(Collectors.toList());
-//        } else {
-//            List<CsEngineeringPO> engineering = csEngineeringUserService.getEngineeringByUser();
-//            engineeringList = allList.stream().filter(item->engineering.stream().map(CsEngineeringPO::getId).collect(Collectors.toList()).contains(item.getId())).collect(Collectors.toList());
-//        }
         List<CsLedgerVO> projectList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROJECT_LEVEL.getCode())).sorted(Comparator.comparing(CsLedgerVO::getSort)).collect(Collectors.toList());
-//        List<CsLedgerVO> deviceList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.DEVICE_LEVEL.getCode())).sorted(Comparator.comparing(CsLedgerVO::getSort)).collect(Collectors.toList());
         List<CsLedgerVO> deviceList = allList.stream().filter(item -> device.contains(item.getId())).
-                map(
+                peek(
                         temp->{
                             CsEquipmentDeliveryPO csEquipmentDeliveryPO = csEquipmentDeliveryMapper.selectById(temp.getId());
                             temp.setComFlag(csEquipmentDeliveryPO.getRunStatus());
-                            return temp;
                         }
                 ).
                 sorted(Comparator.comparing(CsLedgerVO::getSort)).collect(Collectors.toList());
-
-        List<CsLedgerVO> lineList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.LINE_LEVEL.getCode())).sorted(Comparator.comparing(CsLedgerVO::getSort)).collect(Collectors.toList());
-//        List<String> collect = lineList.stream().map(CsLedgerVO::getId).collect(Collectors.toList());
-//        List<CsLinePO> csLinePOS = csLinePOService.listByIds(collect);
-//        List<CsLinePO> collect1 = csLinePOS.stream().filter(temp -> Objects.equals(temp.getPosition(), areaId)).collect(Collectors.toList());
-//        List<String> collect2 = collect1.stream().map(CsLinePO::getLineId).collect(Collectors.toList());
-//        lineList = lineList.stream().filter(temp -> collect2.contains(temp.getId())).collect(Collectors.toList());
-
-
-        List<CsLedgerVO> finalLineList = lineList;
+        List<CsLedgerVO> finalLineList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.LINE_LEVEL.getCode())).sorted(Comparator.comparing(CsLedgerVO::getSort)).collect(Collectors.toList());
         checkDevSetData(deviceList);
         deviceList.forEach(dev -> dev.setChildren(getChildren(dev, finalLineList)));
         projectList.forEach(pro -> pro.setChildren(getChildren(pro, deviceList)));
@@ -341,8 +324,12 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
      * 获取子节点
      */
     public List<CsLedgerVO> getChildren(CsLedgerVO item, List<CsLedgerVO> all) {
-        return all.stream().filter(allItem -> allItem.getPid().equals(item.getId())).collect(Collectors.toList());
+        return all.stream()
+                .filter(allItem -> allItem.getPid().equals(item.getId()))
+                .peek(child -> child.setComFlag(item.getComFlag()))
+                .collect(Collectors.toList());
     }
+
     public String getAreaById(String id){
 
         String areaName =redisUtil.getStringByKey (id);