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:
cdf
2024-03-13 13:40:05 +08:00
parent f6f570ee83
commit 5c42afe87d
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -310,8 +310,6 @@ public class GwMonitorPushServiceImpl implements GwMonitorPushService {
List<DictData> voltageDicList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.DEV_VOLTAGE.getCode()).getData(); List<DictData> voltageDicList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.DEV_VOLTAGE.getCode()).getData();
Map<String, DictData> voltageMap = voltageDicList.stream().collect(Collectors.toMap(DictData::getId, Function.identity())); Map<String, DictData> voltageMap = voltageDicList.stream().collect(Collectors.toMap(DictData::getId, Function.identity()));
DictData monitorStateDic = dicDataFeignClient.getDicDataByNameAndTypeName(DicDataTypeEnum.LINE_STATE.getName(), DicDataEnum.RUN.getName()).getData();
LambdaQueryWrapper<Monitor> lambdaQueryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<Monitor> lambdaQueryWrapper = new LambdaQueryWrapper<>();
if(CollUtil.isEmpty(ids)){ if(CollUtil.isEmpty(ids)){

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

@@ -105,9 +105,8 @@ public class MonitorSendServiceImpl implements MonitorSendService {
//获取监测点信息 //获取监测点信息
lambdaQueryWrapper.in(StrUtil.isNotBlank(param.getMonitorTag()),Monitor::getMonitorTag, param.getMonitorTag()) lambdaQueryWrapper
.eq(Monitor::getIsUpToGrid,1) .eq(Monitor::getIsUpToGrid,1)
//.ne(param.getFiy(),Monitor::getIsUploadHead,1)
.in(CollUtil.isNotEmpty(param.getIds()),Monitor::getId, param.getIds()); .in(CollUtil.isNotEmpty(param.getIds()),Monitor::getId, param.getIds());
List<Monitor> monitorList = monitorService.list(lambdaQueryWrapper); List<Monitor> monitorList = monitorService.list(lambdaQueryWrapper);