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 20:05:44 +08:00
parent 6ffcd6e092
commit 856042feee
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/impl/GwMonitorPushServiceImpl.java
View File

@@ -109,7 +109,7 @@ public class GwMonitorPushServiceImpl implements GwMonitorPushService {
LambdaQueryWrapper<Monitor> lambdaQueryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<Monitor> lambdaQueryWrapper = new LambdaQueryWrapper<>();
if(CollUtil.isEmpty(ids)){ if(CollUtil.isEmpty(ids)){
lambdaQueryWrapper.in(Monitor::getMonitorUploadStatus, Stream.of(0,3).collect(Collectors.toList())).eq(Monitor::getMonitorState,monitorStateDic.getId()) lambdaQueryWrapper.eq(Monitor::getMonitorState,monitorStateDic.getId())
.eq(Monitor::getStatus, DataStateEnum.ENABLE.getCode()).eq(Monitor::getIsUpToGrid,1); .eq(Monitor::getStatus, DataStateEnum.ENABLE.getCode()).eq(Monitor::getIsUpToGrid,1);
}else { }else {
lambdaQueryWrapper.in(Monitor::getId, ids).eq(Monitor::getStatus, DataStateEnum.ENABLE.getCode()); lambdaQueryWrapper.in(Monitor::getId, ids).eq(Monitor::getStatus, DataStateEnum.ENABLE.getCode());
@@ -254,6 +254,9 @@ public class GwMonitorPushServiceImpl implements GwMonitorPushService {
if(pushResult.size()>100){ if(pushResult.size()>100){
List<List<PushMonitorDTO>> pushMonitorDTOList = ListUtil.split(pushResult,100); List<List<PushMonitorDTO>> pushMonitorDTOList = ListUtil.split(pushResult,100);
@@ -318,10 +321,10 @@ public class GwMonitorPushServiceImpl implements GwMonitorPushService {
LambdaQueryWrapper<Monitor> lambdaQueryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<Monitor> lambdaQueryWrapper = new LambdaQueryWrapper<>();
if(CollUtil.isEmpty(ids)){ if(CollUtil.isEmpty(ids)){
lambdaQueryWrapper.in(Monitor::getMonitorUploadStatus, Stream.of(0,3).collect(Collectors.toList())).eq(Monitor::getMonitorState,monitorStateDic.getId()) lambdaQueryWrapper.eq(Monitor::getMonitorState,monitorStateDic.getId())
.eq(Monitor::getStatus, DataStateEnum.ENABLE.getCode()).eq(Monitor::getIsUpToGrid,1); .eq(Monitor::getStatus, DataStateEnum.ENABLE.getCode()).eq(Monitor::getIsUpToGrid,1);
}else { }else {
lambdaQueryWrapper.in(Monitor::getId, ids).eq(Monitor::getStatus, DataStateEnum.ENABLE.getCode()); lambdaQueryWrapper.in(Monitor::getId, ids).eq(Monitor::getMonitorState,monitorStateDic.getId()).eq(Monitor::getIsUpToGrid,1).eq(Monitor::getStatus, DataStateEnum.ENABLE.getCode());
} }
List<Monitor> monitorList = monitorService.list(lambdaQueryWrapper); List<Monitor> monitorList = monitorService.list(lambdaQueryWrapper);