From b0ef851479e322f0def52a3167a8452c76e20bf3 Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Wed, 19 Nov 2025 14:58:37 +0800 Subject: [PATCH] =?UTF-8?q?1.=E8=A7=A3=E5=86=B3=E8=A7=A3=E5=86=B3=E5=85=A8?= =?UTF-8?q?=E6=99=AF=E5=92=8C=E5=8F=B0=E8=B4=A6=E7=AE=A1=E7=90=86=EF=BC=8C?= =?UTF-8?q?=E7=BB=88=E7=AB=AF=E6=95=B0=E9=87=8F=E4=B8=8D=E4=B8=80=E8=87=B4?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/pq/service/impl/GridDiagramServiceImpl.java | 2 -- .../njcn/device/pq/service/impl/RunManageServiceImpl.java | 5 ----- .../njcn/device/common/service/GeneralDeviceService.java | 8 ++++---- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/GridDiagramServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/GridDiagramServiceImpl.java index 361d36630..a59140ade 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/GridDiagramServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/GridDiagramServiceImpl.java @@ -244,7 +244,6 @@ public class GridDiagramServiceImpl implements GridDiagramService { public GridDiagramVO getGridDiagramDev(GridDiagramParam param) { //获取电压等级 List dictDataList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.DEV_VOLTAGE_STAND.getCode()).getData(); - List v = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.PANORAMIC_VOLTAGE.getCode()).getData(); List voltageIds; //获取电压等级550 220 110 35 @@ -264,7 +263,6 @@ public class GridDiagramServiceImpl implements GridDiagramService { List data = deptFeignClient.getDirectSonSelf(param.getOrgId()).getData(); DeptGetLineParam deptGetLineParam = new DeptGetLineParam(); deptGetLineParam.setDeptId(param.getOrgId()); - deptGetLineParam.setLineRunFlag(0); List deptGetChildrenMoreDTOS = commTerminalService.deptGetLine(deptGetLineParam); diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/RunManageServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/RunManageServiceImpl.java index 970e06d72..eadfdd158 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/RunManageServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/RunManageServiceImpl.java @@ -133,11 +133,6 @@ public class RunManageServiceImpl implements RunManageService { DeviceInfoParam deviceInfoParam = new DeviceInfoParam(); BeanUtil.copyProperties(runManageParam, deviceInfoParam); deviceInfoParam.setServerName("pqs-common"); - if(CollUtil.isNotEmpty(runManageParam.getRunFlag())){ - if(runManageParam.getRunFlag().get(0)==0){ - deviceInfoParam.setLineRunFlag(0); - } - } List generalDeviceDTOList = generalDeviceService.getDeviceInfo(deviceInfoParam, runManageParam.getRunFlag(), Stream.of(1).collect(Collectors.toList())); if (CollectionUtils.isEmpty(generalDeviceDTOList)) { throw new BusinessException("当前部门没有装置台账"); diff --git a/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/common/service/GeneralDeviceService.java b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/common/service/GeneralDeviceService.java index 669cfdf38..5e2eae581 100644 --- a/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/common/service/GeneralDeviceService.java +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/common/service/GeneralDeviceService.java @@ -408,7 +408,7 @@ public class GeneralDeviceService { return generalDeviceDTO; } // 提取该部门及其子部门所有监测点id - List lineIds = deptLines.stream().map(DeptLine::getLineId).collect(Collectors.toList()); + List lineIds = deptLines.stream().map(DeptLine::getLineId).distinct().collect(Collectors.toList()); // 获取line详细数据 ：根据监测点id，获取所有监测点 联查 pq_line、pq_line_detail List lines = terminalBaseService.getLineByCondition(lineIds, deviceInfoParam); // 返回空数据 @@ -417,17 +417,17 @@ public class GeneralDeviceService { } //1.筛选出母线id，理论上监测点的pids中第六个id为母线id 联查： pq_line t1 ,pq_voltage t2 - List voltageIds=lines.stream().map(Line::getPid).collect(Collectors.toList()); + List voltageIds=lines.stream().map(Line::getPid).distinct().collect(Collectors.toList()); //再根据电压等级筛选合法母线信息 List voltages = terminalBaseService.getVoltageByCondition(voltageIds, deviceInfoParam.getScale()); //2.筛选出终端id，理论上监测点的pids中第五个id为终端id - List devIds=voltages.stream().map(Line::getPid).collect(Collectors.toList()); + List devIds=voltages.stream().map(Line::getPid).distinct().collect(Collectors.toList()); // 再根据终端条件筛选合法终端信息 联查：pq_line t1,pq_device t2 List devices = terminalBaseService.getDeviceByCondition(devIds, deviceType, deviceInfoParam.getManufacturer()); //3.筛选出变电站id，理论上监测点的pids中第四个id为变电站id 联查： pq_line t1 ,pq_substation t2 - List subIds=devices.stream().map(Line::getPid).collect(Collectors.toList()); + List subIds=devices.stream().map(Line::getPid).distinct().collect(Collectors.toList()); List sub = terminalBaseService.getSubByCondition(subIds, new ArrayList<>()); //筛选最终的数据