From 48e602ce2527c31eb49fcbd1d6ac79bdd5ecf955 Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Tue, 27 Feb 2024 13:21:13 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=82=E5=9B=BD=E7=BD=91=E4=B8=8A=E9=80=81?= =?UTF-8?q?=E8=BF=90=E8=A1=8C=E7=8A=B6=E6=80=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gwPush/impl/MonitorSendServiceImpl.java | 57 ++++++++++--------- 1 file changed, 29 insertions(+), 28 deletions(-) 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 ebfd7e264..f0cfdc1a2 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 @@ -191,8 +191,8 @@ public class MonitorSendServiceImpl implements MonitorSendService { Map mapVoltage = voltage.stream().collect(Collectors.toMap(DictData::getId, Function.identity())); //运行状态 - List lineState = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.LINE_STATE.getCode()).getData(); - Map mapLineState = lineState.stream().collect(Collectors.toMap(DictData::getId, Function.identity())); +// List lineState = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.LINE_STATE.getCode()).getData(); +// Map mapLineState = lineState.stream().collect(Collectors.toMap(DictData::getId, Function.identity())); List info = new ArrayList<>(); WindSourceDto sendVO; @@ -216,11 +216,11 @@ public class MonitorSendServiceImpl implements MonitorSendService { sendVO.setFcId(monitor.getMonitorObjectId()); sendVO.setFcNo(monitor.getMonitorObjectId()); sendVO.setMonitorObjectType(monitor.getFieldStation()); - + sendVO.setRunStatus("20"); //运行状态 - if (mapLineState.containsKey(monitor.getMonitorState())) { - sendVO.setRunStatus(mapLineState.get(monitor.getMonitorState()).getValue()); - } +// if (mapLineState.containsKey(monitor.getMonitorState())) { +// sendVO.setRunStatus(mapLineState.get(monitor.getMonitorState()).getValue()); +// } sendVO.setCreateTime(monitor.getCreateTime()); sendVO.setUpdateTime(monitor.getUpdateTime()); @@ -275,11 +275,11 @@ public class MonitorSendServiceImpl implements MonitorSendService { sendVO.setFcId(monitor.getMonitorObjectId()); sendVO.setFcNo(monitor.getMonitorObjectId()); sendVO.setMonitorObjectType(monitor.getFieldStation()); - + sendVO.setRunStatus("20"); //运行状态 - if (mapLineState.containsKey(monitor.getMonitorState())) { - sendVO.setRunStatus(mapLineState.get(monitor.getMonitorState()).getValue()); - } +// if (mapLineState.containsKey(monitor.getMonitorState())) { +// sendVO.setRunStatus(mapLineState.get(monitor.getMonitorState()).getValue()); +// } sendVO.setCreateTime(monitor.getCreateTime()); sendVO.setUpdateTime(monitor.getUpdateTime()); @@ -335,9 +335,9 @@ public class MonitorSendServiceImpl implements MonitorSendService { //重要性等级 List importanceLevel = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.IMPORTANCE_LEVEL.getCode()).getData(); Map mapImportanceLevel = importanceLevel.stream().collect(Collectors.toMap(DictData::getId, Function.identity())); - //运行状态 - List lineState = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.LINE_STATE.getCode()).getData(); - Map mapLineState = lineState.stream().collect(Collectors.toMap(DictData::getId, Function.identity())); +// //运行状态 +// List lineState = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.LINE_STATE.getCode()).getData(); +// Map mapLineState = lineState.stream().collect(Collectors.toMap(DictData::getId, Function.identity())); List info = new ArrayList<>(); SensitiveUserDto sendVO; @@ -362,10 +362,11 @@ public class MonitorSendServiceImpl implements MonitorSendService { sendVO.setStationId(monitor.getPowerrId()); sendVO.setStationName(monitor.getPowerrName()); sendVO.setPubPrivFlag(monitor.getIsSpecialMonitor() + ""); + sendVO.setRunStatus("20"); //运行状态 - if (mapLineState.containsKey(monitor.getMonitorState())) { - sendVO.setRunStatus(mapLineState.get(monitor.getMonitorState()).getValue()); - } +// if (mapLineState.containsKey(monitor.getMonitorState())) { +// sendVO.setRunStatus(mapLineState.get(monitor.getMonitorState()).getValue()); +// } sendVO.setCreateTime(monitor.getCreateTime()); sendVO.setUpdateTime(monitor.getUpdateTime()); if (mapVoltage.containsKey(monitor.getVoltageLevel())) { @@ -434,8 +435,8 @@ public class MonitorSendServiceImpl implements MonitorSendService { List connetGroupWay = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.CONNET_GROUP_WAY.getCode()).getData(); Map mapConnetGroupWay = connetGroupWay.stream().collect(Collectors.toMap(DictData::getId, Function.identity())); //运行状态 - List lineState = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.LINE_STATE.getCode()).getData(); - Map mapLineState = lineState.stream().collect(Collectors.toMap(DictData::getId, Function.identity())); +// List lineState = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.LINE_STATE.getCode()).getData(); +// Map mapLineState = lineState.stream().collect(Collectors.toMap(DictData::getId, Function.identity())); //电压等级 List voltage = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.DEV_VOLTAGE.getCode()).getData(); Map mapVoltage = voltage.stream().collect(Collectors.toMap(DictData::getId, Function.identity())); @@ -483,11 +484,11 @@ public class MonitorSendServiceImpl implements MonitorSendService { sendVO.setId(monitor.getId()); sendVO.setMonitorName(monitor.getName()); sendVO.setMonitorNumber(monitor.getMonitorId()); - + sendVO.setRunStatus("20"); //运行状态 - if (mapLineState.containsKey(monitor.getMonitorState())) { - sendVO.setRunStatus(mapLineState.get(monitor.getMonitorState()).getValue()); - } +// if (mapLineState.containsKey(monitor.getMonitorState())) { +// sendVO.setRunStatus(mapLineState.get(monitor.getMonitorState()).getValue()); +// } // sendVO.setAuxiliarySubstationId(); @@ -520,8 +521,8 @@ public class MonitorSendServiceImpl implements MonitorSendService { List voltage = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.DEV_VOLTAGE.getCode()).getData(); Map mapVoltage = voltage.stream().collect(Collectors.toMap(DictData::getId, Function.identity())); //运行状态 - List lineState = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.LINE_STATE.getCode()).getData(); - Map mapLineState = lineState.stream().collect(Collectors.toMap(DictData::getId, Function.identity())); +// List lineState = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.LINE_STATE.getCode()).getData(); +// Map mapLineState = lineState.stream().collect(Collectors.toMap(DictData::getId, Function.identity())); //行业分类 List industryType = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.INDUSTRY_TYPE.getCode()).getData(); Map mapIndustryType = industryType.stream().collect(Collectors.toMap(DictData::getId, Function.identity())); @@ -558,11 +559,11 @@ public class MonitorSendServiceImpl implements MonitorSendService { // dto.setDeviceType(); // dto.setDeviceVoltageLevel(); // dto.setDeviceCapacity(); - + dto.setRunStatus("20"); //运行状态 - if (mapLineState.containsKey(monitor.getMonitorState())) { - dto.setRunStatus(mapLineState.get(monitor.getMonitorState()).getValue()); - } +// if (mapLineState.containsKey(monitor.getMonitorState())) { +// dto.setRunStatus(mapLineState.get(monitor.getMonitorState()).getValue()); +// } dto.setCreateTime(monitor.getCreateTime()); dto.setUpdateTime(monitor.getUpdateTime()); info.add(dto);