From 3f98482833f28deb7bd086ee64ff72ce7493ee36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com> Date: Wed, 28 Feb 2024 09:05:42 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pms/service/majornetwork/impl/MonitorServiceImpl.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java index 57e0e6dde..b4206c03b 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java @@ -36,7 +36,6 @@ import com.njcn.device.pms.pojo.vo.MonitorVO; import com.njcn.device.pms.pojo.vo.PmsMonitorVO; import com.njcn.device.pms.service.majornetwork.IDistributionMonitorService; import com.njcn.device.pms.service.majornetwork.IMonitorService; -import com.njcn.device.pms.service.majornetwork.ITractionStationService; import com.njcn.device.pq.pojo.bo.excel.OracleTerminalExcel; import com.njcn.device.pq.pojo.po.LineBak; import com.njcn.poi.excel.ExcelUtil; @@ -53,7 +52,6 @@ import com.njcn.system.enums.SystemResponseEnum; import com.njcn.system.pojo.po.DictData; import com.njcn.user.pojo.dto.DeptDTO; import com.njcn.user.pojo.po.Dept; -import com.njcn.user.pojo.vo.DeptTreeVO; import com.njcn.web.factory.PageFactory; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -587,9 +585,9 @@ public class MonitorServiceImpl extends ServiceImpl impl List deptList = deptFeignClient.getAllDept().getData(); List monitorList = this.lambdaQuery().select(Monitor::getOrgId).eq(Monitor::getMonitorState,dictData.getId()).list().stream().map(Monitor::getOrgId).distinct().collect(Collectors.toList()); List deptTem = deptList.stream().filter(it->monitorList.contains(it.getCode())).collect(Collectors.toList()); - - - return deptTem.stream().map(Dept::getId).collect(Collectors.toList()); + List resultDeptId = deptTem.stream().map(item->item.getPids().split(",")).flatMap(Arrays::stream).distinct().collect(Collectors.toList()); + resultDeptId.addAll(deptTem.stream().map(Dept::getId).collect(Collectors.toList())); + return resultDeptId; }