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);