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 1d32dc4..5309b09 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 @@ -797,9 +797,8 @@ public class CsGroupServiceImpl extends ServiceImpl impl Double pt = finalCsLinePO.getPtRatio(); if(CollectionUtil.isNotEmpty(trendDataQueryParam.getList())) { for (TrendDataQueryParam param : trendDataQueryParam.getList()) { - List eleEpdPqds = csStatisticalSetFeignClient.queryStatisticalSelect(param.getStatisticalId()).getData(); - eleEpdPqds.forEach(epdPqd -> { + for (EleEpdPqd epdPqd : eleEpdPqds) { CommonQueryParam commonQueryParam = new CommonQueryParam(); commonQueryParam.setLineId(finalCsLinePO.getLineId()); commonQueryParam.setTableName(influxDbParamUtil.getTableNameByClassId(epdPqd.getClassId())); @@ -813,7 +812,7 @@ public class CsGroupServiceImpl extends ServiceImpl impl commonQueryParam.setClDid(influxDbParamUtil.getClDidByLineId(finalCsLinePO.getLineId())); - List deviceRtData = commonService.getDeviceRtDataByTime(Collections.singletonList(commonQueryParam)); + List deviceRtData = commonService.getNewDeviceRtDataByTime(Collections.singletonList(commonQueryParam)); List collect1 = deviceRtData.stream().map(temp -> { String unit; ThdDataVO vo = new ThdDataVO(); @@ -927,7 +926,7 @@ public class CsGroupServiceImpl extends ServiceImpl impl return vo; }).collect(Collectors.toList()); result.addAll(collect1); - }); + } } } return result;