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:40:58 +08:00
parent 2a8ae489be
commit 73514eecf5
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -265,12 +265,14 @@ public class TerminalTreeServiceImpl implements TerminalTreeService {
tree.setPid(userLedgerVO.getStationId());
tree.setId(userLedgerVO.getId());
tree.setChildren(monitorList);
/* int devSize = (int) monitorList.stream().map(x -> {
int devSize = (int) monitorList.stream().map(x -> {
// 获取父id字符串，通过 逗号 分割 成一个数组
String[] pid = x.getPids().split(StrUtil.COMMA);
return pid[LineBaseEnum.DEVICE_LEVEL.getCode()];
}).distinct().count();*/
}).distinct().count();
tree.setName(userLedgerVO.getProjectName());
//特殊处理，用户层级下面的装置数量临时存到pids字段。
tree.setPids(String.valueOf(devSize));
temList.add(tree);
});
@@ -334,17 +336,20 @@ public class TerminalTreeServiceImpl implements TerminalTreeService {
}
if (isLine) {
//变电站集合
if(userLineMap.containsKey(terminalTree.getId())){
List<TerminalTree> devList = userLineMap.get(terminalTree.getId());
terminalTrees.addAll(devList);
}
int size = (int) terminalTrees.stream().map(x -> {
// 获取父id字符串，通过 逗号 分割 成一个数组
String[] pid = x.getPids().split(StrUtil.COMMA);
return pid[LineBaseEnum.DEVICE_LEVEL.getCode()];
}).distinct().count();
terminalTree.setName(terminalTree.getName() + "（" + size + "台装置）");
int devSize = 0;
if(userLineMap.containsKey(terminalTree.getId())){
List<TerminalTree> userList = userLineMap.get(terminalTree.getId());
devSize= (int) userList.stream().mapToDouble(it->Integer.parseInt(it.getPids())).sum();
terminalTrees.addAll(userList);
}
int sumDev = size+devSize;
terminalTree.setName(terminalTree.getName() + "（" +sumDev+ "台装置）");
terminalTree.setChildren(terminalTrees);
} else {
terminalTree.setChildren(terminalTrees);