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

河北两级贯通接口调整

Browse Source
This commit is contained in:
cdf
2024-06-12 08:33:37 +08:00
parent 2e756e0e38
commit b13e0c22de
18 changed files with 487 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/dto/LineDevGetDTO.java
View File

@@ -96,4 +96,9 @@ public class LineDevGetDTO {
* oracle监测点id
*/
private Integer oracleLineId;
/**
* 接线方式 0.星型 1.星三角 2.三角
*/
private String wiringMethod;
}

13
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/impl/CommTerminalServiceImpl.java
View File

@@ -123,16 +123,22 @@ public class CommTerminalServiceImpl implements CommTerminalService {
//电压等级
// List<DictData> voltageDic = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.DEV_VOLTAGE.getCode()).getData();
//Map<String, DictData> mapVoltage = voltageDic.stream().collect(Collectors.toMap(DictData::getId, Function.identity()));
//接线方式
List<DictData> wireList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.DEV_CONNECT.getCode()).getData();
Map<String,DictData> wireMap = wireList.stream().collect(Collectors.toMap(DictData::getId,Function.identity()));
//监测点状态
DictData dictData = dicDataFeignClient.getDicDataByNameAndTypeName(DicDataTypeEnum.LINE_STATE.getName(), DicDataEnum.RUN.getName()).getData();
Map<String, List<Monitor>> map = new HashMap<>();
Map<String, List<Monitor>> finalMap;
if (deptGetLineParam.getSystemType() == 0 || deptGetLineParam.getSystemType() == 2) {
List<Monitor> monitorList = monitorMapper.selectList(new LambdaQueryWrapper<Monitor>()
.eq(Monitor::getStatus, DataStateEnum.ENABLE.getCode())
.eq(Objects.nonNull(deptGetLineParam.getIsUpToGrid()), Monitor::getIsUpToGrid, deptGetLineParam.getIsUpToGrid())
.eq(deptGetLineParam.getMonitorStateRunning(), Monitor::getMonitorState, dictData.getId()));
map = monitorList.stream().collect(Collectors.groupingBy(Monitor::getOrgId));
finalMap = monitorList.stream().collect(Collectors.groupingBy(Monitor::getOrgId));
}else {
finalMap = new HashMap<>();
}
//TODO 配网数据量巨大，暂时注释
/* Map<String, List<PmsMonitorBaseDTO>> mapPms = new HashMap<>();
@@ -141,7 +147,7 @@ public class CommTerminalServiceImpl implements CommTerminalService {
mapPms = pmsMonitorBaseDTOList.stream().collect(Collectors.groupingBy(PmsMonitorBaseDTO::getOrgId));
}
Map<String, List<PmsMonitorBaseDTO>> finalMapPms = mapPms;*/
Map<String, List<Monitor>> finalMap = map;
temDept.forEach(item -> {
DeptGetChildrenMoreDTO deptGetChildrenMoreDTO = new DeptGetChildrenMoreDTO();
deptGetChildrenMoreDTO.setUnitId(item.getUnitId());
@@ -172,6 +178,7 @@ public class CommTerminalServiceImpl implements CommTerminalService {
lineDevGetDTO.setIsUpToGrid(it.getIsUpToGrid());
lineDevGetDTO.setIsUploadHead(it.getIsUploadHead());
lineDevGetDTO.setMonitorUploadStatus(it.getMonitorUploadStatus());
lineDevGetDTO.setWiringMethod(wireMap.get(it.getTerminalWiringMethod()).getValue());
lineList.add(lineDevGetDTO);
});
}