From b794842d33e8bbabbeea622c1241212802de35dc Mon Sep 17 00:00:00 2001 From: xy <748613696@qq.com> Date: Thu, 17 Jul 2025 15:50:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E5=9D=97=E6=96=B0=E5=A2=9E=E6=B8=A9?= =?UTF-8?q?=E5=BA=A6=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../csharmonic/service/impl/DataServiceImpl.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) 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 721246c..3d18b7d 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 @@ -280,14 +280,15 @@ public class DataServiceImpl implements IDataService { vo2.setPhasicType(item.getPhaseType()); vo2.setData(Objects.isNull(item.getAvgValue()) ? 3.14159 : Double.parseDouble(df.format(item.getAvgValue()))); - EachModuleVO.DataVo vo3 = new EachModuleVO.DataVo(); - vo3.setTime(LocalDateTime.ofInstant(item.getTime().minus(8, ChronoUnit.HOURS), ZoneId.systemDefault())); - vo3.setPhasicType(item.getPhaseType()); - vo3.setData(Objects.isNull(item.getMinValue()) ? 3.14159 : Double.parseDouble(df.format(item.getMinValue()))); - + if (Objects.equals(item.getPhaseType(),"M")) { + EachModuleVO.DataVo vo3 = new EachModuleVO.DataVo(); + vo3.setTime(LocalDateTime.ofInstant(item.getTime().minus(8, ChronoUnit.HOURS), ZoneId.systemDefault())); + vo3.setPhasicType(item.getPhaseType()); + vo3.setData(Objects.isNull(item.getMinValue()) ? 3.14159 : Double.parseDouble(df.format(item.getMinValue()))); + list4.add(vo3); + } list2.add(vo1); list3.add(vo2); - list4.add(vo3); }); }