From cd35e67007d3cc05cc8af94b07ae2025960b6957 Mon Sep 17 00:00:00 2001
From: xy <748613696@qq.com>
Date: Wed, 16 Oct 2024 10:32:40 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=A0=91=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=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     | 26 ++++++++++++-------
 .../impl/OfflineDataUploadServiceImpl.java    |  2 +-
 2 files changed, 18 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 316164b..beff072 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
@@ -78,7 +78,7 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
         engineeringList = allList.stream().filter(item->roleengineer.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 -> device.contains(item.getId())).
+        List<CsLedgerVO> deviceList = allList.stream().filter(item -> device.contains(item.getId()) && !Objects.equals(item.getPid(),"0")).
                 peek(
                         temp->{
                             CsEquipmentDeliveryPO csEquipmentDeliveryPO = csEquipmentDeliveryMapper.selectById(temp.getId());
@@ -115,8 +115,12 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
         government.setId(IdUtil.simpleUUID());
         government.setChildren(engineeringList);
         List<CsLedgerVO> tree = new ArrayList<>();
-        tree.add(portable);
-        tree.add(government);
+        if (CollUtil.isNotEmpty(portables)) {
+            tree.add(portable);
+        }
+        if (CollUtil.isNotEmpty(deviceList)) {
+            tree.add(government);
+        }
         return tree;
     }
     //剔除未接入的设备(根据status判断不太稳,所有这里直接判断该设备有没有对应的模板指标)
@@ -157,12 +161,12 @@ 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());
         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 -> device.contains(item.getId())).
+        List<CsLedgerVO> deviceList = allList.stream().filter(item -> device.contains(item.getId()) && !Objects.equals(item.getPid(),"0")).
                 peek(
                         temp->{
-                            CsEquipmentDeliveryPO csEquipmentDeliveryPO = csEquipmentDeliveryMapper.selectById(temp.getId());
-                            temp.setComFlag(csEquipmentDeliveryPO.getRunStatus());
-                            temp.setNDId(csEquipmentDeliveryPO.getNdid());
+                            CsEquipmentDeliveryPO po = csEquipmentDeliveryMapper.selectById(temp.getId());
+                            temp.setComFlag(po.getRunStatus());
+                            temp.setNDId(po.getNdid());
                         }
                 ).
                 sorted(Comparator.comparing(CsLedgerVO::getSort)).collect(Collectors.toList());
@@ -193,8 +197,12 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
         government.setId(IdUtil.simpleUUID());
         government.setChildren(engineeringList);
         List<CsLedgerVO> tree = new ArrayList<>();
-        tree.add(portable);
-        tree.add(government);
+        if (CollUtil.isNotEmpty(portables)) {
+            tree.add(portable);
+        }
+        if (CollUtil.isNotEmpty(deviceList)) {
+            tree.add(government);
+        }
         return tree;
     }
 
diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/OfflineDataUploadServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/OfflineDataUploadServiceImpl.java
index b46cc07..78d64eb 100644
--- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/OfflineDataUploadServiceImpl.java
+++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/OfflineDataUploadServiceImpl.java
@@ -281,7 +281,7 @@ public class OfflineDataUploadServiceImpl implements OfflineDataUploadService {
                     }
                     askFileInfo(param.getNDid(),mid,item);
                     try {
-                        Thread.sleep(5000);
+                        Thread.sleep(100000);
                         FileDto.FileInfo info = channelObjectUtil.objectToSingleObject(redisUtil.getObjectByKey(key),FileDto.FileInfo.class);
                         String path = deviceFtpFeignClient.downloadFile(param.getNDid(),item,info.getFileSize(),info.getFileCheck()).getData();
                         String lsFile = generalInfo.getBusinessTempPath() + File.separator + item.split(StrUtil.SLASH)[item.split(StrUtil.SLASH).length - 1];