From 2f8149e70964a81734bdeb8902fdcf3be74568f4 Mon Sep 17 00:00:00 2001 From: huangzj <826100833@qq.com> Date: Tue, 26 Sep 2023 15:22:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../csharmonic/pojo/vo/EventDetailVO.java | 14 ++++++ cs-harmonic/cs-harmonic-boot/pom.xml | 8 +--- .../service/impl/CsEventPOServiceImpl.java | 1 + .../impl/CsEventUserPOServiceImpl.java | 48 ++++++++++++++++++- .../service/impl/StableDataServiceImpl.java | 8 ++-- 5 files changed, 65 insertions(+), 14 deletions(-) diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/EventDetailVO.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/EventDetailVO.java index 7f8bb46..9c4aaf2 100644 --- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/EventDetailVO.java +++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/EventDetailVO.java @@ -94,4 +94,18 @@ public class EventDetailVO { private Integer status; private List dataSet; + /*暂态深度*/ + private String evtParamVVaDepth; + /*持续时间深度*/ + private String evtParamTm; + /*相别*/ + private String evtParamPhase; + /*位置*/ + private String evtParamPosition; + + + + + + } diff --git a/cs-harmonic/cs-harmonic-boot/pom.xml b/cs-harmonic/cs-harmonic-boot/pom.xml index 91d1fd5..c2acfeb 100644 --- a/cs-harmonic/cs-harmonic-boot/pom.xml +++ b/cs-harmonic/cs-harmonic-boot/pom.xml @@ -43,7 +43,7 @@ com.njcn pqs-influx - 0.0.1-SNAPSHOT + ${project.version} @@ -98,12 +98,6 @@ 1.0.0 compile - - com.njcn - common-influxDB - ${project.version} - compile - com.njcn system-api diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventPOServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventPOServiceImpl.java index dd23985..ba6251f 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventPOServiceImpl.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventPOServiceImpl.java @@ -105,6 +105,7 @@ public class CsEventPOServiceImpl extends ServiceImpl evtParamVVaDepth = eventDataSetDTOS.stream(). + filter(dataSetDTO -> Objects.equals(dataSetDTO.getName(), "Evt_Param_VVaDepth")). + collect(Collectors.toList()); + if(CollectionUtil.isEmpty(evtParamVVaDepth)){ + temp.setEvtParamVVaDepth("-"); + + }else { + temp.setEvtParamVVaDepth(evtParamVVaDepth.get(0).getValue()+(Objects.isNull(evtParamVVaDepth.get(0).getUnit())?"":evtParamVVaDepth.get(0).getUnit())); + + } + + List evtParamPosition = eventDataSetDTOS.stream(). + filter(dataSetDTO -> Objects.equals(dataSetDTO.getName(), "Evt_Param_Position")). + collect(Collectors.toList()); + if(CollectionUtil.isEmpty(evtParamPosition)){ + temp.setEvtParamPosition("-"); + + }else { + temp.setEvtParamPosition(evtParamPosition.get(0).getValue()+(Objects.isNull(evtParamPosition.get(0).getUnit())?"":evtParamPosition.get(0).getUnit())); + + } + + List evtParamTm = eventDataSetDTOS.stream(). + filter(dataSetDTO -> Objects.equals(dataSetDTO.getName(), "Evt_Param_Tm")). + collect(Collectors.toList()); + if(CollectionUtil.isEmpty(evtParamTm)){ + temp.setEvtParamTm("-"); + + }else { + temp.setEvtParamTm(evtParamTm.get(0).getValue()+(Objects.isNull(evtParamTm.get(0).getUnit())?"":evtParamTm.get(0).getUnit())); + + } + + List evtParamPhase = eventDataSetDTOS.stream(). + filter(dataSetDTO -> Objects.equals(dataSetDTO.getName(), "Evt_Param_Phase")). + collect(Collectors.toList()); + if(CollectionUtil.isEmpty(evtParamPhase)){ + temp.setEvtParamPhase("-"); + + }else { + temp.setEvtParamPhase(evtParamPhase.get(0).getValue()+(Objects.isNull(evtParamPhase.get(0).getUnit())?"":evtParamPhase.get(0).getUnit())); + + } }); } 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 e77d045..2617c18 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 @@ -12,14 +12,14 @@ import com.njcn.csharmonic.param.FrequencyStatisticalQueryParam; import com.njcn.csharmonic.param.ThdDataQueryParm; import com.njcn.csharmonic.pojo.vo.ThdDataVO; import com.njcn.csharmonic.service.StableDataService; +import com.njcn.influx.deprecated.InfluxDBPublicParam; import com.njcn.influx.pojo.dto.StatisticalDataDTO; import com.njcn.influx.pojo.po.HarmonicRatioData; import com.njcn.influx.pojo.po.PowerQualityData; import com.njcn.influx.service.CommonService; import com.njcn.influx.service.HaronicRatioService; import com.njcn.influx.service.PowerQualityService; -import com.njcn.influxdb.param.InfluxDBPublicParam; -import com.njcn.influxdb.utils.InfluxDbUtils; +import com.njcn.influx.utils.InfluxDbUtils; import com.njcn.system.api.CsStatisticalSetFeignClient; import com.njcn.system.api.DicDataFeignClient; import com.njcn.system.api.EpdFeignClient; @@ -28,11 +28,9 @@ import com.njcn.system.pojo.po.EleEpdPqd; import lombok.RequiredArgsConstructor; import org.influxdb.dto.QueryResult; import org.springframework.beans.BeanUtils; -import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; -import java.math.BigDecimal; -import java.math.RoundingMode; + import java.text.DecimalFormat; import java.time.ZoneId; import java.util.ArrayList;