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

1.调整pms国网主配网监测点功能

Browse Source
This commit is contained in:
雨木c
2024-02-26 16:08:12 +08:00
parent 337cadc6b8
commit ebc623ff1d
4 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,6 +29,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream;
/** /**
* *
@@ -115,7 +116,7 @@ public class PqTypicalSourceCreatePOServiceImpl extends ServiceImpl<PqTypicalSou
list = this.lambdaQuery() list = this.lambdaQuery()
.eq(PqTypicalSourceCreatePO::getStatisticalDate,uploadParam.getTime()) .eq(PqTypicalSourceCreatePO::getStatisticalDate,uploadParam.getTime())
.eq(PqTypicalSourceCreatePO::getIsUploadHead,0) .eq(PqTypicalSourceCreatePO::getIsUploadHead,0)
.eq(PqTypicalSourceCreatePO::getStatisticalLevel,"3") .in(PqTypicalSourceCreatePO::getStatisticalLevel, Stream.of("3","4").collect(Collectors.toList()))
.list(); .list();
} }
List<PqTypicalSourceCreateDTO> dtoList = BeanUtil.copyToList(list, PqTypicalSourceCreateDTO.class); List<PqTypicalSourceCreateDTO> dtoList = BeanUtil.copyToList(list, PqTypicalSourceCreateDTO.class);

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

@@ -33,6 +33,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream;
/** /**
* @author xuyang * @author xuyang
@@ -77,7 +78,7 @@ public class PointStatisticalDataServiceImpl extends ServiceImpl<RUploadPointSta
list = this.lambdaQuery() list = this.lambdaQuery()
.eq(RUploadPointStatisticalDataD::getStatisticalDate,param.getTime()) .eq(RUploadPointStatisticalDataD::getStatisticalDate,param.getTime())
.eq(RUploadPointStatisticalDataD::getUploadStatus,0) .eq(RUploadPointStatisticalDataD::getUploadStatus,0)
.eq(RUploadPointStatisticalDataD::getStatisticalLevel,"3") .in(RUploadPointStatisticalDataD::getStatisticalLevel, Stream.of("3","4").collect(Collectors.toList()))
.list(); .list();
} }
List<MonitorStatisticalDTO> dtoList = BeanUtil.copyToList(list, MonitorStatisticalDTO.class); List<MonitorStatisticalDTO> dtoList = BeanUtil.copyToList(list, MonitorStatisticalDTO.class);

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

@@ -36,6 +36,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream;
/** /**
* <p> * <p>
@@ -101,7 +102,7 @@ public class REvaluationDataServiceImpl extends ServiceImpl<RUploadEvaluationDat
list = this.lambdaQuery() list = this.lambdaQuery()
.eq(RUploadEvaluationDataD::getStatisticalDate,param.getTime()) .eq(RUploadEvaluationDataD::getStatisticalDate,param.getTime())
.eq(RUploadEvaluationDataD::getUploadStatus,0) .eq(RUploadEvaluationDataD::getUploadStatus,0)
.eq(RUploadEvaluationDataD::getStatisticalLevel,"3") .in(RUploadEvaluationDataD::getStatisticalLevel, Stream.of("3","4").collect(Collectors.toList()))
.list(); .list();
} }
List<PqEvaluationCreateDTO> dtoList = BeanUtil.copyToList(list, PqEvaluationCreateDTO.class); List<PqEvaluationCreateDTO> dtoList = BeanUtil.copyToList(list, PqEvaluationCreateDTO.class);

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

@@ -83,7 +83,7 @@ public class RSubstationStatisticalDataServiceImpl extends ServiceImpl<RUploadSu
.eq(RUploadSubstationStatisticalDataD::getStatisticalDate,param.getTime()) .eq(RUploadSubstationStatisticalDataD::getStatisticalDate,param.getTime())
.eq(RUploadSubstationStatisticalDataD::getUploadStatus,0) .eq(RUploadSubstationStatisticalDataD::getUploadStatus,0)
.eq(RUploadSubstationStatisticalDataD::getCityId,"") .eq(RUploadSubstationStatisticalDataD::getCityId,"")
.eq(RUploadSubstationStatisticalDataD::getCountyId,"") //.eq(RUploadSubstationStatisticalDataD::getCountyId,"")
.list(); .list();
} }
//处理时间 //处理时间