From 61f969e41a7f60adeafd7761220f05bafa55758a Mon Sep 17 00:00:00 2001 From: hzj <826100833@qq.com> Date: Tue, 9 Apr 2024 11:07:54 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=B5=E8=83=BD=E8=B4=A8=E9=87=8F=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E7=9B=91=E6=B5=8B=E7=82=B9=E8=B6=85=E6=A0=87=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E9=9C=80=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/njcn/device/biz/commApi/CommLineClient.java | 2 +- .../majornetwork/impl/RMpPartHarmonicDetailDServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/CommLineClient.java b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/CommLineClient.java index 8b660e789..42ddaac87 100644 --- a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/CommLineClient.java +++ b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/CommLineClient.java @@ -46,5 +46,5 @@ public interface CommLineClient { @GetMapping("/getLineAllDetail") - LineALLInfoDTO getLineAllDetail(@RequestParam("id") String id); + HttpResult getLineAllDetail(@RequestParam("id") String id); } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RMpPartHarmonicDetailDServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RMpPartHarmonicDetailDServiceImpl.java index 0923e8624..be4e8fc30 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RMpPartHarmonicDetailDServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RMpPartHarmonicDetailDServiceImpl.java @@ -59,7 +59,7 @@ public class RMpPartHarmonicDetailDServiceImpl extends ServiceImpl steadyStatis = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.STEADY_STATIS.getCode()).getData(); rStatLimitRateDPOs.stream().collect(Collectors.groupingBy(RStatLimitRateDPO::getLineId)).forEach((k, v) -> { - LineALLInfoDTO lineALLInfoDTO = commLineClient.getLineAllDetail(k); + LineALLInfoDTO lineALLInfoDTO = commLineClient.getLineAllDetail(k).getData(); steadyStatis.forEach(dictData -> { if(Objects.equals(dictData.getCode(), DicDataEnum.TOTAL_INDICATOR.getCode())|| Objects.equals(dictData.getCode(), DicDataEnum.phase_Voltage.getCode())){