From 6019d49ad0a1e4ebc16dacad23885e59f9d181aa Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Fri, 12 May 2023 09:50:12 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=86=80=E5=8C=97=E5=88=86=E5=B8=83=E5=BC=8F?= =?UTF-8?q?=E5=85=89=E4=BC=8F:=E4=B8=80=E7=B1=BB=E7=9B=91=E6=B5=8B?= =?UTF-8?q?=E7=82=B9=E5=8F=AA=E6=9F=A5=E8=AF=A2=E7=9B=91=E6=B5=8B=E7=82=B9?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E4=B8=BA=E5=88=86=E5=B8=83=E5=BC=8F=E5=85=89?= =?UTF-8?q?=E4=BC=8F=E7=9A=84=E7=9B=91=E6=B5=8B=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/pms/pojo/param/PwPmsMonitorParam.java | 3 +++ .../pms/mapper/distribution/PwMonitorMapper.java | 2 ++ .../distribution/mapping/PwMonitorMapper.xml | 9 +++++++++ .../distribution/impl/IPwMonitorServiceImpl.java | 16 ++++++++++++---- .../java/com/njcn/system/enums/DicDataEnum.java | 1 + 5 files changed, 27 insertions(+), 4 deletions(-) diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PwPmsMonitorParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PwPmsMonitorParam.java index 568473f6b..55c6b6755 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PwPmsMonitorParam.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PwPmsMonitorParam.java @@ -35,4 +35,7 @@ public class PwPmsMonitorParam { @ApiModelProperty(name = "ifPowerUser",value = "是否发电用户：0-否；1-是") private String ifPowerUser; + + @ApiModelProperty(name = "monitorTag", value = "监测点标签") + private List monitorTag; } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/PwMonitorMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/PwMonitorMapper.java index 2e57897e0..d7b209fe9 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/PwMonitorMapper.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/PwMonitorMapper.java @@ -18,10 +18,12 @@ public interface PwMonitorMapper { * 获取配网监测点信息 * * @param deptIdList 所有子部门索引 + * @param monitorTag 监测点标签 * @param pwPmsMonitorParam 查询条件 * @return 配网监测点信息 */ List getPwMonitorDataList(@Param("deptIdList") List deptIdList, + @Param("monitorTag") List monitorTag, @Param("pwPmsMonitorParam") PwPmsMonitorParam pwPmsMonitorParam); /** diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/mapping/PwMonitorMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/mapping/PwMonitorMapper.xml index 336f52773..1dafcdb21 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/mapping/PwMonitorMapper.xml +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/mapping/PwMonitorMapper.xml @@ -39,6 +39,15 @@ pm.Line_Name FROM pms_monitor AS pm + + + AND pm.Monitor_Tag IN + + #{item} + + + + ) UNION ALL ( SELECT diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/IPwMonitorServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/IPwMonitorServiceImpl.java index 88f4429dd..a7579c00b 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/IPwMonitorServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/IPwMonitorServiceImpl.java @@ -3,6 +3,9 @@ package com.njcn.device.pms.service.distribution.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.ObjectUtil; +import com.njcn.common.pojo.enums.response.CommonResponseEnum; +import com.njcn.common.pojo.exception.BusinessException; import com.njcn.common.pojo.param.StatisticsBizBaseParam; import com.njcn.device.pms.mapper.distribution.PwMonitorMapper; import com.njcn.device.pms.pojo.dto.PwPmsMonitorDTO; @@ -63,7 +66,7 @@ public class IPwMonitorServiceImpl implements IPwMonitorService { .filter(deptDTO -> deptDTO.getId().equals(pwPmsMonitorParam.getOrgId())) .collect(Collectors.toList()); //获取monitor详细数据 - pwPmsMonitorDTOS = pwMonitorMapper.getPwMonitorDataList(Collections.singletonList(dept.get(0).getCode()), pwPmsMonitorParam); + pwPmsMonitorDTOS = pwMonitorMapper.getPwMonitorDataList(Collections.singletonList(dept.get(0).getCode()),pwPmsMonitorParam.getMonitorTag(), pwPmsMonitorParam); if (CollUtil.isEmpty(pwPmsMonitorDTOS)) { PwPmsMonitorDTO pwPmsMonitorDTO = new PwPmsMonitorDTO(); @@ -84,7 +87,7 @@ public class IPwMonitorServiceImpl implements IPwMonitorService { .distinct() .collect(Collectors.toList()); deptIdList.add(deptDTO.getCode()); - List pwMonitorDataList = pwMonitorMapper.getPwMonitorDataList(deptIdList, pwPmsMonitorParam); + List pwMonitorDataList = pwMonitorMapper.getPwMonitorDataList(deptIdList,pwPmsMonitorParam.getMonitorTag(), pwPmsMonitorParam); pwPmsMonitorDTOS.addAll(pwMonitorDataList); } } @@ -121,7 +124,7 @@ public class IPwMonitorServiceImpl implements IPwMonitorService { .filter(deptDTO -> deptDTO.getId().equals(pwPmsMonitorParam.getOrgId())) .collect(Collectors.toList()); //获取monitor详细数据 - pwPmsMonitorDTOS = pwMonitorMapper.getPwMonitorDataList(Collections.singletonList(dept.get(0).getCode()), pwPmsMonitorParam); + pwPmsMonitorDTOS = pwMonitorMapper.getPwMonitorDataList(Collections.singletonList(dept.get(0).getCode()),pwPmsMonitorParam.getMonitorTag(), pwPmsMonitorParam); if (CollUtil.isEmpty(pwPmsMonitorDTOS)) { PwPmsMonitorDTO pwPmsMonitorDTO = new PwPmsMonitorDTO(); pwPmsMonitorDTO.setOrgId(dept.get(0).getCode()); @@ -131,7 +134,7 @@ public class IPwMonitorServiceImpl implements IPwMonitorService { } else { // 遍历子单位id List deptCodes = directDeptInfos.stream().map(DeptDTO::getCode).collect(Collectors.toList()); - List pwMonitorDataList = pwMonitorMapper.getPwMonitorDataList(deptCodes, pwPmsMonitorParam); + List pwMonitorDataList = pwMonitorMapper.getPwMonitorDataList(deptCodes,pwPmsMonitorParam.getMonitorTag(), pwPmsMonitorParam); pwPmsMonitorDTOS.addAll(pwMonitorDataList); } return pwPmsMonitorDTOS; @@ -144,6 +147,11 @@ public class IPwMonitorServiceImpl implements IPwMonitorService { Map dictDataMap = monitorType.stream() .collect(Collectors.toMap(DictData::getId, Function.identity())); PwPmsMonitorParam pwPmsMonitorParam = new PwPmsMonitorParam(); + DictData data = dicDataFeignClient.getDicDataByCode(DicDataEnum.DISTRIBUTED_PHOTOVOLTAICS.getCode()).getData(); + if(ObjectUtil.isNull(data)){ + throw new BusinessException(CommonResponseEnum.NO_DATA, "分布式光伏字典,为空"); + } + pwPmsMonitorParam.setMonitorTag(Arrays.asList(data.getId())); pwPmsMonitorParam.setOrgId(param.getId()); //单位id List pwMonitorList = this.getPwMonitorList(pwPmsMonitorParam); Map> collect = pwMonitorList.stream().collect(Collectors.groupingBy(PwPmsMonitorDTO::getMonitorSort)); diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataEnum.java b/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataEnum.java index 2aa108d9a..1cc10e0a3 100644 --- a/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataEnum.java +++ b/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataEnum.java @@ -162,6 +162,7 @@ public enum DicDataEnum { POWER_STATION("光伏电站","Power_Station"), ELECTRIFIED_RAILWAYS("电气化铁路","Electrified_Railways"), SMELT_LOAD("冶炼负荷","Smelt_Load"), + DISTRIBUTED_PHOTOVOLTAICS("分布式光伏","Distributed_Photovoltaics"), /** * 电压等级