From 7c7c66280d1469e37c959fe058c4bf20fda63139 Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Tue, 27 Feb 2024 15:14:37 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=8D=95=E4=BD=8D=E5=8F=98=E7=94=B5=E7=AB=99?= =?UTF-8?q?=E5=85=AC=E5=85=B1=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commApi/CommTerminalGeneralClient.java | 7 ++ ...mTerminalGeneralClientFallbackFactory.java | 6 ++ .../biz/pojo/dto/DeptGetSubStationDTO.java | 10 +++ .../njcn/device/biz/pojo/dto/SubGetBase.java | 38 +++++++++++ .../device/biz/pojo/dto/TerminalGetBase.java | 12 +++- .../pms/pojo/param/TractionStationParam.java | 4 ++ .../pms/pojo/po/RMpMonitorAlarmCountM.java | 14 ++-- .../pms/pojo/vo/RMpMonitorAlarmCountMVO.java | 14 ++-- .../ledgerManger/CommTerminalController.java | 13 ++++ .../ledgerManger/CommTerminalService.java | 7 ++ .../impl/CommTerminalServiceImpl.java | 64 +++++++++++++++++++ .../pq/controller/CommTerminalController.java | 13 ++++ .../njcn/device/pq/mapper/DeptLineMapper.java | 1 + .../pq/mapper/mapping/DeptLineMapper.xml | 24 ++++++- .../pq/service/CommTerminalService.java | 5 +- .../device/pq/service/DeptLineService.java | 2 + .../service/impl/CommTerminalServiceImpl.java | 43 +++++++++++++ .../pq/service/impl/DeptLineServiceImpl.java | 5 ++ .../RStatSubstationVoltageMServiceImpl.java | 2 +- .../RStatSubstationVoltageMServiceImpl.java | 5 +- 20 files changed, 264 insertions(+), 25 deletions(-) create mode 100644 pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/dto/SubGetBase.java diff --git a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/CommTerminalGeneralClient.java b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/CommTerminalGeneralClient.java index 6ede2e13d..6dbd34002 100644 --- a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/CommTerminalGeneralClient.java +++ b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/CommTerminalGeneralClient.java @@ -63,6 +63,13 @@ public interface CommTerminalGeneralClient { @PostMapping("deptGetSubStation") HttpResult> deptSubStation(@RequestBody @Validated DeptGetLineParam deptGetLineParam); + /** + * 根据单位获取所有变电站详细信息 + * + */ + @PostMapping("/deptGetSubStationInfo") + HttpResult> deptGetSubStationInfo(@RequestBody @Validated DeptGetLineParam deptGetLineParam); + /** * 根据单位获取所有母线 * diff --git a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/fallback/CommTerminalGeneralClientFallbackFactory.java b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/fallback/CommTerminalGeneralClientFallbackFactory.java index 6e498693d..9d39e5083 100644 --- a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/fallback/CommTerminalGeneralClientFallbackFactory.java +++ b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/fallback/CommTerminalGeneralClientFallbackFactory.java @@ -53,6 +53,12 @@ public class CommTerminalGeneralClientFallbackFactory implements FallbackFactory throw new BusinessException(finalExceptionEnum); } + @Override + public HttpResult> deptGetSubStationInfo(DeptGetLineParam deptGetLineParam) { + log.error("{}异常，降级处理，异常为：{}", "根据单位获取所有变电站详细信息", throwable.toString()); + throw new BusinessException(finalExceptionEnum); + } + @Override public HttpResult> deptBusBar(DeptGetLineParam deptGetLineParam) { log.error("{}异常，降级处理，异常为：{}", "根据单位获取所有母线", throwable.toString()); diff --git a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/dto/DeptGetSubStationDTO.java b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/dto/DeptGetSubStationDTO.java index 3f672a941..e58feacae 100644 --- a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/dto/DeptGetSubStationDTO.java +++ b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/dto/DeptGetSubStationDTO.java @@ -24,4 +24,14 @@ public class DeptGetSubStationDTO extends DeptGetBase { @ApiModelProperty(name = "stationIds",value = "变电站/监测点信息") private List stationAndMonitorIDs; + + @Data + public static class Info extends DeptGetBase{ + + @ApiModelProperty(name = "stationIds",value = "电站信息") + private List stationIds; + + @ApiModelProperty(name = "pwStationIds",value = "配网电站信息") + private List pwStationIds; + } } diff --git a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/dto/SubGetBase.java b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/dto/SubGetBase.java new file mode 100644 index 000000000..3121ddaac --- /dev/null +++ b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/dto/SubGetBase.java @@ -0,0 +1,38 @@ +package com.njcn.device.biz.pojo.dto; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description: 变电站详细信息 + * @Author: wr + * @Date: 2024/2/27 11:33 + */ +@Data +public class SubGetBase implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 变电站id + */ + private String id; + + /** + * 变电站名称 + */ + private String name; + + /** + * 变电站电压等级 + */ + private String voltageLevel; + + /** + * 所有子级监测点信息 + */ + private List unitChildrenList; + +} diff --git a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/dto/TerminalGetBase.java b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/dto/TerminalGetBase.java index e744ef46c..9654d58b0 100644 --- a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/dto/TerminalGetBase.java +++ b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/dto/TerminalGetBase.java @@ -12,14 +12,22 @@ import lombok.Data; public class TerminalGetBase { /** - * 单位id + * 单位id */ private String unitId; /** - * 台账(监测点,母线，装置，电站，供电公司)id + * 台账(监测点,母线，装置，电站，供电公司)id */ private String ledgerId; private String lineId; + + @Data + public static class Extend extends TerminalGetBase { + + private String subName; + + private String voltageLevel; + } } diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/TractionStationParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/TractionStationParam.java index 7ad886b06..d69df0d94 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/TractionStationParam.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/TractionStationParam.java @@ -45,6 +45,10 @@ public class TractionStationParam { @NotBlank(message = "铁路线路名称不可为空") private String railwayLineName; + @ApiModelProperty(name = "railwayType", value = "铁路线路类型") + @NotBlank(message = "铁路线路类型不可为空") + private String railwayType; + @ApiModelProperty(name = "connetGroupWay", value = "牵引站变压器接线方式") @NotBlank(message = "牵引站变压器接线方式不可为空") private String connetGroupWay; diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RMpMonitorAlarmCountM.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RMpMonitorAlarmCountM.java index 43f6c9f0c..8ce8a7c7e 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RMpMonitorAlarmCountM.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RMpMonitorAlarmCountM.java @@ -48,7 +48,7 @@ public class RMpMonitorAlarmCountM implements Serializable { /** * 电压偏差严重度 */ - private Integer vdevSeverity; + private Double vdevSeverity; /** * 频率偏差告警情况(0:否 1:是) @@ -58,7 +58,7 @@ public class RMpMonitorAlarmCountM implements Serializable { /** * 频率偏差严重度 */ - private Integer freqSeverity; + private Double freqSeverity; /** * 三相电压不平衡度告警情况(0:否 1:是) @@ -68,7 +68,7 @@ public class RMpMonitorAlarmCountM implements Serializable { /** * 三相电压不平衡严重度 */ - private Integer unbalanceSeverity; + private Double unbalanceSeverity; /** * 谐波电压告警情况(0:否 1:是) @@ -78,7 +78,7 @@ public class RMpMonitorAlarmCountM implements Serializable { /** * 谐波电压严重度 */ - private Integer vSeverity; + private Double vSeverity; /** * 闪变告警情况(0:否 1:是) @@ -88,7 +88,7 @@ public class RMpMonitorAlarmCountM implements Serializable { /** * 闪变严重度 */ - private Integer flickerSeverity; + private Double flickerSeverity; /** * 电压暂降告警情况(0:否 1:是) @@ -98,7 +98,7 @@ public class RMpMonitorAlarmCountM implements Serializable { /** * 电压暂降严重度 */ - private Integer sagSeverity; + private Double sagSeverity; /** * 短时中断告警情况(0:否 1:是) @@ -108,7 +108,7 @@ public class RMpMonitorAlarmCountM implements Serializable { /** * 短时中断严重度 */ - private Integer interruptSeverity; + private Double interruptSeverity; /** * 稳态指标评级结果（0 较差 1中等 2较好） diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RMpMonitorAlarmCountMVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RMpMonitorAlarmCountMVO.java index 892de2b38..7c1fe2bc1 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RMpMonitorAlarmCountMVO.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RMpMonitorAlarmCountMVO.java @@ -57,7 +57,7 @@ public class RMpMonitorAlarmCountMVO implements Serializable { * 电压偏差严重度 */ @ApiModelProperty(name = "vdevSeverity", value = "电压偏差严重度") - private Integer vdevSeverity; + private Double vdevSeverity; /** * 频率偏差告警情况(0:否 1:是) @@ -69,7 +69,7 @@ public class RMpMonitorAlarmCountMVO implements Serializable { * 频率偏差严重度 */ @ApiModelProperty(name = "freqSeverity", value = "频率偏差严重度") - private Integer freqSeverity; + private Double freqSeverity; /** * 三相电压不平衡度告警情况(0:否 1:是) @@ -81,7 +81,7 @@ public class RMpMonitorAlarmCountMVO implements Serializable { * 三相电压不平衡度严重度 */ @ApiModelProperty(name = "unbalanceSeverity", value = "三相电压不平衡度严重度") - private Integer unbalanceSeverity; + private Double unbalanceSeverity; /** * 谐波电压告警情况(0:否 1:是) @@ -93,7 +93,7 @@ public class RMpMonitorAlarmCountMVO implements Serializable { * 谐波电压严重度 */ @ApiModelProperty(name = "vSeverity", value = "谐波电压严重度") - private Integer vSeverity; + private Double vSeverity; /** * 闪变告警情况(0:否 1:是) @@ -105,7 +105,7 @@ public class RMpMonitorAlarmCountMVO implements Serializable { * 闪变严重度 */ @ApiModelProperty(name = "flickerSeverity", value = "闪变严重度") - private Integer flickerSeverity; + private Double flickerSeverity; /** * 电压暂降告警情况(0:否 1:是) @@ -117,7 +117,7 @@ public class RMpMonitorAlarmCountMVO implements Serializable { * 电压暂降告严重度 */ @ApiModelProperty(name = "sagSeverity", value = "电压暂降严重度") - private Integer sagSeverity; + private Double sagSeverity; /** * 短时中断告警情况(0:否 1:是) @@ -130,7 +130,7 @@ public class RMpMonitorAlarmCountMVO implements Serializable { * 短时中断严重度 */ @ApiModelProperty(name = "interruptSeverity", value = "短时中断告严重度") - private Integer interruptSeverity; + private Double interruptSeverity; /** * 稳态指标评级结果（0 较差 1中等 2较好） diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/CommTerminalController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/CommTerminalController.java index 175df80fe..8acf05c94 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/CommTerminalController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/CommTerminalController.java @@ -126,6 +126,19 @@ public class CommTerminalController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); } + /** + * 根据单位获取所有变电站详细信息 + * @param deptGetLineParam + * @return + */ + @PostMapping("/deptGetSubStationInfo") + @ApiOperation("根据单位获取所有变电站详细信息") + @ApiImplicitParam(name = "deptGetLineParam", value = "请求体", required = true) + public HttpResult> deptGetSubStationInfo(@RequestBody @Validated DeptGetLineParam deptGetLineParam) { + String methodDescribe = getMethodDescribe("deptGetSubStationInfo"); + List result = commTerminalService.deptSubStationInfo(deptGetLineParam); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); + } /** * 根据单位获取所有母线 * @author cdf diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/CommTerminalService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/CommTerminalService.java index 6f9ea1a7f..e9cb14b57 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/CommTerminalService.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/CommTerminalService.java @@ -108,4 +108,11 @@ public interface CommTerminalService { List getBusBarAndHisMonitor(); + + /** + * 根据部门获取各变电站信息 + * @param deptGetLineParam + * @return + */ + List deptSubStationInfo(DeptGetLineParam deptGetLineParam); } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/impl/CommTerminalServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/impl/CommTerminalServiceImpl.java index 9164bd6af..f7e079892 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/impl/CommTerminalServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/impl/CommTerminalServiceImpl.java @@ -790,4 +790,68 @@ public class CommTerminalServiceImpl implements CommTerminalService { return result; } + @Override + public List deptSubStationInfo(DeptGetLineParam deptGetLineParam) { + List result = new ArrayList<>(); + List temDept = getDeptChildrenByParent(deptGetLineParam); + + //获取监测点信息 + List statationStatInfo = statationStatMapper.getStatationStatInfo(new PmsStatationStatInfoParam()); + Map> statationAndMonitorMap = statationStatInfo.stream().collect(Collectors.groupingBy(PmsStatationStatInfoDTO::getOrgId)); + +// List pmsMonitorBaseDTOList = distributionMonitorMapper.getDisMonitorAllList(null, 0); +// Map> mapPms = pmsMonitorBaseDTOList.stream().collect(Collectors.groupingBy(PmsMonitorBaseDTO::getOrgId)); + + temDept.forEach(item -> { + DeptGetSubStationDTO.Info deptGetSubStationDTO = new DeptGetSubStationDTO.Info(); + deptGetSubStationDTO.setUnitId(item.getUnitId()); + deptGetSubStationDTO.setUnitName(item.getUnitName()); + deptGetSubStationDTO.setUnitChildrenList(item.getUnitChildrenList()); + deptGetSubStationDTO.setDeptLevel(item.getDeptLevel()); + List deptIds = item.getUnitChildrenList(); + if (CollectionUtil.isNotEmpty(deptIds)) { + List subList = new ArrayList<>(); + List subListPw = new ArrayList<>(); + SubGetBase subGetBase; + for (String deptId : deptIds) { + if (statationAndMonitorMap.containsKey(deptId)) { + //获取部门下变电信息 + List sub = statationAndMonitorMap.get(deptId); + Map> subMap = sub.stream() + .collect(Collectors.groupingBy(x->x.getPowerId()+"_"+x.getPowerName()+"_"+x.getPowerVoltageLevel())); + for (Map.Entry> stringListEntry : subMap.entrySet()) { + String[] split = stringListEntry.getKey().split("_"); + subGetBase=new SubGetBase(); + subGetBase.setId(split[0]); + subGetBase.setName(split[1]); + subGetBase.setVoltageLevel(split[2]); + List monitorIds = stringListEntry.getValue().stream().map(PmsStatationStatInfoDTO::getMonitorId).distinct().collect(Collectors.toList()); + subGetBase.setUnitChildrenList(monitorIds); + subList.add(subGetBase); + } + } + +// if (mapPms.containsKey(deptId)) { +// //获取部门下变电信息 +// List sub = mapPms.get(deptId); +// Map> subMap = sub.stream() +// .collect(Collectors.groupingBy(x->x.getPowerrId()+"_"+x.getVoltageLevel())); +// for (Map.Entry> stringListEntry : subMap.entrySet()) { +// String[] split = stringListEntry.getKey().split("_"); +// subGetBase=new SubGetBase(); +// subGetBase.setId(split[0]); +// subGetBase.setVoltageLevel(split[1]); +// List monitorIds = stringListEntry.getValue().stream().map(PmsMonitorBaseDTO::getMonitorId).distinct().collect(Collectors.toList()); +// subGetBase.setUnitChildrenList(monitorIds); +// subListPw.add(subGetBase); +// } +// } + } + deptGetSubStationDTO.setStationIds(subList); + } + result.add(deptGetSubStationDTO); + }); + return result; + } + } diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/CommTerminalController.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/CommTerminalController.java index 7e2f6a158..6676d4155 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/CommTerminalController.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/CommTerminalController.java @@ -127,8 +127,21 @@ public class CommTerminalController extends BaseController { List result = commTerminalService.deptSubStation(deptGetLineParam); log.info("运行时长" + timer.intervalSecond()); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); + } /** + * 根据单位获取所有变电站详细信息 + * @param deptGetLineParam + * @return + */ + @PostMapping("/deptGetSubStationInfo") + @ApiOperation("根据单位获取所有变电站详细信息") + @ApiImplicitParam(name = "deptGetLineParam", value = "请求体", required = true) + public HttpResult> deptGetSubStationInfo(@RequestBody @Validated DeptGetLineParam deptGetLineParam) { + String methodDescribe = getMethodDescribe("deptGetSubStationInfo"); + List result = commTerminalService.deptSubStationInfo(deptGetLineParam); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); } + /** * 根据单位获取所有变电站 * @author cdf diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/DeptLineMapper.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/DeptLineMapper.java index 96476f0e0..66a8d2f8a 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/DeptLineMapper.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/DeptLineMapper.java @@ -74,6 +74,7 @@ public interface DeptLineMapper extends BaseMapper { List orgSubStationGet(@Param("list")List devType); + List orgSubStationInfoGet(@Param("list")List devType); List getLineIdByDeptIds(@Param("deptIds")List deptIds,@Param("runFlag")List runFlag,@Param("dataType")List dataType); } diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeptLineMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeptLineMapper.xml index 39cfe3436..4113939fc 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeptLineMapper.xml +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeptLineMapper.xml @@ -90,7 +90,29 @@ - +