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())){