From 4d5750092fda7b1f2607732e8336094fa254919e Mon Sep 17 00:00:00 2001 From: wurui Date: Wed, 1 Mar 2023 10:31:01 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=85=8D=E7=BD=91-=E5=85=A8?= =?UTF-8?q?=E7=BD=91=E5=9F=BA=E5=87=86=E6=B0=B4=E5=B9=B3bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PwRMpBenchmarkLevelMServiceImpl.java | 15 ++++++++------- .../impl/PwRMpBenchmarkLevelQServiceImpl.java | 3 ++- .../impl/PwRMpBenchmarkLevelYServiceImpl.java | 4 +++- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/distribution/impl/PwRMpBenchmarkLevelMServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/distribution/impl/PwRMpBenchmarkLevelMServiceImpl.java index 585528d73..613bd9dcd 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/distribution/impl/PwRMpBenchmarkLevelMServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/distribution/impl/PwRMpBenchmarkLevelMServiceImpl.java @@ -22,17 +22,18 @@ import org.springframework.stereotype.Service; import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.function.Function; import java.util.stream.Collectors; /** -* @author jianghf -* @description 针对表【r_mp_benchmark_level_m】的数据库操作Service实现 -* @createDate 2022-10-11 10:32:18 -*/ + * @author jianghf + * @description 针对表【r_mp_benchmark_level_m】的数据库操作Service实现 + * @createDate 2022-10-11 10:32:18 + */ @Service @RequiredArgsConstructor public class PwRMpBenchmarkLevelMServiceImpl extends ServiceImpl -implements PwRMpBenchmarkLevelMService { + implements PwRMpBenchmarkLevelMService { private final PwMonitorClient pwMonitorClient; @@ -53,7 +54,7 @@ implements PwRMpBenchmarkLevelMService { } String startTime = rMpBenchmarkLevelParam.getStartTime(); //开始时间 String endTime = rMpBenchmarkLevelParam.getEndTime(); //截止时间 - List voltageLevelParamList = StringUtils.isNotBlank(rMpBenchmarkLevelParam.getVoltageLevel()) ? Arrays.asList(rMpBenchmarkLevelParam.getVoltageLevel().split(",")) : null; //电压等级 + List voltageLevelParamList = StringUtils.isNotBlank(rMpBenchmarkLevelParam.getVoltageLevel()) ? Arrays.asList(rMpBenchmarkLevelParam.getVoltageLevel().split(",")) : null; //电压等级 Integer pageNum = rMpBenchmarkLevelParam.getPageNum() != null && rMpBenchmarkLevelParam.getPageNum() != 0 ? rMpBenchmarkLevelParam.getPageNum() : 1; //页码 Integer pageSize = rMpBenchmarkLevelParam.getPageSize() != null && rMpBenchmarkLevelParam.getPageSize() != 0 ? rMpBenchmarkLevelParam.getPageSize() : 10; //页面尺寸 @@ -68,7 +69,7 @@ implements PwRMpBenchmarkLevelMService { //监测点id集合 List monitorIdList = pwMonitorList.stream().map(PwPmsMonitorDTO::getMonitorId).collect(Collectors.toList()); //监测点map key:监测点id value:监测点实体 - Map monitorMap = pwMonitorList.stream().collect(Collectors.toMap(PwPmsMonitorDTO::getMonitorId, monitor -> monitor)); + Map monitorMap = pwMonitorList.stream().collect(Collectors.toMap(PwPmsMonitorDTO::getMonitorId, Function.identity(), (key1, key2) -> key1)); //查询【基准水平-月】数据 /*组装条件：where measurement_point_id in (monitorIdList) and data_date >= startTime diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/distribution/impl/PwRMpBenchmarkLevelQServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/distribution/impl/PwRMpBenchmarkLevelQServiceImpl.java index d5adccd2e..1cb5cc1c2 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/distribution/impl/PwRMpBenchmarkLevelQServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/distribution/impl/PwRMpBenchmarkLevelQServiceImpl.java @@ -22,6 +22,7 @@ import org.springframework.stereotype.Service; import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.function.Function; import java.util.stream.Collectors; /** @@ -67,7 +68,7 @@ implements PwRMpBenchmarkLevelQService { //监测点id集合 List monitorIdList = pwMonitorList.stream().map(PwPmsMonitorDTO::getMonitorId).collect(Collectors.toList()); //监测点map key:监测点id value:监测点实体 - Map monitorMap = pwMonitorList.stream().collect(Collectors.toMap(PwPmsMonitorDTO::getMonitorId, monitor -> monitor)); + Map monitorMap = pwMonitorList.stream().collect(Collectors.toMap(PwPmsMonitorDTO::getMonitorId, Function.identity(), (key1, key2)->key1)); //查询【基准水平-季】数据 /*组装条件：where measurement_point_id in (monitorIdList) and data_date >= startTime diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/distribution/impl/PwRMpBenchmarkLevelYServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/distribution/impl/PwRMpBenchmarkLevelYServiceImpl.java index 67cbff0fb..81144e0b8 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/distribution/impl/PwRMpBenchmarkLevelYServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/distribution/impl/PwRMpBenchmarkLevelYServiceImpl.java @@ -22,6 +22,7 @@ import org.springframework.stereotype.Service; import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.function.Function; import java.util.stream.Collectors; /** @@ -68,7 +69,8 @@ implements PwRMpBenchmarkLevelYService { //监测点id集合 List monitorIdList = pwMonitorList.stream().map(PwPmsMonitorDTO::getMonitorId).collect(Collectors.toList()); //监测点map key:监测点id value:监测点实体 - Map monitorMap = pwMonitorList.stream().collect(Collectors.toMap(PwPmsMonitorDTO::getMonitorId, monitor -> monitor)); + Map monitorMap = pwMonitorList.stream().collect( + Collectors.toMap(PwPmsMonitorDTO::getMonitorId, Function.identity(), (key1, key2) -> key1)); //查询【基准水平-年】数据 /*组装条件：where measurement_point_id in (monitorIdList) and data_date >= startTime