From 231549446e719ddfc896e5858477f4a336cb2acd Mon Sep 17 00:00:00 2001 From: huangzj <826100833@qq.com> Date: Wed, 18 Oct 2023 09:00:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../csharmonic/service/impl/StableDataServiceImpl.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/StableDataServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/StableDataServiceImpl.java index 74f206a..a3bc812 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/StableDataServiceImpl.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/StableDataServiceImpl.java @@ -7,6 +7,8 @@ import com.njcn.csdevice.api.CsLineFeignClient; import com.njcn.csdevice.api.EquipmentFeignClient; import com.njcn.csdevice.enums.AlgorithmResponseEnum; import com.njcn.csdevice.pojo.dto.CsEquipmentDeliveryDTO; +import com.njcn.csdevice.pojo.dto.LineParamDTO; +import com.njcn.csdevice.pojo.po.CsLedger; import com.njcn.csdevice.pojo.po.CsLinePO; import com.njcn.csdevice.utils.ReflectUtils; import com.njcn.csharmonic.param.CommonStatisticalQueryParam; @@ -290,7 +292,11 @@ public class StableDataServiceImpl implements StableDataService { if(CollectionUtil.isEmpty(csLinePOList)){ throw new BusinessException(AlgorithmResponseEnum.LINE_DATA_ERROR); } - List data1 = equipmentFeignClient.queryDeviceById(Stream.of(commonStatisticalQueryParam.getDevId()).collect(Collectors.toList())).getData(); + + LineParamDTO lineParamDTO = new LineParamDTO(); + lineParamDTO.setLineId(commonStatisticalQueryParam.getLineList().get(0)); + List csLedgers = csLedgerFeignClient.queryLine(lineParamDTO).getData(); + List data1 = equipmentFeignClient.queryDeviceById(Stream.of(csLedgers.get(0).getPid()).collect(Collectors.toList())).getData(); List collect = csLinePOList.stream().map(CsLinePO::getLineId).collect(Collectors.toList());