From 8c7ea7e99785ec8304a2f8c889fa6a970c5870ba Mon Sep 17 00:00:00 2001
From: hzj <826100833@qq.com>
Date: Thu, 1 Aug 2024 15:12: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=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/CsGroupServiceImpl.java      |  6 ++--
 .../service/impl/CsLedgerServiceImpl.java     | 29 ++-----------------
 2 files changed, 6 insertions(+), 29 deletions(-)

diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java
index 9b53ca5..ce8a601 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java
@@ -155,7 +155,7 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
                 EleEpdPqd eleEpdPqd = epdFeignClient.selectById(item.getDataId()).getData();
                 vo.setClassId(eleEpdPqd.getClassId());
                 vo.setUnit(eleEpdPqd.getUnit());
-                StatisticalDataDTO statisticalDataDTO = commonService.getLineRtData(lineId,eleEpdPqd.getClassId(),item.getName(),item.getPhase(),item.getStatMethod(),clDid);
+                StatisticalDataDTO statisticalDataDTO = commonService.getLineRtData(lineId,getTableNameByClassId(eleEpdPqd.getClassId()),item.getName(),item.getPhase(),item.getStatMethod(),clDid);
                 if (!Objects.isNull(statisticalDataDTO)){
                     vo.setTime(statisticalDataDTO.getTime());
                     vo.setDataValue(BigDecimal.valueOf(statisticalDataDTO.getValue()).setScale(4, RoundingMode.UP).doubleValue());
@@ -211,7 +211,7 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
                 EleEpdPqd eleEpdPqd = epdFeignClient.selectById(item.getDataId()).getData();
                 vo.setClassId(eleEpdPqd.getClassId());
                 vo.setUnit(eleEpdPqd.getUnit());
-                StatisticalDataDTO statisticalDataDTO = commonService.getLineHistoryData(energyBaseParam.getLineId(),eleEpdPqd.getClassId(),item.getName(),energyBaseParam.getStartTime(),energyBaseParam.getEndTime(),clDid);
+                StatisticalDataDTO statisticalDataDTO = commonService.getLineHistoryData(energyBaseParam.getLineId(),getTableNameByClassId(eleEpdPqd.getClassId()),item.getName(),energyBaseParam.getStartTime(),energyBaseParam.getEndTime(),clDid);
                 if (!Objects.isNull(statisticalDataDTO)){
                     vo.setMaxValue(BigDecimal.valueOf(statisticalDataDTO.getMaxValue()).setScale(4, RoundingMode.UP).doubleValue());
                     vo.setMinValue(BigDecimal.valueOf(statisticalDataDTO.getMinValue()).setScale(4, RoundingMode.UP).doubleValue());
@@ -700,4 +700,6 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
         return result;
     }
 
+
+
 }
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 13bc0b0..a78e839 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,35 +194,10 @@ 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)));
-        //整理整个树并新增便携式设备树
-        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;
+        return engineeringList;
     }
 
     @Override