From 829245010a58679a6ff4b6fbf1bc18eacf5b6681 Mon Sep 17 00:00:00 2001 From: yang_shj <1069818635@QQ.com> Date: Wed, 24 May 2023 10:09:17 +0800 Subject: [PATCH] =?UTF-8?q?#=E5=8F=91=E7=94=B5=E8=B4=9F=E8=8D=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/service/impl/AnalyseDataServiceImpl.java | 2 ++ .../main/service/impl/HydropowerServiceImpl.java | 21 ++++++++++++++++++--- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/AnalyseDataServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/AnalyseDataServiceImpl.java index f2d0f8d..476cdde 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/AnalyseDataServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/AnalyseDataServiceImpl.java @@ -73,10 +73,12 @@ public class AnalyseDataServiceImpl implements IAnalyseDataService { analyzeDataConditionPO.setEndTime(LocalDateTime.parse(DateUtil.format(new Date(), endTime), DateTimeFormatter.ofPattern(DateUtil.PATTERN_DATETIME))); signboardConditions.add(analyzeDataConditionPO); po.setSignboardConditions(signboardConditions); + log.error("period_target_data_request {}",po); R> result = analyseDataSearchClient.getAnalyzeDataByAnalyzeCodeAndSignages(po); if (!result.isSuccess() || CollectionUtil.isEmpty(result.getData())) { return new ArrayList<>(); } + log.error("period_target_data_resp {}",result); return result.getData().get(0).getList(); } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/HydropowerServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/HydropowerServiceImpl.java index 7d99632..7f5ee0c 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/HydropowerServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/HydropowerServiceImpl.java @@ -749,7 +749,12 @@ public class HydropowerServiceImpl implements HydropowerService { if(CollectionUtil.isEmpty(realList)){ return 0.0; } - return realList.stream().filter(o->deptId.equals(o.getDeptId())).mapToDouble(HydropowerUnitRealVo::getActivePower).sum(); + return realList.stream().filter(o->deptId.equals(o.getDeptId())).mapToDouble(o->{ + if("MW".equalsIgnoreCase(o.getPowerUnit())){ + return o.getActivePower() * 1000; + } + return o.getActivePower(); + }).sum(); } /** @@ -1006,7 +1011,12 @@ public class HydropowerServiceImpl implements HydropowerService { // 容量 kpi.setInstalledCapacity(reals.stream().mapToDouble(HydropowerUnitRealVo::getInstalledCapacity).sum()); // 负荷 - kpi.setLoad(reals.stream().mapToDouble(HydropowerUnitRealVo::getActivePower).sum()); + kpi.setLoad(reals.stream().mapToDouble(o->{ + if("MW".equalsIgnoreCase(o.getPowerUnit())){ + return o.getActivePower() * 1000; + } + return o.getActivePower(); + }).sum()); // 容量利用率 if (Math.abs(kpi.getInstalledCapacity()) <= 0) { kpi.setCapacityRate(0.0); @@ -1105,7 +1115,12 @@ public class HydropowerServiceImpl implements HydropowerService { // 实时数据: 容量利用率、电站利用率 if(CollectionUtil.isNotEmpty(reals)){ // 实时功率 - double use = reals.stream().filter(real->entry.getValue().stream().map(StationEntity::getRefDept).collect(Collectors.toList()).contains(real.getDeptId())).mapToDouble(HydropowerUnitRealVo::getActivePower).sum(); + double use = reals.stream().filter(real->entry.getValue().stream().map(StationEntity::getRefDept).collect(Collectors.toList()).contains(real.getDeptId())).mapToDouble(o->{ + if("MW".equalsIgnoreCase(o.getPowerUnit())){ + return o.getActivePower() * 1000; + } + return o.getActivePower(); + }).sum(); if(CollectionUtil.isNotEmpty(plans)){ // 装机容量 double capacity = reals.stream().filter(real-> entry.getValue().stream().map(StationEntity::getRefDept).collect(Collectors.toList()).contains(real.getDeptId())).mapToDouble(HydropowerUnitRealVo::getInstalledCapacity).sum();