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

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

@@ -137,7 +137,7 @@ public class PqTypicalSourceCreatePOServiceImpl extends ServiceImpl<PqTypicalSou
.eq(PqTypicalSourceCreatePO::getComputeDate,uploadParam.getTime())
.in(PqTypicalSourceCreatePO::getId,uploadParam.getList())
.isNotNull(PqTypicalSourceCreatePO::getComputeDate)
.in(PqTypicalSourceCreatePO::getStatisticalLevel,Stream.of("3","4").collect(Collectors.toList()))
.in(PqTypicalSourceCreatePO::getStatisticalLevel,Stream.of("3","4","5").collect(Collectors.toList()))
.list();
}
//未指定数据上送,则将所有未上送的数据,上送上去
@@ -145,7 +145,7 @@ public class PqTypicalSourceCreatePOServiceImpl extends ServiceImpl<PqTypicalSou
list = this.lambdaQuery()
.eq(PqTypicalSourceCreatePO::getComputeDate,uploadParam.getTime())
.isNotNull(PqTypicalSourceCreatePO::getComputeDate)
.in(PqTypicalSourceCreatePO::getStatisticalLevel, Stream.of("3","4").collect(Collectors.toList()))
.in(PqTypicalSourceCreatePO::getStatisticalLevel, Stream.of("3","4","5").collect(Collectors.toList()))
.list();
}

2
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PointStatisticalDataServiceImpl.java
View File

@@ -88,7 +88,7 @@ public class PointStatisticalDataServiceImpl extends ServiceImpl<RUploadPointSta
else {
list = this.lambdaQuery()
.eq(RUploadPointStatisticalDataD::getComputeDate,param.getTime())
.in(RUploadPointStatisticalDataD::getStatisticalLevel, Stream.of("3","4").collect(Collectors.toList()))
.in(RUploadPointStatisticalDataD::getStatisticalLevel, Stream.of("3","4","5").collect(Collectors.toList()))
.list();
}

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

@@ -130,11 +130,11 @@ public class REvaluationDataServiceImpl extends ServiceImpl<RUploadEvaluationDat
.in(RUploadEvaluationDataD::getId, param.getList())
.list();
}
//未指定数据上送,则上送省级数据(包含日、月数据)
//未指定数据上送,则上送省市县级数据(包含日、月数据)
else {
list = this.lambdaQuery()
.eq(RUploadEvaluationDataD::getComputeDate, param.getTime())
.in(RUploadEvaluationDataD::getStatisticalLevel, Stream.of("3", "4").collect(Collectors.toList()))
.in(RUploadEvaluationDataD::getStatisticalLevel, Stream.of("3", "4","5").collect(Collectors.toList()))
.list();
}

2
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/RSubstationStatisticalDataServiceImpl.java
View File

@@ -82,9 +82,7 @@ public class RSubstationStatisticalDataServiceImpl extends ServiceImpl<RUploadSu
else {
list = this.lambdaQuery()
.eq(RUploadSubstationStatisticalDataD::getStatisticalDate,param.getTime())
//.eq(RUploadSubstationStatisticalDataD::getCityId,"")
.isNotNull(RUploadSubstationStatisticalDataD::getComputeDate)
.eq(RUploadSubstationStatisticalDataD::getCountyId,"")
.list();
}
//以尺寸100分片

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();