From 12939830e0b1279bcbbb539edca7fb20ad7432be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com> Date: Tue, 31 Jan 2023 11:37:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=90=88=E5=B9=B6=E7=BB=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../harmonic/pojo/vo/RStatOrgIndexVO.java | 2 +- .../distribution/PwOverviewController.java | 1 - .../impl/PwRStatOrgServiceImpl.java | 1 - .../impl/RStatLoadTypeServiceImpl.java | 69 ++++++++++++++----- .../RStatOrgPvPowerQualityService.java | 1 - .../impl/PermeabilityServiceImpl.java | 7 +- .../impl/RMpEmissionMServiceImpl.java | 7 +- .../impl/RMpInfluenceMServiceImpl.java | 7 +- .../impl/RMpWpPowerDetailMServiceImpl.java | 9 +-- .../RStatOrgPvPowerQualityServiceImpl.java | 17 ++--- .../impl/StreamReverseServiceImpl.java | 7 +- .../WindFarmIndexOverviewServiceImpl.java | 7 +- 12 files changed, 83 insertions(+), 52 deletions(-) diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatOrgIndexVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatOrgIndexVO.java index 6c4b01171..f4614763d 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatOrgIndexVO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatOrgIndexVO.java @@ -7,7 +7,7 @@ import lombok.EqualsAndHashCode; /** *

- * + * *

* * @author rui.wu diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/distribution/PwOverviewController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/distribution/PwOverviewController.java index 9a307a063..af5c75fd0 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/distribution/PwOverviewController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/distribution/PwOverviewController.java @@ -22,7 +22,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import java.util.List; -import java.util.Map; /** * <分布式光伏概览> diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/distribution/impl/PwRStatOrgServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/distribution/impl/PwRStatOrgServiceImpl.java index 5f4446973..64afd63ff 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/distribution/impl/PwRStatOrgServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/distribution/impl/PwRStatOrgServiceImpl.java @@ -21,7 +21,6 @@ import com.njcn.system.enums.DicDataTypeEnum; import com.njcn.system.pojo.po.DictData; import com.njcn.user.api.DeptFeignClient; import com.njcn.user.pojo.dto.DeptDTO; -import com.njcn.web.utils.RequestUtil; import com.njcn.web.utils.WebUtil; import lombok.RequiredArgsConstructor; import org.apache.commons.compress.utils.Lists; diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatLoadTypeServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatLoadTypeServiceImpl.java index 81dd72e2e..07461303a 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatLoadTypeServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatLoadTypeServiceImpl.java @@ -10,6 +10,7 @@ import com.njcn.harmonic.mapper.majornetwork.RStatLoadTypeYMapper; import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam; import com.njcn.harmonic.pojo.po.*; import com.njcn.harmonic.pojo.vo.RArrayVO; +import com.njcn.harmonic.pojo.vo.RStatHarmonicMVO; import com.njcn.harmonic.pojo.vo.RStatLoadTypeVO; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.harmonic.service.majornetwork.RStatLoadTypeService; @@ -58,7 +59,8 @@ public class RStatLoadTypeServiceImpl extends ServiceImpl data1 = dicDataFeignClient.getDicDataByTypeCode( DicDataTypeEnum.MONITORING_LABELS.getCode()).getData(); - List dictData = data1.stream().filter(dictdatas -> dictdatas.getLevel() == 1).collect(Collectors.toList()); + List dictData = data1.stream().filter(labels -> labels.getLevel() == 1).collect(Collectors.toList()); + dictData.sort(Comparator.comparing(r -> r.getSort())); //初始化对象 List info = new ArrayList<>(); @@ -85,7 +87,9 @@ public class RStatLoadTypeServiceImpl extends ServiceImpl> map = temp + .stream().collect(Collectors.groupingBy(RStatLoadTypeVO::getOrgNo)); if (CollectionUtil.isNotEmpty(temp)) { // 匹配单位名称 for (DeptDTO dto : data) { @@ -96,9 +100,7 @@ public class RStatLoadTypeServiceImpl extends ServiceImpl> map = temp - .stream().collect(Collectors.groupingBy(RStatLoadTypeVO::getOrgNo)); + map.forEach((key, value) -> { RArrayVO arrayVO = new RArrayVO(); arrayVO.setRowName(value.get(0).getOrgName()); @@ -122,27 +124,58 @@ public class RStatLoadTypeServiceImpl extends ServiceImpl r.getSort())); arrayVO.setColumns(value); info.add(arrayVO); }); } + //处理主节点不存在的集合 + List notMeasurementList = data.stream().filter(r -> !map.containsKey(r.getCode())) + .collect(Collectors.toList()); + RArrayVO arrayVO; + List loadTypeVOS; + for (DeptDTO deptDTO : notMeasurementList) { + arrayVO= new RArrayVO(); + arrayVO.setRowName(deptDTO.getName()); + arrayVO.setSort(deptDTO.getSort()); + loadTypeVOS=new ArrayList<>(); + for (DictData dict : dictData) { + RStatLoadTypeVO vo = new RStatLoadTypeVO(); + vo.setSort(dict.getSort()); + vo.setOrgNo(deptDTO.getCode()); + vo.setOrgName(deptDTO.getName()); + set(loadTypeVOS, dict, vo); + } + loadTypeVOS.sort(Comparator.comparing(r -> r.getSort())); + arrayVO.setColumns(loadTypeVOS); + info.add(arrayVO); + } info.sort(Comparator.comparing(r -> r.getSort())); } return info; } + + /** + * 属性赋值 + * @param value + * @param data4 + * @param vo + */ + private void set(List value, DictData data4, RStatLoadTypeVO vo) { + vo.setLoadType(data4.getId()); + vo.setLoadName(data4.getName()); + vo.setVAverage(0.0f); + vo.setVAccrued(0.0f); + vo.setIAverage(0.0f); + vo.setIAccrued(0.0f); + vo.setUnbalanceAverage(0.0f); + vo.setUnbalanceAccrued(0.0f); + vo.setINegAverage(0.0f); + vo.setINegAccrued(0.0f); + vo.setFlickerAverage(0.0f); + vo.setFlickerAccrued(0.0f); + value.add(vo); + } } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/RStatOrgPvPowerQualityService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/RStatOrgPvPowerQualityService.java index b35b6855f..eb05ea264 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/RStatOrgPvPowerQualityService.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/RStatOrgPvPowerQualityService.java @@ -10,7 +10,6 @@ import com.njcn.harmonic.pojo.vo.RStatOrgPvDetailVO; import com.njcn.harmonic.pojo.vo.RStatOrgPvPowerStreamVO; import java.util.List; -import java.util.Map; /** * 分布式光伏_台区电能质量明细 diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/PermeabilityServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/PermeabilityServiceImpl.java index cd4cc5c7e..3e2eee77c 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/PermeabilityServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/PermeabilityServiceImpl.java @@ -9,6 +9,7 @@ import com.njcn.system.api.DicDataFeignClient; import com.njcn.system.enums.DicDataTypeEnum; import com.njcn.system.pojo.po.DictData; import com.njcn.user.api.DeptFeignClient; +import com.njcn.user.pojo.dto.DeptDTO; import com.njcn.user.pojo.po.Dept; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -51,10 +52,10 @@ public class PermeabilityServiceImpl implements PermeabilityService { //获取部门信息 // List data = deptFeignClient.getDeptDescendantIndexes(id, WebUtil.filterDeptType()).getData(); - List data = deptFeignClient.getDirectSonSelf(id).getData(); //获取当前部门和子部门信息 + List data = deptFeignClient.getDepSonDetailByDeptId(id).getData(); //获取当前部门和子部门信息 //剔除本部 - Map deptMap = data.stream().filter(r-> !r.getId().equals(id)).collect(Collectors.toMap(Dept::getCode, dept -> dept)); - List deptCodes = data.stream().filter(r-> !r.getId().equals(id)).map(Dept::getCode).collect(Collectors.toList()); + Map deptMap = data.stream().collect(Collectors.toMap(DeptDTO::getCode, dept -> dept)); + List deptCodes = data.stream().map(DeptDTO::getCode).collect(Collectors.toList()); //获取各渗透率字典 List rateList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.PERMEABILITY_TYPE.getCode()).getData(); //将渗透率字典转换为查询条件 diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/RMpEmissionMServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/RMpEmissionMServiceImpl.java index ebaf650b6..d0059b0be 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/RMpEmissionMServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/RMpEmissionMServiceImpl.java @@ -20,6 +20,7 @@ import com.njcn.harmonic.service.specialanalysis.RMpEmissionIExcessRateMService; import com.njcn.harmonic.service.specialanalysis.RMpEmissionIMService; import com.njcn.harmonic.service.specialanalysis.RMpEmissionMService; import com.njcn.user.api.DeptFeignClient; +import com.njcn.user.pojo.dto.DeptDTO; import com.njcn.user.pojo.po.Dept; import lombok.RequiredArgsConstructor; import org.apache.commons.lang.StringUtils; @@ -67,10 +68,10 @@ public class RMpEmissionMServiceImpl extends ServiceImpl data = deptFeignClient.getDirectSonSelf(id).getData(); + List data = deptFeignClient.getDepSonDetailByDeptId(id).getData(); //剔除本部门 - Map deptMap = data.stream().filter(r-> !r.getId().equals(id)).collect(Collectors.toMap(Dept::getCode, dept -> dept)); - List deptCodes = data.stream().filter(r-> !r.getId().equals(id)).map(Dept::getCode).collect(Collectors.toList()); + Map deptMap = data.stream().collect(Collectors.toMap(DeptDTO::getCode, dept -> dept)); + List deptCodes = data.stream().map(DeptDTO::getCode).collect(Collectors.toList()); //查询风电场信息 // PmsMonitorParam pmsMonitorParam = new PmsMonitorParam(); diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/RMpInfluenceMServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/RMpInfluenceMServiceImpl.java index 9e5141aae..f4da1cbdc 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/RMpInfluenceMServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/RMpInfluenceMServiceImpl.java @@ -21,6 +21,7 @@ import com.njcn.harmonic.service.specialanalysis.RMpInfluenceMService; import com.njcn.harmonic.service.specialanalysis.RMpInfluenceVExcessRateMService; import com.njcn.harmonic.service.specialanalysis.RMpInfluenceVMService; import com.njcn.user.api.DeptFeignClient; +import com.njcn.user.pojo.dto.DeptDTO; import com.njcn.user.pojo.po.Dept; import lombok.RequiredArgsConstructor; import org.apache.commons.lang.StringUtils; @@ -61,9 +62,9 @@ public class RMpInfluenceMServiceImpl extends ServiceImpl data = deptFeignClient.getDirectSonSelf(id).getData(); - Map deptMap = data.stream().filter(r-> !r.getId().equals(id)).collect(Collectors.toMap(Dept::getCode, dept -> dept)); - List deptCodes = data.stream().filter(r-> !r.getId().equals(id)).map(Dept::getCode).collect(Collectors.toList()); + List data = deptFeignClient.getDepSonDetailByDeptId(id).getData(); + Map deptMap = data.stream().collect(Collectors.toMap(DeptDTO::getCode, dept -> dept)); + List deptCodes = data.stream().map(DeptDTO::getCode).collect(Collectors.toList()); //查询风电场信息 // PmsMonitorParam pmsMonitorParam = new PmsMonitorParam(); diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/RMpWpPowerDetailMServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/RMpWpPowerDetailMServiceImpl.java index bedf1f78d..ba1fa7f70 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/RMpWpPowerDetailMServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/RMpWpPowerDetailMServiceImpl.java @@ -23,6 +23,7 @@ import com.njcn.harmonic.pojo.vo.RMpWpPowerDetailVO; import com.njcn.harmonic.service.specialanalysis.RMpWpPowerDetailMService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.user.api.DeptFeignClient; +import com.njcn.user.pojo.dto.DeptDTO; import com.njcn.user.pojo.po.Dept; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -54,8 +55,8 @@ public class RMpWpPowerDetailMServiceImpl extends ServiceImpl getWindFarmDetailInfo(PowerQualityParam.PowerQualityInfoParam param) { //获取部门id集合 - List deptDTOS = deptFeignClient.getDirectSonSelf(param.getId()).getData(); - List deptIds = deptDTOS.stream().filter(r-> !r.getId().equals(param.getId())).map(Dept::getCode).collect(Collectors.toList()); + List deptDTOS = deptFeignClient.getDepSonDetailByDeptId(param.getId()).getData(); + List deptIds = deptDTOS.stream().map(DeptDTO::getCode).collect(Collectors.toList()); //根据条件查询单位下面的所有配网监测点 PmsMonitorParam pmsMonitorParam = new PmsMonitorParam(); @@ -133,8 +134,8 @@ public class RMpWpPowerDetailMServiceImpl extends ServiceImpl getRailwayDetailInfo(PowerQualityParam param) { //获取部门id集合 - List deptDTOS = deptFeignClient.getDirectSonSelf(param.getId()).getData(); - List deptIds = deptDTOS.stream().filter(r-> !r.getId().equals(param.getId())).map(Dept::getCode).collect(Collectors.toList()); + List deptDTOS = deptFeignClient.getDepSonDetailByDeptId(param.getId()).getData(); + List deptIds = deptDTOS.stream().map(DeptDTO::getCode).collect(Collectors.toList()); //根据部门信息，获取牵引站信息 PmsTractionStationParam stationParam = new PmsTractionStationParam(); diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/RStatOrgPvPowerQualityServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/RStatOrgPvPowerQualityServiceImpl.java index 0b7178cdf..8e076bd0c 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/RStatOrgPvPowerQualityServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/RStatOrgPvPowerQualityServiceImpl.java @@ -3,9 +3,7 @@ package com.njcn.harmonic.service.specialanalysis.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.lang.Console; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.common.pojo.enums.response.CommonResponseEnum; @@ -16,12 +14,10 @@ import com.njcn.device.pms.pojo.param.PwPmsMonitorParam; import com.njcn.harmonic.mapper.specialanalysis.*; import com.njcn.harmonic.pojo.param.OverviewParam; import com.njcn.harmonic.pojo.param.PowerQualityParam; -import com.njcn.harmonic.pojo.po.RStatOrgPvPowerQualityMPO; import com.njcn.harmonic.pojo.po.RStatOrgPvPowerQualityQPO; import com.njcn.harmonic.pojo.vo.OverviewVO; import com.njcn.harmonic.pojo.vo.RStatOrgPvDetailVO; import com.njcn.harmonic.pojo.vo.RStatOrgPvPowerStreamVO; -import com.njcn.harmonic.service.specialanalysis.RStatOrgPvPowerQualityMService; import com.njcn.harmonic.service.specialanalysis.RStatOrgPvPowerQualityService; import com.njcn.system.api.DicDataFeignClient; import com.njcn.system.enums.DicDataEnum; @@ -30,7 +26,6 @@ import com.njcn.system.pojo.po.DictData; import com.njcn.user.api.DeptFeignClient; import com.njcn.user.pojo.dto.DeptDTO; import com.njcn.user.pojo.po.Dept; -import com.njcn.web.utils.WebUtil; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -63,21 +58,20 @@ public class RStatOrgPvPowerQualityServiceImpl extends ServiceImpl deptDTOS = deptFeignClient.getDirectSonSelf(param.getId()).getData(); + List deptDTOS = deptFeignClient.getDepSonDetailByDeptId(param.getId()).getData(); if (CollectionUtil.isEmpty(deptDTOS)) { throw new BusinessException(CommonResponseEnum.NO_DATA, "获取部门信息为空"); } //剔除本部门 - Map deptDTOMap = deptDTOS.stream().filter(r-> !r.getId().equals(param.getId())).collect - (Collectors.toMap(Dept::getCode, Function.identity(), (key, key2) -> key2)); - List OrgNOS = deptDTOS.stream().filter(r-> !r.getId().equals(param.getId())).map(Dept::getCode).collect(Collectors.toList()); + Map deptDTOMap = deptDTOS.stream().collect + (Collectors.toMap(DeptDTO::getCode, Function.identity(), (key, key2) -> key2)); + List OrgNOS = deptDTOS.stream().map(DeptDTO::getCode).collect(Collectors.toList()); //根据字典Code，取出字典id，拼入sql中 dictDataList.stream().forEach(dictData -> { if (DicDataEnum.EVENT_TYPE_L.getCode().equals(dictData.getCode())) { list.put("eventTypeL", dictData.getId()); } if (DicDataEnum.EVENT_TYPE_P.getCode().equals(dictData.getCode())) { - Console.log(list); list.put("eventTypeP", dictData.getId()); } if (DicDataEnum.EVENT_TYPE_O.getCode().equals(dictData.getCode())) { @@ -90,7 +84,7 @@ public class RStatOrgPvPowerQualityServiceImpl extends ServiceImpl page = rStatOrgPvPowerQualityYPOMapper.selectListPage(new Page<>(param.getPageNum(), param.getPageSize()), bearParam); page.getRecords().stream().forEach(vo -> { if (deptDTOMap.containsKey(vo.getOrgNo())) { - Dept deptDTO = deptDTOMap.get(vo.getOrgNo()); + DeptDTO deptDTO = deptDTOMap.get(vo.getOrgNo()); vo.setOrgNo(deptDTO.getName()); } }); @@ -232,6 +226,7 @@ public class RStatOrgPvPowerQualityServiceImpl extends ServiceImpl areaMap, List value, OverviewVO.IcoVO typeVO, Integer type) { + //循环便利赋值判断电压类型 for (OverviewVO.VoltageVO voltageVO : value) { if (areaMap.containsKey(voltageVO.getAreaPqEventType())) { DictData areaData = areaMap.get(voltageVO.getAreaPqEventType()); diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/StreamReverseServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/StreamReverseServiceImpl.java index 69b724911..111226c0d 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/StreamReverseServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/StreamReverseServiceImpl.java @@ -15,6 +15,7 @@ import com.njcn.system.enums.DicDataEnum; import com.njcn.system.enums.DicDataTypeEnum; import com.njcn.system.pojo.po.DictData; import com.njcn.user.api.DeptFeignClient; +import com.njcn.user.pojo.dto.DeptDTO; import com.njcn.user.pojo.po.Dept; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -66,9 +67,9 @@ public class StreamReverseServiceImpl implements StreamReverseService { // List data = deptFeignClient.getDeptDescendantIndexes(id, WebUtil.filterDeptType()).getData(); //获取当前部门和子部门信息 - List data = deptFeignClient.getDirectSonSelf(id).getData(); - Map deptMap = data.stream().collect(Collectors.toMap(Dept::getCode, dept -> dept)); - List deptCodes = data.stream().map(Dept::getCode).collect(Collectors.toList()); + List data = deptFeignClient.getDepSonDetailByDeptId(id).getData(); + Map deptMap = data.stream().collect(Collectors.toMap(DeptDTO::getCode, dept -> dept)); + List deptCodes = data.stream().map(DeptDTO::getCode).collect(Collectors.toList()); // if (!id.equals(orgIdList.get(0))) { // orgIdList.add(id); //把父单位的id传进去 diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/WindFarmIndexOverviewServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/WindFarmIndexOverviewServiceImpl.java index b3dd8caae..33f45b2d9 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/WindFarmIndexOverviewServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/WindFarmIndexOverviewServiceImpl.java @@ -7,6 +7,7 @@ import com.njcn.harmonic.pojo.po.WindFarmIndexOverviewPO; import com.njcn.harmonic.pojo.vo.RStatOrgWfIndexOverviewVO; import com.njcn.harmonic.service.specialanalysis.WindFarmIndexOverview; import com.njcn.user.api.DeptFeignClient; +import com.njcn.user.pojo.dto.DeptDTO; import com.njcn.user.pojo.po.Dept; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -93,12 +94,12 @@ public class WindFarmIndexOverviewServiceImpl implements WindFarmIndexOverview { */ private List getResult(RMpInfluenceParam param, String tag) { // 获取单位信息 - List data = deptFeignClient.getDirectSonSelf(param.getId()).getData(); + List data = deptFeignClient.getDepSonDetailByDeptId(param.getId()).getData(); if (CollUtil.isEmpty(data)) { return Collections.emptyList(); } // 获取单位code - List deptCode = data.stream().filter(r-> !r.getId().equals(param.getId())).map(Dept::getCode).collect(Collectors.toList()); + List deptCode = data.stream().map(DeptDTO::getCode).collect(Collectors.toList()); if (CollUtil.isEmpty(deptCode)) { return Collections.emptyList(); } @@ -108,7 +109,7 @@ public class WindFarmIndexOverviewServiceImpl implements WindFarmIndexOverview { return Collections.emptyList(); } // 将单位信息转换成map集合 - Map dataMap = data.stream().filter(r-> !r.getId().equals(param.getId())).collect(Collectors.toMap(Dept::getCode, Dept::getName)); + Map dataMap = data.stream().collect(Collectors.toMap(DeptDTO::getCode, DeptDTO::getName)); return pos.stream().map(po -> { RStatOrgWfIndexOverviewVO vo = new RStatOrgWfIndexOverviewVO(); vo.setMonitorNum(po.getMonitorNum());