Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

解决配网-全网基准水平bug

Browse Source
This commit is contained in:
wurui
2023-03-01 10:31:01 +08:00
parent 9a80341dd5
commit 4d5750092f
3 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/distribution/impl/PwRMpBenchmarkLevelMServiceImpl.java
View File

@@ -22,17 +22,18 @@ import org.springframework.stereotype.Service;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.function.Function;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
* @author jianghf * @author jianghf
* @description 针对表【r_mp_benchmark_level_m】的数据库操作Service实现 * @description 针对表【r_mp_benchmark_level_m】的数据库操作Service实现
* @createDate 2022-10-11 10:32:18 * @createDate 2022-10-11 10:32:18
*/ */
@Service @Service
@RequiredArgsConstructor @RequiredArgsConstructor
public class PwRMpBenchmarkLevelMServiceImpl extends ServiceImpl<PwRMpBenchmarkLevelMMapper, RMpBenchmarkLevelM> public class PwRMpBenchmarkLevelMServiceImpl extends ServiceImpl<PwRMpBenchmarkLevelMMapper, RMpBenchmarkLevelM>
implements PwRMpBenchmarkLevelMService { implements PwRMpBenchmarkLevelMService {
private final PwMonitorClient pwMonitorClient; private final PwMonitorClient pwMonitorClient;
@@ -53,7 +54,7 @@ implements PwRMpBenchmarkLevelMService {
} }
String startTime = rMpBenchmarkLevelParam.getStartTime(); //开始时间 String startTime = rMpBenchmarkLevelParam.getStartTime(); //开始时间
String endTime = rMpBenchmarkLevelParam.getEndTime(); //截止时间 String endTime = rMpBenchmarkLevelParam.getEndTime(); //截止时间
List <String> voltageLevelParamList = StringUtils.isNotBlank(rMpBenchmarkLevelParam.getVoltageLevel()) ? Arrays.asList(rMpBenchmarkLevelParam.getVoltageLevel().split(",")) : null; //电压等级 List<String> voltageLevelParamList = StringUtils.isNotBlank(rMpBenchmarkLevelParam.getVoltageLevel()) ? Arrays.asList(rMpBenchmarkLevelParam.getVoltageLevel().split(",")) : null; //电压等级
Integer pageNum = rMpBenchmarkLevelParam.getPageNum() != null && rMpBenchmarkLevelParam.getPageNum() != 0 ? rMpBenchmarkLevelParam.getPageNum() : 1; //页码 Integer pageNum = rMpBenchmarkLevelParam.getPageNum() != null && rMpBenchmarkLevelParam.getPageNum() != 0 ? rMpBenchmarkLevelParam.getPageNum() : 1; //页码
Integer pageSize = rMpBenchmarkLevelParam.getPageSize() != null && rMpBenchmarkLevelParam.getPageSize() != 0 ? rMpBenchmarkLevelParam.getPageSize() : 10; //页面尺寸 Integer pageSize = rMpBenchmarkLevelParam.getPageSize() != null && rMpBenchmarkLevelParam.getPageSize() != 0 ? rMpBenchmarkLevelParam.getPageSize() : 10; //页面尺寸
@@ -68,7 +69,7 @@ implements PwRMpBenchmarkLevelMService {
//监测点id集合 //监测点id集合
List<String> monitorIdList = pwMonitorList.stream().map(PwPmsMonitorDTO::getMonitorId).collect(Collectors.toList()); List<String> monitorIdList = pwMonitorList.stream().map(PwPmsMonitorDTO::getMonitorId).collect(Collectors.toList());
//监测点map key:监测点id value:监测点实体 //监测点map key:监测点id value:监测点实体
Map<String, PwPmsMonitorDTO> monitorMap = pwMonitorList.stream().collect(Collectors.toMap(PwPmsMonitorDTO::getMonitorId, monitor -> monitor)); Map<String, PwPmsMonitorDTO> monitorMap = pwMonitorList.stream().collect(Collectors.toMap(PwPmsMonitorDTO::getMonitorId, Function.identity(), (key1, key2) -> key1));
//查询【基准水平-月】数据 //查询【基准水平-月】数据
/*组装条件：where measurement_point_id in (monitorIdList) and data_date >= startTime /*组装条件：where measurement_point_id in (monitorIdList) and data_date >= startTime

3
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/distribution/impl/PwRMpBenchmarkLevelQServiceImpl.java
View File

@@ -22,6 +22,7 @@ import org.springframework.stereotype.Service;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.function.Function;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
@@ -67,7 +68,7 @@ implements PwRMpBenchmarkLevelQService {
//监测点id集合 //监测点id集合
List<String> monitorIdList = pwMonitorList.stream().map(PwPmsMonitorDTO::getMonitorId).collect(Collectors.toList()); List<String> monitorIdList = pwMonitorList.stream().map(PwPmsMonitorDTO::getMonitorId).collect(Collectors.toList());
//监测点map key:监测点id value:监测点实体 //监测点map key:监测点id value:监测点实体
Map<String, PwPmsMonitorDTO> monitorMap = pwMonitorList.stream().collect(Collectors.toMap(PwPmsMonitorDTO::getMonitorId, monitor -> monitor)); Map<String, PwPmsMonitorDTO> monitorMap = pwMonitorList.stream().collect(Collectors.toMap(PwPmsMonitorDTO::getMonitorId, Function.identity(), (key1, key2)->key1));
//查询【基准水平-季】数据 //查询【基准水平-季】数据
/*组装条件：where measurement_point_id in (monitorIdList) and data_date >= startTime /*组装条件：where measurement_point_id in (monitorIdList) and data_date >= startTime

4
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/distribution/impl/PwRMpBenchmarkLevelYServiceImpl.java
View File

@@ -22,6 +22,7 @@ import org.springframework.stereotype.Service;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.function.Function;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
@@ -68,7 +69,8 @@ implements PwRMpBenchmarkLevelYService {
//监测点id集合 //监测点id集合
List<String> monitorIdList = pwMonitorList.stream().map(PwPmsMonitorDTO::getMonitorId).collect(Collectors.toList()); List<String> monitorIdList = pwMonitorList.stream().map(PwPmsMonitorDTO::getMonitorId).collect(Collectors.toList());
//监测点map key:监测点id value:监测点实体 //监测点map key:监测点id value:监测点实体
Map<String, PwPmsMonitorDTO> monitorMap = pwMonitorList.stream().collect(Collectors.toMap(PwPmsMonitorDTO::getMonitorId, monitor -> monitor)); Map<String, PwPmsMonitorDTO> monitorMap = pwMonitorList.stream().collect(
Collectors.toMap(PwPmsMonitorDTO::getMonitorId, Function.identity(), (key1, key2) -> key1));
//查询【基准水平-年】数据 //查询【基准水平-年】数据
/*组装条件：where measurement_point_id in (monitorIdList) and data_date >= startTime /*组装条件：where measurement_point_id in (monitorIdList) and data_date >= startTime