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:
雨木c
2023-12-29 13:49:05 +08:00
parent 1188c0fb48
commit fa2d0f0db4
1 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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