From 6b9026d42710509acd6a2be13a42421ef68159b6 Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Wed, 7 May 2025 16:16:58 +0800 Subject: [PATCH] =?UTF-8?q?1.=E8=A7=A3=E5=86=B3=E5=8F=98=E7=94=B5=E7=AB=99?= =?UTF-8?q?=E7=BB=8F=E7=BA=AC=E5=BA=A6=E9=97=AE=E9=A2=98=202.=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E5=85=A8=E6=99=AF=E5=9C=B0=E5=9B=BE=E7=94=B5=E5=8E=8B?= =?UTF-8?q?=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/GridDiagramServiceImpl.java | 20 +++++++++++++--- .../pq/service/impl/LineServiceImpl.java | 24 ++++++++++++++++++- .../Impl/AreaInfoServiceImpl.java | 2 -- .../impl/RMpTargetWarnDServiceImpl.java | 15 +++++++----- .../njcn/system/enums/DicDataTypeEnum.java | 1 + 5 files changed, 50 insertions(+), 12 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 39d09ea16..6ec87be36 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 @@ -70,9 +70,16 @@ public class GridDiagramServiceImpl implements GridDiagramService { public GridDiagramVO getGridDiagramMonitor(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 - List voltageIds = dictDataList.stream().filter(item -> Objects.equals(DicDataEnum.DY_500KV.getCode(), item.getCode()) || Objects.equals(DicDataEnum.DY_220KV.getCode(), item.getCode()) || Objects.equals(DicDataEnum.DY_110KV.getCode(), item.getCode()) || Objects.equals(DicDataEnum.DY_35KV.getCode(), item.getCode())).sorted(Comparator.comparing(DictData::getSort).reversed()).map(DictData::getId).collect(Collectors.toList()); + if(CollUtil.isNotEmpty(v)){ + List vName = v.stream().map(DictData::getName).collect(Collectors.toList()); + voltageIds = dictDataList.stream().filter(item -> vName.contains(item.getName())).sorted(Comparator.comparing(DictData::getSort).reversed()).map(DictData::getId).collect(Collectors.toList()); + }else{ + voltageIds = dictDataList.stream().filter(item -> Objects.equals(DicDataEnum.DY_500KV.getCode(), item.getCode()) || Objects.equals(DicDataEnum.DY_220KV.getCode(), item.getCode()) || Objects.equals(DicDataEnum.DY_110KV.getCode(), item.getCode()) || Objects.equals(DicDataEnum.DY_35KV.getCode(), item.getCode())).sorted(Comparator.comparing(DictData::getSort).reversed()).map(DictData::getId).collect(Collectors.toList()); + } + GridDiagramVO gridDiagramVO = new GridDiagramVO(); @@ -236,9 +243,16 @@ public class GridDiagramServiceImpl implements GridDiagramService { //获取电压等级 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 - List voltageIds = dictDataList.stream().filter(item -> Objects.equals(DicDataEnum.DY_500KV.getCode(), item.getCode()) || Objects.equals(DicDataEnum.DY_220KV.getCode(), item.getCode()) || Objects.equals(DicDataEnum.DY_110KV.getCode(), item.getCode()) || Objects.equals(DicDataEnum.DY_35KV.getCode(), item.getCode())).sorted(Comparator.comparing(DictData::getSort).reversed()).map(DictData::getId).collect(Collectors.toList()); + if(CollUtil.isNotEmpty(v)){ + List vName = v.stream().map(DictData::getName).collect(Collectors.toList()); + voltageIds = dictDataList.stream().filter(item -> vName.contains(item.getName())).sorted(Comparator.comparing(DictData::getSort).reversed()).map(DictData::getId).collect(Collectors.toList()); + }else{ + voltageIds = dictDataList.stream().filter(item -> Objects.equals(DicDataEnum.DY_500KV.getCode(), item.getCode()) || Objects.equals(DicDataEnum.DY_220KV.getCode(), item.getCode()) || Objects.equals(DicDataEnum.DY_110KV.getCode(), item.getCode()) || Objects.equals(DicDataEnum.DY_35KV.getCode(), item.getCode())).sorted(Comparator.comparing(DictData::getSort).reversed()).map(DictData::getId).collect(Collectors.toList()); + } GridDiagramVO gridDiagramVO = new GridDiagramVO(); List info = new ArrayList<>(); diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java index 4ce9f878c..797e4ef5e 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java @@ -890,7 +890,29 @@ public class LineServiceImpl extends ServiceImpl implements Li @Override public List getBaseLineAreaInfo(List lineIndex, String searchValue, Integer comFlag) { - return this.baseMapper.getBaseLineAreaInfo(lineIndex, searchValue, comFlag); + List resList = this.baseMapper.getBaseLineAreaInfo(lineIndex, searchValue, comFlag); + List userIds = resList.stream().filter(x -> StrUtil.isNotBlank(x.getObjId())).map(AreaLineInfoVO::getObjId).collect(Collectors.toList()); + Map userReportVOMap = new HashMap<>(); + if (CollUtil.isNotEmpty(userIds)) { + List data = userLedgerFeignClient.getUserReportByIds(userIds).getData(); + if (CollUtil.isNotEmpty(data)) { + userReportVOMap = data.stream().collect(Collectors.toMap(NewUserReportVO::getId, Function.identity())); + } + } + NewUserReportVO newUserReportVO; + for (AreaLineInfoVO areaLineInfoVO : resList) { + if(StrUtil.isNotBlank(areaLineInfoVO.getObjId())){ + if(userReportVOMap.containsKey(areaLineInfoVO.getObjId())){ + newUserReportVO = userReportVOMap.get(areaLineInfoVO.getObjId()); + areaLineInfoVO.setSubId(newUserReportVO.getId()); + areaLineInfoVO.setSubName(newUserReportVO.getProjectName()); + areaLineInfoVO.setLat(newUserReportVO.getLatitude()); + areaLineInfoVO.setLng(newUserReportVO.getLongitude()); + } + } + + } + return resList; } @Override diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaInfoServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaInfoServiceImpl.java index 9b198c260..6b8d8ea03 100644 --- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaInfoServiceImpl.java +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaInfoServiceImpl.java @@ -39,9 +39,7 @@ import java.util.stream.Stream; public class AreaInfoServiceImpl implements AreaInfoService { private final GeneralDeviceInfoClient generalDeviceInfoClient; - private final LineFeignClient lineFeignClient; - private final EventDetailService eventDetailService; @Override diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpTargetWarnDServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpTargetWarnDServiceImpl.java index 6c02a7ea9..5d00ba9ea 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpTargetWarnDServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpTargetWarnDServiceImpl.java @@ -53,13 +53,16 @@ public class RMpTargetWarnDServiceImpl extends ServiceImpl dictDataList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.DEV_VOLTAGE_STAND.getCode()).getData(); + List v = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.PANORAMIC_VOLTAGE.getCode()).getData(); + List voltageIds; //获取电压等级550 220 110 35 - List voltageIds = dictDataList.stream().filter(item -> - Objects.equals(DicDataEnum.DY_500KV.getCode(), item.getCode()) || - Objects.equals(DicDataEnum.DY_220KV.getCode(), item.getCode()) || - Objects.equals(DicDataEnum.DY_110KV.getCode(), item.getCode()) || - Objects.equals(DicDataEnum.DY_35KV.getCode(), item.getCode()) - ).sorted(Comparator.comparing(DictData::getSort).reversed()).map(DictData::getId).collect(Collectors.toList()); + if(CollUtil.isNotEmpty(v)){ + List vName = v.stream().map(DictData::getName).collect(Collectors.toList()); + voltageIds = dictDataList.stream().filter(item -> vName.contains(item.getName())).sorted(Comparator.comparing(DictData::getSort).reversed()).map(DictData::getId).collect(Collectors.toList()); + }else{ + voltageIds = dictDataList.stream().filter(item -> Objects.equals(DicDataEnum.DY_500KV.getCode(), item.getCode()) || Objects.equals(DicDataEnum.DY_220KV.getCode(), item.getCode()) || Objects.equals(DicDataEnum.DY_110KV.getCode(), item.getCode()) || Objects.equals(DicDataEnum.DY_35KV.getCode(), item.getCode())).sorted(Comparator.comparing(DictData::getSort).reversed()).map(DictData::getId).collect(Collectors.toList()); + + } GridDiagramVO gridDiagramVO = new GridDiagramVO(); diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataTypeEnum.java b/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataTypeEnum.java index 20c2c9cb4..a14334f92 100644 --- a/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataTypeEnum.java +++ b/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataTypeEnum.java @@ -31,6 +31,7 @@ public enum DicDataTypeEnum { DEV_VOLTAGE("电压等级","Dev_Voltage"), //标准电压等级用于pq不区分交直流 DEV_VOLTAGE_STAND("标准电压等级","Dev_Voltage_Stand"), + PANORAMIC_VOLTAGE("全景电压等级","Panoramic_voltage"), EVENT_REASON("暂降原因","Event_Reason"), EVENT_TYPE("暂降类型","Event_Type"), BUSINESS_TYPE("行业类型","Business_Type"),