From 5c42afe87d91c198f37ab1c5e1e4f1c0ec6652af Mon Sep 17 00:00:00 2001 From: cdf <857448963@qq.com> Date: Wed, 13 Mar 2024 13:40:05 +0800 Subject: [PATCH] =?UTF-8?q?1.pms=E5=8F=B0=E8=B4=A6=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E4=B8=8A=E9=80=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pms/service/gwPush/impl/GwMonitorPushServiceImpl.java | 2 -- .../device/pms/service/gwPush/impl/MonitorSendServiceImpl.java | 3 +-- 2 files changed, 1 insertion(+), 4 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 e986a5527..ca507b290 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 @@ -310,8 +310,6 @@ public class GwMonitorPushServiceImpl implements GwMonitorPushService { List voltageDicList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.DEV_VOLTAGE.getCode()).getData(); Map voltageMap = voltageDicList.stream().collect(Collectors.toMap(DictData::getId, Function.identity())); - DictData monitorStateDic = dicDataFeignClient.getDicDataByNameAndTypeName(DicDataTypeEnum.LINE_STATE.getName(), DicDataEnum.RUN.getName()).getData(); - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); if(CollUtil.isEmpty(ids)){ diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/impl/MonitorSendServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/impl/MonitorSendServiceImpl.java index 7451bdd67..9ff0750dc 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/impl/MonitorSendServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/impl/MonitorSendServiceImpl.java @@ -105,9 +105,8 @@ public class MonitorSendServiceImpl implements MonitorSendService { //获取监测点信息 - lambdaQueryWrapper.in(StrUtil.isNotBlank(param.getMonitorTag()),Monitor::getMonitorTag, param.getMonitorTag()) + lambdaQueryWrapper .eq(Monitor::getIsUpToGrid,1) - //.ne(param.getFiy(),Monitor::getIsUploadHead,1) .in(CollUtil.isNotEmpty(param.getIds()),Monitor::getId, param.getIds()); List monitorList = monitorService.list(lambdaQueryWrapper);