From 0965eed31b5ad21dc4ed3d5211553f5dde55bb7e Mon Sep 17 00:00:00 2001 From: xy <748613696@qq.com> Date: Thu, 13 Feb 2025 13:13:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/njcn/csdevice/service/impl/CsGroupServiceImpl.java | 4 ++-- .../com/njcn/csharmonic/service/impl/DataServiceImpl.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java index cd434c9..580337f 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java @@ -337,8 +337,8 @@ public class CsGroupServiceImpl extends ServiceImpl impl if (Objects.equals("Primary",commonStatisticalQueryParam.getDataLevel())) { if (Objects.equals("Primary",csDataSet.getDataLevel())) { if (HarmonicConstant.POWER_LIST.contains(epdPqd.getShowName())) { - re = Objects.isNull(temp.getValue()) ? 3.14159 : temp.getValue() / 1000; - vo.setStatisticalData(Double.valueOf(df.format(re))); + re = Objects.isNull(temp.getValue()) ? 3.14159 : Double.parseDouble(df.format(temp.getValue() / 1000)); + vo.setStatisticalData(re); unit = "k" + epdPqd.getUnit(); } else { vo.setStatisticalData(Objects.isNull(temp.getValue()) ? 3.14159 : Double.parseDouble(df.format(temp.getValue()))); diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/DataServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/DataServiceImpl.java index 0308600..9adb943 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/DataServiceImpl.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/DataServiceImpl.java @@ -220,8 +220,8 @@ public class DataServiceImpl implements IDataService { if (Objects.equals("Primary",dataLevel)) { if (Objects.equals("Primary",csDataSetLevel)) { if (HarmonicConstant.POWER_LIST.contains(item2.getShowName())) { - re = Objects.isNull(statisticalDataDTO) ? 3.14159 : statisticalDataDTO.getValue() / 1000; - vo.setAvgValue(Double.valueOf(df.format(re))); + re = Objects.isNull(statisticalDataDTO) ? 3.14159 : Double.parseDouble(df.format(statisticalDataDTO.getValue() / 1000)); + vo.setAvgValue(re); unit = "k" + item2.getUnit(); } else { vo.setAvgValue(Objects.isNull(statisticalDataDTO) ? 3.14159 : Double.parseDouble(df.format(statisticalDataDTO.getValue())));