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

台账调整

Browse Source
This commit is contained in:
chendaofei
2025-04-17 16:06:33 +08:00
parent 8306361df0
commit c31c36e90e
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalTreeServiceImpl.java
View File

@@ -265,12 +265,12 @@ public class TerminalTreeServiceImpl implements TerminalTreeService {
tree.setPid(userLedgerVO.getStationId()); tree.setPid(userLedgerVO.getStationId());
tree.setId(userLedgerVO.getId()); tree.setId(userLedgerVO.getId());
tree.setChildren(monitorList); tree.setChildren(monitorList);
int devSize = (int) monitorList.stream().map(x -> { /* int devSize = (int) monitorList.stream().map(x -> {
// 获取父id字符串，通过 逗号 分割 成一个数组 // 获取父id字符串，通过 逗号 分割 成一个数组
String[] pid = x.getPids().split(StrUtil.COMMA); String[] pid = x.getPids().split(StrUtil.COMMA);
return pid[LineBaseEnum.DEVICE_LEVEL.getCode()]; return pid[LineBaseEnum.DEVICE_LEVEL.getCode()];
}).distinct().count(); }).distinct().count();*/
tree.setName(userLedgerVO.getProjectName() + "（" + devSize + "台装置）"); tree.setName(userLedgerVO.getProjectName());
temList.add(tree); temList.add(tree);
}); });
@@ -334,18 +334,17 @@ public class TerminalTreeServiceImpl implements TerminalTreeService {
} }
if (isLine) { if (isLine) {
//变电站集合 //变电站集合
if(userLineMap.containsKey(terminalTree.getId())){
List<TerminalTree> devList = userLineMap.get(terminalTree.getId());
terminalTrees.addAll(devList);
}
int size = (int) terminalTrees.stream().map(x -> { int size = (int) terminalTrees.stream().map(x -> {
// 获取父id字符串，通过 逗号 分割 成一个数组 // 获取父id字符串，通过 逗号 分割 成一个数组
String[] pid = x.getPids().split(StrUtil.COMMA); String[] pid = x.getPids().split(StrUtil.COMMA);
return pid[LineBaseEnum.DEVICE_LEVEL.getCode()]; return pid[LineBaseEnum.DEVICE_LEVEL.getCode()];
}).distinct().count(); }).distinct().count();
terminalTree.setName(terminalTree.getName() + "（" + size + "台装置）"); terminalTree.setName(terminalTree.getName() + "（" + size + "台装置）");
if(userLineMap.containsKey(terminalTree.getId())){
List<TerminalTree> devList = userLineMap.get(terminalTree.getId());
terminalTrees.addAll(devList);
}
terminalTree.setChildren(terminalTrees); terminalTree.setChildren(terminalTrees);
} else { } else {
terminalTree.setChildren(terminalTrees); terminalTree.setChildren(terminalTrees);