From 92ab75a0dfdb8d7fd207f772ddbcc12bee5207be Mon Sep 17 00:00:00 2001 From: guofeihu <3347277866@qq.com> Date: Fri, 9 Aug 2024 10:08:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AE=BE=E5=A4=87=E7=9B=91?= =?UTF-8?q?=E6=8E=A7=E5=8E=86=E5=8F=B2=E6=95=B0=E6=8D=AE=E5=8F=8A=E6=9C=80?= =?UTF-8?q?=E6=96=B0=E4=B8=80=E7=BB=84=E6=95=B0=E6=8D=AE=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E6=9C=80=E5=A4=A7=E5=8C=96=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/njcn/csharmonic/param/DevicDataTrendQueryParam.java | 2 ++ .../csharmonic/service/impl/DeviceDataTrendServiceImpl.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/DevicDataTrendQueryParam.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/DevicDataTrendQueryParam.java index 44aff8b..8ea0195 100644 --- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/DevicDataTrendQueryParam.java +++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/DevicDataTrendQueryParam.java @@ -36,6 +36,8 @@ public class DevicDataTrendQueryParam { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") @NotNull(message="结束时间不能为空！") private String endTime; + + private String devId; @Data public static class StatisticalParam{ private String classId; diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/DeviceDataTrendServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/DeviceDataTrendServiceImpl.java index cf90c6c..6ab0e9d 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/DeviceDataTrendServiceImpl.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/DeviceDataTrendServiceImpl.java @@ -57,7 +57,7 @@ public class DeviceDataTrendServiceImpl implements DeviceDataTrendService { LineParamDTO lineParamDTO = new LineParamDTO(); lineParamDTO.setLineId(devicDataTrendQueryParam.getLineId()); List data = csLedgerFeignClient.queryLine(lineParamDTO).getData(); - List data1 = equipmentFeignClient.queryDeviceById(Stream.of(data.get(0).getPid()).collect(Collectors.toList())).getData(); + List data1 = equipmentFeignClient.queryDeviceById(Stream.of((data == null || data.isEmpty()) ? devicDataTrendQueryParam.getDevId() : data.get(0).getPid()).collect(Collectors.toList())).getData(); devicDataTrendQueryParam.getStatisticalParams().forEach(temp->{ CommonQueryParam commonQueryParam = new CommonQueryParam(); commonQueryParam.setLineId(devicDataTrendQueryParam.getLineId());