From fb6ce3fc11cada7a83b799e045702f9891923d96 Mon Sep 17 00:00:00 2001 From: cdf <857448963@qq.com> Date: Mon, 13 May 2024 20:34:47 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AE=80=E5=8D=95=E7=9A=84=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E6=A0=91=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/TerminalTreeServiceImpl.java | 63 ++++++++++--------- 1 file changed, 32 insertions(+), 31 deletions(-) diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalTreeServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalTreeServiceImpl.java index ac8bff919..b8a24590b 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalTreeServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalTreeServiceImpl.java @@ -155,6 +155,7 @@ public class TerminalTreeServiceImpl implements TerminalTreeService { /** * 处理变电站 + * * @param targetData * @param childrenData * @param isLine @@ -174,7 +175,7 @@ public class TerminalTreeServiceImpl implements TerminalTreeService { } //变电站 targetData = targetData.stream().peek(terminalTree -> { - if(isLine){ + if (isLine) { //变电站集合 List terminalTrees = groupLine.get(terminalTree.getId()); @@ -184,10 +185,10 @@ public class TerminalTreeServiceImpl implements TerminalTreeService { return pid[LineBaseEnum.DEVICE_LEVEL.getCode()]; }).distinct().collect(Collectors.toList()).size(); - terminalTree.setName(terminalTree.getName()+"（"+size+"台装置）"); + terminalTree.setName(terminalTree.getName() + "（" + size + "台装置）"); terminalTree.setChildren(groupLine.get(terminalTree.getId())); - }else{ + } else { terminalTree.setChildren(groupLine.get(terminalTree.getId())); } }).collect(Collectors.toList()); @@ -234,31 +235,31 @@ public class TerminalTreeServiceImpl implements TerminalTreeService { deviceInfoParam.setServerName(ServerEnum.HARMONIC.getName()); List generalDeviceDTOList = generalDeviceService.getDeviceInfo(deviceInfoParam, Stream.of(0).collect(Collectors.toList()), Stream.of(1).collect(Collectors.toList())); - for(GeneralDeviceDTO generalDeviceDTO : generalDeviceDTOList){ - if(CollectionUtil.isEmpty(generalDeviceDTO.getLineIndexes())){ + for (GeneralDeviceDTO generalDeviceDTO : generalDeviceDTOList) { + if (CollectionUtil.isEmpty(generalDeviceDTO.getLineIndexes())) { continue; } // 通过供电公司索引查询省会 List children = new ArrayList<>(); - if(level == 4){ - List devList = lineMapper.selectList(new LambdaQueryWrapper().in(Line::getId,generalDeviceDTO.getDeviceIndexes())); - for(Line line: devList){ + if (level == 6) { + List busList = lineMapper.selectList(new LambdaQueryWrapper().in(Line::getId, generalDeviceDTO.getVoltageIndexes())); + Map map = busList.stream().collect(Collectors.toMap(Line::getId, Function.identity())); + List lineList = lineMapper.selectList(new LambdaQueryWrapper().in(Line::getId, generalDeviceDTO.getLineIndexes())); + for (Line line : lineList) { + TerminalSelectTreeVO terminalSelectTreeVO = new TerminalSelectTreeVO(); + terminalSelectTreeVO.setValue(line.getId()); + terminalSelectTreeVO.setLabel(map.get(line.getPid()).getName() + "_" + line.getName()); + children.add(terminalSelectTreeVO); + } + + } else { + List devList = lineMapper.selectList(new LambdaQueryWrapper().in(Line::getId, generalDeviceDTO.getDeviceIndexes())); + for (Line line : devList) { TerminalSelectTreeVO terminalSelectTreeVO = new TerminalSelectTreeVO(); terminalSelectTreeVO.setValue(line.getId()); terminalSelectTreeVO.setLabel(line.getName()); children.add(terminalSelectTreeVO); } - }else if(level == 6){ - List busList = lineMapper.selectList(new LambdaQueryWrapper().in(Line::getId,generalDeviceDTO.getVoltageIndexes())); - Map map = busList.stream().collect(Collectors.toMap(Line::getId, Function.identity())); - List lineList = lineMapper.selectList(new LambdaQueryWrapper().in(Line::getId,generalDeviceDTO.getLineIndexes())); - for(Line line: lineList){ - TerminalSelectTreeVO terminalSelectTreeVO = new TerminalSelectTreeVO(); - terminalSelectTreeVO.setValue(line.getId()); - terminalSelectTreeVO.setLabel(map.get(line.getPid()).getName()+"_"+line.getName()); - children.add(terminalSelectTreeVO); - } - } TerminalSelectTreeVO terminalSelectTreeVO = new TerminalSelectTreeVO(); terminalSelectTreeVO.setValue(generalDeviceDTO.getIndex()); @@ -298,10 +299,10 @@ public class TerminalTreeServiceImpl implements TerminalTreeService { if (CollectionUtil.isNotEmpty(allList)) { List projectList; List provinceList; - if(!"0".equals(areaId)){ - projectList=allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROJECT_LEVEL.getCode()) && lineMapper.selectProject(areaId).contains(item.getId())).collect(Collectors.toList()); + if (!"0".equals(areaId)) { + projectList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROJECT_LEVEL.getCode()) && lineMapper.selectProject(areaId).contains(item.getId())).collect(Collectors.toList()); provinceList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROVINCE_LEVEL.getCode()) && item.getName().equals(areaId)).collect(Collectors.toList()); - }else{ + } else { projectList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROJECT_LEVEL.getCode())).collect(Collectors.toList()); provinceList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROVINCE_LEVEL.getCode())).collect(Collectors.toList()); } @@ -380,10 +381,10 @@ public class TerminalTreeServiceImpl implements TerminalTreeService { if (CollectionUtil.isNotEmpty(allList)) { List projectList; List provinceList; - if(!"0".equals(areaId)){ - projectList=allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROJECT_LEVEL.getCode()) && lineMapper.selectProject(areaId).contains(item.getId())).collect(Collectors.toList()); + if (!"0".equals(areaId)) { + projectList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROJECT_LEVEL.getCode()) && lineMapper.selectProject(areaId).contains(item.getId())).collect(Collectors.toList()); provinceList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROVINCE_LEVEL.getCode()) && item.getName().equals(areaId)).collect(Collectors.toList()); - }else{ + } else { projectList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROJECT_LEVEL.getCode())).collect(Collectors.toList()); provinceList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROVINCE_LEVEL.getCode())).collect(Collectors.toList()); } @@ -453,10 +454,10 @@ public class TerminalTreeServiceImpl implements TerminalTreeService { if (CollectionUtil.isNotEmpty(allList)) { List projectList; List provinceList; - if(!"0".equals(areaId)){ - projectList=allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROJECT_LEVEL.getCode()) && lineMapper.selectProject(areaId).contains(item.getId())).collect(Collectors.toList()); + if (!"0".equals(areaId)) { + projectList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROJECT_LEVEL.getCode()) && lineMapper.selectProject(areaId).contains(item.getId())).collect(Collectors.toList()); provinceList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROVINCE_LEVEL.getCode()) && item.getName().equals(areaId)).collect(Collectors.toList()); - }else{ + } else { projectList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROJECT_LEVEL.getCode())).collect(Collectors.toList()); provinceList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROVINCE_LEVEL.getCode())).collect(Collectors.toList()); } @@ -534,10 +535,10 @@ public class TerminalTreeServiceImpl implements TerminalTreeService { if (CollectionUtil.isNotEmpty(allList)) { List projectList; List provinceList; - if(!"0".equals(areaId)){ - projectList=allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROJECT_LEVEL.getCode()) && lineMapper.selectProject(areaId).contains(item.getId())).collect(Collectors.toList()); + if (!"0".equals(areaId)) { + projectList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROJECT_LEVEL.getCode()) && lineMapper.selectProject(areaId).contains(item.getId())).collect(Collectors.toList()); provinceList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROVINCE_LEVEL.getCode()) && item.getName().equals(areaId)).collect(Collectors.toList()); - }else{ + } else { projectList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROJECT_LEVEL.getCode())).collect(Collectors.toList()); provinceList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROVINCE_LEVEL.getCode())).collect(Collectors.toList()); }