From 279cf7d6287d83e0481c2062fda6ac0169c1ada4 Mon Sep 17 00:00:00 2001
From: hzj <826100833@qq.com>
Date: Thu, 1 Aug 2024 15:53:33 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=BB=9F=E8=AE=A1=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=EF=BC=8C=E7=94=B1=E4=BA=8E=E5=92=8C=E4=BE=BF=E6=90=BA?=
 =?UTF-8?q?=E5=BC=8F=E8=AE=BE=E5=A4=87=E5=90=88=E5=B9=B6=E6=A0=91=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/CsDeviceUserPOServiceImpl.java       |  8 ++++-
 .../service/impl/CsLedgerServiceImpl.java     | 29 +++++++++++++++++--
 2 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDeviceUserPOServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDeviceUserPOServiceImpl.java
index f13f3cb..7e5e877 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDeviceUserPOServiceImpl.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDeviceUserPOServiceImpl.java
@@ -162,7 +162,13 @@ public class CsDeviceUserPOServiceImpl extends ServiceImpl<CsDeviceUserPOMapper,
         }
 
         List<CsLedgerVO> deviceTree = iCsLedgerService.getDeviceTree();
-        List<String> collect1 = deviceTree.stream().filter(temp -> temp.getId().equals(id)).map(CsLedgerVO::getChildren).flatMap(Collection::stream).map(CsLedgerVO::getChildren).flatMap(Collection::stream).map(CsLedgerVO::getId).collect(Collectors.toList());
+        //由于多加了一程便携式设备
+        List<String> collect1 = deviceTree.stream()
+                .map(CsLedgerVO::getChildren).flatMap(Collection::stream)
+                .filter(temp -> temp.getId().equals(id))
+                .map(CsLedgerVO::getChildren).flatMap(Collection::stream)
+                .map(CsLedgerVO::getChildren).flatMap(Collection::stream)
+                .map(CsLedgerVO::getId).collect(Collectors.toList());
         //求交集
         device.retainAll(collect1);
         if(CollectionUtils.isEmpty(device)){
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 a78e839..13bc0b0 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
@@ -194,10 +194,35 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
                         }
                 ).
                 sorted(Comparator.comparing(CsLedgerVO::getSort)).collect(Collectors.toList());
-
+        checkDevSetData(deviceList);
         projectList.forEach(pro -> pro.setChildren(getChildren(pro, deviceList)));
         engineeringList.forEach(eng -> eng.setChildren(getChildren(eng, projectList)));
-        return engineeringList;
+        //整理整个树并新增便携式设备树
+        CsLedgerVO portable = new CsLedgerVO();
+        portable.setLevel(0);
+        portable.setName(DataParam.portableDev);
+        portable.setPid("0");
+        portable.setId(IdUtil.simpleUUID());
+        List<CsLedgerVO> portables = wlRecordMapper.getAll();
+        checkDevSetData(portables);
+        for(CsLedgerVO c : portables){
+            c.setPid(portable.getId());
+            CsEquipmentDeliveryPO csEquipmentDeliveryPO = csEquipmentDeliveryMapper.selectById(c.getId());
+            c.setComFlag(Integer.parseInt(csEquipmentDeliveryPO.getStatus()));
+        }
+        portable.setChildren(portables);
+
+        CsLedgerVO government = new CsLedgerVO();
+        government.setLevel(0);
+        government.setName(DataParam.governmentDev);
+        government.setPid("0");
+        government.setId(IdUtil.simpleUUID());
+        government.setChildren(engineeringList);
+        List<CsLedgerVO> tree = new ArrayList<>();
+        tree.add(portable);
+        tree.add(government);
+        return tree;
+        //return engineeringList;
     }
 
     @Override