From 856042feee1e7b30956a1c357edbb5773a238d27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com> Date: Mon, 26 Feb 2024 20:05:44 +0800 Subject: [PATCH] =?UTF-8?q?1.=E8=B0=83=E6=95=B4pms=E5=9B=BD=E7=BD=91?= =?UTF-8?q?=E7=9B=91=E6=B5=8B=E7=82=B9=E5=8F=B0=E8=B4=A6=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/gwPush/impl/GwMonitorPushServiceImpl.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/impl/GwMonitorPushServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/impl/GwMonitorPushServiceImpl.java index 71a49b303..3ae8d66e7 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/impl/GwMonitorPushServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/impl/GwMonitorPushServiceImpl.java @@ -109,7 +109,7 @@ public class GwMonitorPushServiceImpl implements GwMonitorPushService { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); 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); }else { lambdaQueryWrapper.in(Monitor::getId, ids).eq(Monitor::getStatus, DataStateEnum.ENABLE.getCode()); @@ -254,6 +254,9 @@ public class GwMonitorPushServiceImpl implements GwMonitorPushService { + + + if(pushResult.size()>100){ List> pushMonitorDTOList = ListUtil.split(pushResult,100); @@ -318,10 +321,10 @@ public class GwMonitorPushServiceImpl implements GwMonitorPushService { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); 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); }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 monitorList = monitorService.list(lambdaQueryWrapper);