From ca75ef7102e74186ff4b8efb2753106c8070aa49 Mon Sep 17 00:00:00 2001
From: huangzj <826100833@qq.com>
Date: Tue, 31 Oct 2023 11:45:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=BE=E5=A4=87=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/CsLedgerServiceImpl.java     | 33 +++++++++++++------
 1 file changed, 23 insertions(+), 10 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 cb10dbc..78f7002 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
@@ -5,17 +5,11 @@ import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.csdevice.enums.LineBaseEnum;
-import com.njcn.csdevice.mapper.AppProjectMapper;
-import com.njcn.csdevice.mapper.AppTopologyDiagramMapper;
-import com.njcn.csdevice.mapper.CsEngineeringMapper;
-import com.njcn.csdevice.mapper.CsLedgerMapper;
+import com.njcn.csdevice.mapper.*;
 import com.njcn.csdevice.pojo.dto.DevDetailDTO;
 import com.njcn.csdevice.pojo.dto.LineParamDTO;
 import com.njcn.csdevice.pojo.param.CsLedgerParam;
-import com.njcn.csdevice.pojo.po.AppProjectPO;
-import com.njcn.csdevice.pojo.po.AppTopologyDiagramPO;
-import com.njcn.csdevice.pojo.po.CsEngineeringPO;
-import com.njcn.csdevice.pojo.po.CsLedger;
+import com.njcn.csdevice.pojo.po.*;
 import com.njcn.csdevice.pojo.vo.CsLedgerVO;
 import com.njcn.csdevice.service.CsLinePOService;
 import com.njcn.csdevice.service.ICsEngineeringUserService;
@@ -57,6 +51,9 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
     private final FileStorageUtil fileStorageUtil;
     private final RoleEngineerDevService roleEngineerDevService;
 
+    private final CsEquipmentDeliveryMapper csEquipmentDeliveryMapper;
+
+
 
     @Override
     public List<CsLedgerVO> getLedgerTree() {
@@ -92,7 +89,15 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
 //        }
         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())).sorted(Comparator.comparing(CsLedgerVO::getSort)).collect(Collectors.toList());
+        List<CsLedgerVO> deviceList = allList.stream().filter(item -> device.contains(item.getId())).
+                map(
+                        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());
@@ -125,7 +130,15 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
 //        }
         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())).sorted(Comparator.comparing(CsLedgerVO::getSort)).collect(Collectors.toList());
+        List<CsLedgerVO> deviceList = allList.stream().filter(item -> device.contains(item.getId())).
+                map(
+                        temp->{
+                            CsEquipmentDeliveryPO csEquipmentDeliveryPO = csEquipmentDeliveryMapper.selectById(temp.getId());
+                            temp.setComFlag(csEquipmentDeliveryPO.getRunStatus());
+                            return temp;
+                        }
+                ).
+                sorted(Comparator.comparing(CsLedgerVO::getSort)).collect(Collectors.toList());
 
         projectList.forEach(pro -> pro.setChildren(getChildren(pro, deviceList)));
         engineeringList.forEach(eng -> eng.setChildren(getChildren(eng, projectList)));