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

河北国网上报接口调整

Browse Source
This commit is contained in:
cdf
2024-05-30 13:11:05 +08:00
parent 1ab7a8ad38
commit cfbe643edd
5 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RUploadPointStatisticalDataDServiceImpl.java
View File

@@ -315,6 +315,7 @@ public class RUploadPointStatisticalDataDServiceImpl extends MppServiceImpl<RUpl
List<RUploadPointStatisticalDataD> resultPO = new ArrayList<>();
pmsRunStatisticMap.forEach((deptId,item)->{
PvTerminalTreeVO dept = deptMap.get(deptId);
//跳过全国这个单位
if (Objects.equals(Integer.parseInt(UploadEnum.NJCN_DEPT_LEVEL_1.getCode()), dept.getLevel())) {
return;
@@ -322,7 +323,13 @@ public class RUploadPointStatisticalDataDServiceImpl extends MppServiceImpl<RUpl
List<String> runMonitorIds = Arrays.stream(StrUtil.isNotBlank(item.getRunMonitorIds())?item.getRunMonitorIds().split(StrUtil.COMMA):new String[]{}).collect(toList());
List<String> onlineMonitorIds = Arrays.stream(StrUtil.isNotBlank(item.getOnlineMonitorIds())?item.getOnlineMonitorIds().split(StrUtil.COMMA):new String[]{}).collect(toList());
List<String> runDevIds = Arrays.stream(StrUtil.isNotBlank(item.getRunDevIds())?item.getRunDevIds().split(StrUtil.COMMA):new String[]{}).collect(toList());
List<LineDTO> lineDTOList = commLineClient.getLineDetailBatch(onlineMonitorIds).getData();
List<LineDTO> lineDTOList;
if(CollUtil.isNotEmpty(onlineMonitorIds)) {
lineDTOList = commLineClient.getLineDetailBatch(onlineMonitorIds).getData();
}else {
lineDTOList = new ArrayList<>();
}
List<RStatIntegrityD> deptRStatIntegrityDList = rStatIntegrityDList.stream().filter(it->runMonitorIds.contains(it.getLineIndex())).collect(toList());
@@ -461,7 +468,12 @@ public class RUploadPointStatisticalDataDServiceImpl extends MppServiceImpl<RUpl
List<String> runMonitorIds = Arrays.stream(StrUtil.isNotBlank(item.getRunMonitorIds())?item.getRunMonitorIds().split(StrUtil.COMMA):new String[]{}).collect(toList());
List<String> onlineMonitorIds = Arrays.stream(StrUtil.isNotBlank(item.getOnlineMonitorIds())?item.getOnlineMonitorIds().split(StrUtil.COMMA):new String[]{}).collect(toList());
List<String> runDevIds = Arrays.stream(StrUtil.isNotBlank(item.getRunDevIds())?item.getRunDevIds().split(StrUtil.COMMA):new String[]{}).collect(toList());
List<LineDTO> lineDTOList = commLineClient.getLineDetailBatch(onlineMonitorIds).getData();
List<LineDTO> lineDTOList;
if(CollUtil.isNotEmpty(onlineMonitorIds)) {
lineDTOList = commLineClient.getLineDetailBatch(onlineMonitorIds).getData();
}else {
lineDTOList = new ArrayList<>();
}
List<RStatIntegrityD> deptRStatIntegrityDList = rStatIntegrityDList.stream().filter(it->runMonitorIds.contains(it.getLineIndex())).collect(toList());
int due = deptRStatIntegrityDList.stream().mapToInt(RStatIntegrityD::getDueTime).sum();