Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

1。国网上送运行状态调整

Browse Source
This commit is contained in:
wr
2024-02-27 13:21:13 +08:00
parent 0201cbe948
commit 48e602ce25
1 changed files with 29 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -191,8 +191,8 @@ public class MonitorSendServiceImpl implements MonitorSendService {
Map<String, DictData> mapVoltage = voltage.stream().collect(Collectors.toMap(DictData::getId, Function.identity())); Map<String, DictData> mapVoltage = voltage.stream().collect(Collectors.toMap(DictData::getId, Function.identity()));
//运行状态 //运行状态
List<DictData> lineState = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.LINE_STATE.getCode()).getData(); // List<DictData> lineState = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.LINE_STATE.getCode()).getData();
Map<String, DictData> mapLineState = lineState.stream().collect(Collectors.toMap(DictData::getId, Function.identity())); // Map<String, DictData> mapLineState = lineState.stream().collect(Collectors.toMap(DictData::getId, Function.identity()));
List<WindSourceDto> info = new ArrayList<>(); List<WindSourceDto> info = new ArrayList<>();
WindSourceDto sendVO; WindSourceDto sendVO;
@@ -216,11 +216,11 @@ public class MonitorSendServiceImpl implements MonitorSendService {
sendVO.setFcId(monitor.getMonitorObjectId()); sendVO.setFcId(monitor.getMonitorObjectId());
sendVO.setFcNo(monitor.getMonitorObjectId()); sendVO.setFcNo(monitor.getMonitorObjectId());
sendVO.setMonitorObjectType(monitor.getFieldStation()); sendVO.setMonitorObjectType(monitor.getFieldStation());
sendVO.setRunStatus("20");
//运行状态 //运行状态
if (mapLineState.containsKey(monitor.getMonitorState())) { // if (mapLineState.containsKey(monitor.getMonitorState())) {
sendVO.setRunStatus(mapLineState.get(monitor.getMonitorState()).getValue()); // sendVO.setRunStatus(mapLineState.get(monitor.getMonitorState()).getValue());
} // }
sendVO.setCreateTime(monitor.getCreateTime()); sendVO.setCreateTime(monitor.getCreateTime());
sendVO.setUpdateTime(monitor.getUpdateTime()); sendVO.setUpdateTime(monitor.getUpdateTime());
@@ -275,11 +275,11 @@ public class MonitorSendServiceImpl implements MonitorSendService {
sendVO.setFcId(monitor.getMonitorObjectId()); sendVO.setFcId(monitor.getMonitorObjectId());
sendVO.setFcNo(monitor.getMonitorObjectId()); sendVO.setFcNo(monitor.getMonitorObjectId());
sendVO.setMonitorObjectType(monitor.getFieldStation()); sendVO.setMonitorObjectType(monitor.getFieldStation());
sendVO.setRunStatus("20");
//运行状态 //运行状态
if (mapLineState.containsKey(monitor.getMonitorState())) { // if (mapLineState.containsKey(monitor.getMonitorState())) {
sendVO.setRunStatus(mapLineState.get(monitor.getMonitorState()).getValue()); // sendVO.setRunStatus(mapLineState.get(monitor.getMonitorState()).getValue());
} // }
sendVO.setCreateTime(monitor.getCreateTime()); sendVO.setCreateTime(monitor.getCreateTime());
sendVO.setUpdateTime(monitor.getUpdateTime()); sendVO.setUpdateTime(monitor.getUpdateTime());
@@ -335,9 +335,9 @@ public class MonitorSendServiceImpl implements MonitorSendService {
//重要性等级 //重要性等级
List<DictData> importanceLevel = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.IMPORTANCE_LEVEL.getCode()).getData(); List<DictData> importanceLevel = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.IMPORTANCE_LEVEL.getCode()).getData();
Map<String, DictData> mapImportanceLevel = importanceLevel.stream().collect(Collectors.toMap(DictData::getId, Function.identity())); Map<String, DictData> mapImportanceLevel = importanceLevel.stream().collect(Collectors.toMap(DictData::getId, Function.identity()));
//运行状态 // //运行状态
List<DictData> lineState = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.LINE_STATE.getCode()).getData(); // List<DictData> lineState = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.LINE_STATE.getCode()).getData();
Map<String, DictData> mapLineState = lineState.stream().collect(Collectors.toMap(DictData::getId, Function.identity())); // Map<String, DictData> mapLineState = lineState.stream().collect(Collectors.toMap(DictData::getId, Function.identity()));
List<SensitiveUserDto> info = new ArrayList<>(); List<SensitiveUserDto> info = new ArrayList<>();
SensitiveUserDto sendVO; SensitiveUserDto sendVO;
@@ -362,10 +362,11 @@ public class MonitorSendServiceImpl implements MonitorSendService {
sendVO.setStationId(monitor.getPowerrId()); sendVO.setStationId(monitor.getPowerrId());
sendVO.setStationName(monitor.getPowerrName()); sendVO.setStationName(monitor.getPowerrName());
sendVO.setPubPrivFlag(monitor.getIsSpecialMonitor() + ""); sendVO.setPubPrivFlag(monitor.getIsSpecialMonitor() + "");
sendVO.setRunStatus("20");
//运行状态 //运行状态
if (mapLineState.containsKey(monitor.getMonitorState())) { // if (mapLineState.containsKey(monitor.getMonitorState())) {
sendVO.setRunStatus(mapLineState.get(monitor.getMonitorState()).getValue()); // sendVO.setRunStatus(mapLineState.get(monitor.getMonitorState()).getValue());
} // }
sendVO.setCreateTime(monitor.getCreateTime()); sendVO.setCreateTime(monitor.getCreateTime());
sendVO.setUpdateTime(monitor.getUpdateTime()); sendVO.setUpdateTime(monitor.getUpdateTime());
if (mapVoltage.containsKey(monitor.getVoltageLevel())) { if (mapVoltage.containsKey(monitor.getVoltageLevel())) {
@@ -434,8 +435,8 @@ public class MonitorSendServiceImpl implements MonitorSendService {
List<DictData> connetGroupWay = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.CONNET_GROUP_WAY.getCode()).getData(); List<DictData> connetGroupWay = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.CONNET_GROUP_WAY.getCode()).getData();
Map<String, DictData> mapConnetGroupWay = connetGroupWay.stream().collect(Collectors.toMap(DictData::getId, Function.identity())); Map<String, DictData> mapConnetGroupWay = connetGroupWay.stream().collect(Collectors.toMap(DictData::getId, Function.identity()));
//运行状态 //运行状态
List<DictData> lineState = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.LINE_STATE.getCode()).getData(); // List<DictData> lineState = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.LINE_STATE.getCode()).getData();
Map<String, DictData> mapLineState = lineState.stream().collect(Collectors.toMap(DictData::getId, Function.identity())); // Map<String, DictData> mapLineState = lineState.stream().collect(Collectors.toMap(DictData::getId, Function.identity()));
//电压等级 //电压等级
List<DictData> voltage = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.DEV_VOLTAGE.getCode()).getData(); List<DictData> voltage = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.DEV_VOLTAGE.getCode()).getData();
Map<String, DictData> mapVoltage = voltage.stream().collect(Collectors.toMap(DictData::getId, Function.identity())); Map<String, DictData> mapVoltage = voltage.stream().collect(Collectors.toMap(DictData::getId, Function.identity()));
@@ -483,11 +484,11 @@ public class MonitorSendServiceImpl implements MonitorSendService {
sendVO.setId(monitor.getId()); sendVO.setId(monitor.getId());
sendVO.setMonitorName(monitor.getName()); sendVO.setMonitorName(monitor.getName());
sendVO.setMonitorNumber(monitor.getMonitorId()); sendVO.setMonitorNumber(monitor.getMonitorId());
sendVO.setRunStatus("20");
//运行状态 //运行状态
if (mapLineState.containsKey(monitor.getMonitorState())) { // if (mapLineState.containsKey(monitor.getMonitorState())) {
sendVO.setRunStatus(mapLineState.get(monitor.getMonitorState()).getValue()); // sendVO.setRunStatus(mapLineState.get(monitor.getMonitorState()).getValue());
} // }
// sendVO.setAuxiliarySubstationId(); // sendVO.setAuxiliarySubstationId();
@@ -520,8 +521,8 @@ public class MonitorSendServiceImpl implements MonitorSendService {
List<DictData> voltage = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.DEV_VOLTAGE.getCode()).getData(); List<DictData> voltage = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.DEV_VOLTAGE.getCode()).getData();
Map<String, DictData> mapVoltage = voltage.stream().collect(Collectors.toMap(DictData::getId, Function.identity())); Map<String, DictData> mapVoltage = voltage.stream().collect(Collectors.toMap(DictData::getId, Function.identity()));
//运行状态 //运行状态
List<DictData> lineState = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.LINE_STATE.getCode()).getData(); // List<DictData> lineState = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.LINE_STATE.getCode()).getData();
Map<String, DictData> mapLineState = lineState.stream().collect(Collectors.toMap(DictData::getId, Function.identity())); // Map<String, DictData> mapLineState = lineState.stream().collect(Collectors.toMap(DictData::getId, Function.identity()));
//行业分类 //行业分类
List<DictData> industryType = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.INDUSTRY_TYPE.getCode()).getData(); List<DictData> industryType = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.INDUSTRY_TYPE.getCode()).getData();
Map<String, DictData> mapIndustryType = industryType.stream().collect(Collectors.toMap(DictData::getId, Function.identity())); Map<String, DictData> mapIndustryType = industryType.stream().collect(Collectors.toMap(DictData::getId, Function.identity()));
@@ -558,11 +559,11 @@ public class MonitorSendServiceImpl implements MonitorSendService {
// dto.setDeviceType(); // dto.setDeviceType();
// dto.setDeviceVoltageLevel(); // dto.setDeviceVoltageLevel();
// dto.setDeviceCapacity(); // dto.setDeviceCapacity();
dto.setRunStatus("20");
//运行状态 //运行状态
if (mapLineState.containsKey(monitor.getMonitorState())) { // if (mapLineState.containsKey(monitor.getMonitorState())) {
dto.setRunStatus(mapLineState.get(monitor.getMonitorState()).getValue()); // dto.setRunStatus(mapLineState.get(monitor.getMonitorState()).getValue());
} // }
dto.setCreateTime(monitor.getCreateTime()); dto.setCreateTime(monitor.getCreateTime());
dto.setUpdateTime(monitor.getUpdateTime()); dto.setUpdateTime(monitor.getUpdateTime());
info.add(dto); info.add(dto);