From 52342d736d0e55f7a4a49a0d662f538c567b6c29 Mon Sep 17 00:00:00 2001 From: hzj <826100833@qq.com> Date: Mon, 19 May 2025 10:58:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=96=B0=E5=A2=9E=E8=AE=BE?= =?UTF-8?q?=E5=A4=87bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../csharmonic/service/impl/StableDataServiceImpl.java | 7 ++++++- 1 file changed, 6 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 a2f7ee5..6ecc845 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 @@ -36,6 +36,7 @@ import lombok.RequiredArgsConstructor; import org.influxdb.dto.QueryResult; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; +import org.springframework.util.StringUtils; import java.text.DecimalFormat; import java.time.ZoneId; @@ -273,7 +274,11 @@ public class StableDataServiceImpl implements StableDataService { List finalCsLinePOList = csLinePOList; data.forEach(epdPqd->{ String frequency = Optional.ofNullable(commonStatisticalQueryParam.getFrequency()).orElse(""); - + if(StringUtils.isEmpty(commonStatisticalQueryParam.getFrequency())){ + frequency =""; + }else { + frequency = "_"+commonStatisticalQueryParam.getFrequency(); + } String finalFrequency1 = frequency; List commonQueryParams = csLinePOList1.stream().map(temp -> { CommonQueryParam commonQueryParam = new CommonQueryParam();