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

1.国网上送相关功能上送

Browse Source
This commit is contained in:
cdf
2024-04-03 11:30:06 +08:00
parent e0d508c7d8
commit a79e468d7d
12 changed files with 67 additions and 15 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

@@ -134,7 +134,7 @@ public class PqTypicalSourceCreatePOServiceImpl extends ServiceImpl<PqTypicalSou
//(预防之前送上过,修改数据后需要再次上送)
if (CollectionUtil.isNotEmpty(uploadParam.getList())){
list = this.lambdaQuery()
.eq(PqTypicalSourceCreatePO::getStatisticalDate,uploadParam.getTime())
.eq(PqTypicalSourceCreatePO::getComputeDate,uploadParam.getTime())
.in(PqTypicalSourceCreatePO::getId,uploadParam.getList())
.isNotNull(PqTypicalSourceCreatePO::getComputeDate)
.in(PqTypicalSourceCreatePO::getStatisticalLevel,Stream.of("3","4").collect(Collectors.toList()))
@@ -143,7 +143,7 @@ public class PqTypicalSourceCreatePOServiceImpl extends ServiceImpl<PqTypicalSou
//未指定数据上送,则将所有未上送的数据,上送上去
else {
list = this.lambdaQuery()
.eq(PqTypicalSourceCreatePO::getStatisticalDate,uploadParam.getTime())
.eq(PqTypicalSourceCreatePO::getComputeDate,uploadParam.getTime())
.eq(PqTypicalSourceCreatePO::getIsUploadHead,0)
.isNotNull(PqTypicalSourceCreatePO::getComputeDate)
.in(PqTypicalSourceCreatePO::getStatisticalLevel, Stream.of("3","4").collect(Collectors.toList()))

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

@@ -80,17 +80,15 @@ public class PointStatisticalDataServiceImpl extends ServiceImpl<RUploadPointSta
//(预防之前上送过,修改数据后需要再次上送)
if (CollUtil.isNotEmpty(param.getList())){
list = this.lambdaQuery()
.eq(RUploadPointStatisticalDataD::getStatisticalDate,param.getTime())
.eq(RUploadPointStatisticalDataD::getComputeDate,param.getTime())
.in(RUploadPointStatisticalDataD::getId,param.getList())
.isNotNull(RUploadPointStatisticalDataD::getComputeDate)
.list();
}
//未指定数据上送,则上送省级数据
else {
list = this.lambdaQuery()
.eq(RUploadPointStatisticalDataD::getStatisticalDate,param.getTime())
.eq(RUploadPointStatisticalDataD::getComputeDate,param.getTime())
.eq(RUploadPointStatisticalDataD::getUploadStatus,0)
.isNotNull(RUploadPointStatisticalDataD::getComputeDate)
.in(RUploadPointStatisticalDataD::getStatisticalLevel, Stream.of("3","4").collect(Collectors.toList()))
.list();
}

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

@@ -95,17 +95,14 @@ public class REvaluationDataServiceImpl extends ServiceImpl<RUploadEvaluationDat
//(预防之前上送过,修改数据后需要再次上送)
if (CollUtil.isNotEmpty(param.getList())){
list = this.lambdaQuery()
.eq(RUploadEvaluationDataD::getStatisticalDate,param.getTime())
.eq(RUploadEvaluationDataD::getComputeDate,param.getTime())
.in(RUploadEvaluationDataD::getId,param.getList())
.isNotNull(RUploadEvaluationDataD::getComputeDate)
.list();
}
//未指定数据上送,则上送省级数据(包含日、月数据)
else {
list = this.lambdaQuery()
.eq(RUploadEvaluationDataD::getStatisticalDate,param.getTime())
.eq(RUploadEvaluationDataD::getUploadStatus,0)
.isNotNull(RUploadEvaluationDataD::getComputeDate)
.eq(RUploadEvaluationDataD::getComputeDate,param.getTime())
.in(RUploadEvaluationDataD::getStatisticalLevel, Stream.of("3","4").collect(Collectors.toList()))
.list();
}

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

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