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 d403ea967..6e2643587 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 @@ -93,8 +93,8 @@ public class GwMonitorPushServiceImpl implements GwMonitorPushService { Map statusMap = statusDicList.stream().collect(Collectors.toMap(DictData::getId, Function.identity())); //电压互感类型 - List tranDicList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.VOLTAGE_TRANSFORMER.getCode()).getData(); - Map tranMap = tranDicList.stream().collect(Collectors.toMap(DictData::getId, Function.identity())); + //List tranDicList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.VOLTAGE_TRANSFORMER.getCode()).getData(); + //Map tranMap = tranDicList.stream().collect(Collectors.toMap(DictData::getId, Function.identity())); DictData monitorStateDic = dicDataFeignClient.getDicDataByNameAndTypeName(DicDataTypeEnum.LINE_STATE.getName(), DicDataEnum.RUN.getName()).getData(); @@ -201,30 +201,25 @@ public class GwMonitorPushServiceImpl implements GwMonitorPushService { - if (tranMap.containsKey(item.getPotentialTransFormerType())) { + /* if (tranMap.containsKey(item.getPotentialTransFormerType())) { pushMonitorDTO.setEvtType(tranMap.get(item.getPotentialTransFormerType()).getValue()); - } + }*/ - if (tranMap.containsKey(item.getPotentialTransFormerType())) { - pushMonitorDTO.setEvtType(tranMap.get(item.getPotentialTransFormerType()).getValue()); - } - - - if (StrUtil.isNotBlank(item.getOperationId())) { + /*if (StrUtil.isNotBlank(item.getOperationId())) { pushMonitorDTO.setMaintOrg(item.getOperationId()); - } + }*/ if (Objects.nonNull(item.getStatisticalInterval())) { pushMonitorDTO.setStatisticalInterval(item.getStatisticalInterval().toString()); } pushMonitorDTO.setMonitorTag(objTagMap.get(item.getMonitorTag()).getValue()); - if (StrUtil.isNotBlank(item.getMonitorObjectId())) { + /* if (StrUtil.isNotBlank(item.getMonitorObjectId())) { pushMonitorDTO.setMonitorObjId(item.getMonitorObjectId()); - } + }*/ pushResult.add(pushMonitorDTO); } @@ -317,7 +312,7 @@ public class GwMonitorPushServiceImpl implements GwMonitorPushService { for (Monitor monitor : monitorList) { MonitorLimitDTO monitorLimitDTO = new MonitorLimitDTO(); monitorLimitDTO.setId(monitor.getId()); - monitorLimitDTO.setOcDate(new Date()); + //monitorLimitDTO.setOcDate(new Date()); monitorLimitDTO.setMonitorId(monitor.getId()); monitorLimitDTO.setPt((int) (monitor.getPt1() /monitor.getPt2()));