Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

1.单位变电站公共方法

Browse Source
This commit is contained in:
wr
2024-02-27 15:14:37 +08:00
parent b45fe4c040
commit 7c7c66280d
20 changed files with 264 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/CommTerminalGeneralClient.java
View File

@@ -63,6 +63,13 @@ public interface CommTerminalGeneralClient {
@PostMapping("deptGetSubStation")
HttpResult<List<DeptGetSubStationDTO>> deptSubStation(@RequestBody @Validated DeptGetLineParam deptGetLineParam);
/**
* 根据单位获取所有变电站详细信息
*
*/
@PostMapping("/deptGetSubStationInfo")
HttpResult<List<DeptGetSubStationDTO.Info>> deptGetSubStationInfo(@RequestBody @Validated DeptGetLineParam deptGetLineParam);
/**
* 根据单位获取所有母线
*

6
pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/fallback/CommTerminalGeneralClientFallbackFactory.java
View File

@@ -53,6 +53,12 @@ public class CommTerminalGeneralClientFallbackFactory implements FallbackFactory
throw new BusinessException(finalExceptionEnum);
}
@Override
public HttpResult<List<DeptGetSubStationDTO.Info>> deptGetSubStationInfo(DeptGetLineParam deptGetLineParam) {
log.error("{}异常，降级处理，异常为：{}", "根据单位获取所有变电站详细信息", throwable.toString());
throw new BusinessException(finalExceptionEnum);
}
@Override
public HttpResult<List<DeptGetBusBarDTO>> deptBusBar(DeptGetLineParam deptGetLineParam) {
log.error("{}异常，降级处理，异常为：{}", "根据单位获取所有母线", throwable.toString());

10
pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/dto/DeptGetSubStationDTO.java
View File

@@ -24,4 +24,14 @@ public class DeptGetSubStationDTO extends DeptGetBase {
@ApiModelProperty(name = "stationIds",value = "变电站/监测点信息")
private List<String> stationAndMonitorIDs;
@Data
public static class Info extends DeptGetBase{
@ApiModelProperty(name = "stationIds",value = "电站信息")
private List<SubGetBase> stationIds;
@ApiModelProperty(name = "pwStationIds",value = "配网电站信息")
private List<SubGetBase> pwStationIds;
}
}

38
pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/dto/SubGetBase.java Normal file
View File

@@ -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<String> unitChildrenList;
}

12
pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/dto/TerminalGetBase.java
View File

@@ -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;
}
}

4
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/TractionStationParam.java
View File

@@ -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;

14
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RMpMonitorAlarmCountM.java
View File

@@ -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较好）

14
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RMpMonitorAlarmCountMVO.java
View File

@@ -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较好）

13
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/CommTerminalController.java
View File

@@ -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<List<DeptGetSubStationDTO.Info>> deptGetSubStationInfo(@RequestBody @Validated DeptGetLineParam deptGetLineParam) {
String methodDescribe = getMethodDescribe("deptGetSubStationInfo");
List<DeptGetSubStationDTO.Info> result = commTerminalService.deptSubStationInfo(deptGetLineParam);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
}
/**
* 根据单位获取所有母线
* @author cdf

7
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/CommTerminalService.java
View File

@@ -108,4 +108,11 @@ public interface CommTerminalService {
List<BusBarAndHisMonitorDTO> getBusBarAndHisMonitor();
/**
* 根据部门获取各变电站信息
* @param deptGetLineParam
* @return
*/
List<DeptGetSubStationDTO.Info> deptSubStationInfo(DeptGetLineParam deptGetLineParam);
}

64
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/impl/CommTerminalServiceImpl.java
View File

@@ -790,4 +790,68 @@ public class CommTerminalServiceImpl implements CommTerminalService {
return result;
}
@Override
public List<DeptGetSubStationDTO.Info> deptSubStationInfo(DeptGetLineParam deptGetLineParam) {
List<DeptGetSubStationDTO.Info> result = new ArrayList<>();
List<DeptGetBase> temDept = getDeptChildrenByParent(deptGetLineParam);
//获取监测点信息
List<PmsStatationStatInfoDTO> statationStatInfo = statationStatMapper.getStatationStatInfo(new PmsStatationStatInfoParam());
Map<String, List<PmsStatationStatInfoDTO>> statationAndMonitorMap = statationStatInfo.stream().collect(Collectors.groupingBy(PmsStatationStatInfoDTO::getOrgId));
// List<PmsMonitorBaseDTO> pmsMonitorBaseDTOList = distributionMonitorMapper.getDisMonitorAllList(null, 0);
// Map<String, List<PmsMonitorBaseDTO>> 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<String> deptIds = item.getUnitChildrenList();
if (CollectionUtil.isNotEmpty(deptIds)) {
List<SubGetBase> subList = new ArrayList<>();
List<SubGetBase> subListPw = new ArrayList<>();
SubGetBase subGetBase;
for (String deptId : deptIds) {
if (statationAndMonitorMap.containsKey(deptId)) {
//获取部门下变电信息
List<PmsStatationStatInfoDTO> sub = statationAndMonitorMap.get(deptId);
Map<String, List<PmsStatationStatInfoDTO>> subMap = sub.stream()
.collect(Collectors.groupingBy(x->x.getPowerId()+"_"+x.getPowerName()+"_"+x.getPowerVoltageLevel()));
for (Map.Entry<String, List<PmsStatationStatInfoDTO>> stringListEntry : subMap.entrySet()) {
String[] split = stringListEntry.getKey().split("_");
subGetBase=new SubGetBase();
subGetBase.setId(split[0]);
subGetBase.setName(split[1]);
subGetBase.setVoltageLevel(split[2]);
List<String> monitorIds = stringListEntry.getValue().stream().map(PmsStatationStatInfoDTO::getMonitorId).distinct().collect(Collectors.toList());
subGetBase.setUnitChildrenList(monitorIds);
subList.add(subGetBase);
}
}
// if (mapPms.containsKey(deptId)) {
// //获取部门下变电信息
// List<PmsMonitorBaseDTO> sub = mapPms.get(deptId);
// Map<String, List<PmsMonitorBaseDTO>> subMap = sub.stream()
// .collect(Collectors.groupingBy(x->x.getPowerrId()+"_"+x.getVoltageLevel()));
// for (Map.Entry<String, List<PmsMonitorBaseDTO>> stringListEntry : subMap.entrySet()) {
// String[] split = stringListEntry.getKey().split("_");
// subGetBase=new SubGetBase();
// subGetBase.setId(split[0]);
// subGetBase.setVoltageLevel(split[1]);
// List<String> 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;
}
}

13
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/CommTerminalController.java
View File

@@ -127,8 +127,21 @@ public class CommTerminalController extends BaseController {
List<DeptGetSubStationDTO> 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<List<DeptGetSubStationDTO.Info>> deptGetSubStationInfo(@RequestBody @Validated DeptGetLineParam deptGetLineParam) {
String methodDescribe = getMethodDescribe("deptGetSubStationInfo");
List<DeptGetSubStationDTO.Info> result = commTerminalService.deptSubStationInfo(deptGetLineParam);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
}
/**
* 根据单位获取所有变电站
* @author cdf

1
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/DeptLineMapper.java
View File

@@ -74,6 +74,7 @@ public interface DeptLineMapper extends BaseMapper<DeptLine> {
List<TerminalGetBase> orgSubStationGet(@Param("list")List<Integer> devType);
List<TerminalGetBase.Extend> orgSubStationInfoGet(@Param("list")List<Integer> devType);
List<String> getLineIdByDeptIds(@Param("deptIds")List<String> deptIds,@Param("runFlag")List<Integer> runFlag,@Param("dataType")List<Integer> dataType);
}

24
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeptLineMapper.xml
View File

@@ -90,7 +90,29 @@
</foreach>
</select>
<select id="orgSubStationInfoGet" resultType="com.njcn.device.biz.pojo.dto.TerminalGetBase$Extend">
select
DISTINCT
pq_dept_line.id unitId,
substation.id ledgerId,
substation.name subName,
sub.Scale voltageLevel,
point.id lineId
from pq_dept_line pq_dept_line
inner join pq_line point on pq_dept_line.line_id = point.id
inner join pq_line_detail lineDetail on point.id = lineDetail.id
inner join pq_line voltage on point.pid = voltage.id
inner join pq_line dev on voltage.pid = dev.id
inner join pq_device device on dev.id = device.id
inner join pq_line substation on dev.pid = substation.id
inner join pq_substation sub on sub.id = substation.id
where device.Dev_Model = 1
and point.state = 1
and device.Dev_Data_Type in
<foreach collection="list" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
</select>
<select id="getLineIdByDeptIds" resultType="string">
select
DISTINCT

5
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/CommTerminalService.java
View File

@@ -82,8 +82,5 @@ public interface CommTerminalService {
Map<String,String> getCustomDetailByLineId(String id);
List<DeptGetSubStationDTO.Info> deptSubStationInfo(DeptGetLineParam deptGetLineParam);
}

2
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/DeptLineService.java
View File

@@ -105,6 +105,8 @@ public interface DeptLineService extends IService<DeptLine> {
Map<String, List<TerminalGetBase>> orgSubStationGet(List<Integer> devType);
List<TerminalGetBase.Extend> orgSubStationInfoGet(List<Integer> devType);
/**
* 根据监测点id集合查询部门信息id
* @param ids 部门ids

43
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/CommTerminalServiceImpl.java
View File

@@ -207,6 +207,49 @@ public class CommTerminalServiceImpl implements CommTerminalService {
return lineMapper.getCustomDetailByLineId(id);
}
@Override
public List<DeptGetSubStationDTO.Info> deptSubStationInfo(DeptGetLineParam deptGetLineParam) {
List<DeptGetSubStationDTO.Info> result = new ArrayList<>();
List<DeptGetBase> temDept = getDeptChildrenByParent(deptGetLineParam);
List<TerminalGetBase.Extend> anExtends = deptLineService.orgSubStationInfoGet(filterDataTypeNew(deptGetLineParam.getServerName()));
Map<String, List<TerminalGetBase.Extend>> orgSub = anExtends.stream().collect(Collectors.groupingBy(TerminalGetBase::getUnitId));
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<String> deptIds = item.getUnitChildrenList();
if (CollectionUtil.isNotEmpty(deptIds)) {
List<SubGetBase> subList = new ArrayList<>();
SubGetBase subGetBase;
for (String deptId : deptIds) {
if (orgSub.containsKey(deptId)) {
//获取部门下变电信息
List<TerminalGetBase.Extend> sub = orgSub.get(deptId);
Map<String, List<TerminalGetBase.Extend>> subMap = sub.stream()
.collect(Collectors.groupingBy(x->x.getLedgerId()+"_"+x.getSubName()+"_"+x.getVoltageLevel()));
for (Map.Entry<String, List<TerminalGetBase.Extend>> stringListEntry : subMap.entrySet()) {
String[] split = stringListEntry.getKey().split("_");
subGetBase=new SubGetBase();
subGetBase.setId(split[0]);
subGetBase.setName(split[1]);
subGetBase.setVoltageLevel(split[2]);
List<String> monitorIds = stringListEntry.getValue().stream().map(TerminalGetBase.Extend::getLineId).distinct().collect(Collectors.toList());
subGetBase.setUnitChildrenList(monitorIds);
subList.add(subGetBase);
}
}
}
deptGetSubStationDTO.setStationIds(subList);
}
result.add(deptGetSubStationDTO);
});
return result;
}
private List<Integer> filterDataTypeNew(String serverName) {
List<Integer> devType = new ArrayList<>();

5
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DeptLineServiceImpl.java
View File

@@ -119,6 +119,11 @@ public class DeptLineServiceImpl extends ServiceImpl<DeptLineMapper, DeptLine> i
return deptLines.stream ().collect (Collectors.groupingBy (TerminalGetBase::getUnitId));
}
@Override
public List<TerminalGetBase.Extend> orgSubStationInfoGet(List<Integer> devType) {
return deptLineMapper.orgSubStationInfoGet(devType);
}
@Override
public DeptLine getLineByLineIds(String ids) {
return this.getOne(new LambdaQueryWrapper<DeptLine>()

2
pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/RStatSubstationVoltageMServiceImpl.java
View File

@@ -42,7 +42,7 @@ public class RStatSubstationVoltageMServiceImpl extends ServiceImpl<RStatSubstat
@Override
public List<RVoltageIconVO> getStatSubstationIcon(StatisticsBizBaseParam param) {
//获取当前部门下所有部门信息
List<DeptDTO> deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
List<DeptDTO> deptDTOList = deptFeignClient.getDepSonDetailByDeptId(param.getId()).getData();
List<String> deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList());
StatSubstationBizBaseParam baseParam = BeanUtil.copyProperties(param, StatSubstationBizBaseParam.class);
baseParam.setIds(deptIds);

5
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatSubstationVoltageMServiceImpl.java
View File

@@ -45,9 +45,8 @@ public class RStatSubstationVoltageMServiceImpl extends ServiceImpl<RStatSubstat
@Override
public List<RVoltageIconVO> getStatSubstationIcon(StatisticsBizBaseParam param) {
//获取当前部门下所有部门信息
List<DeptDTO> deptList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
List<DeptDTO> deptDTOList = DeptUtil.getDeptSubsetVOList(deptList, param.getId());
List<String> deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList());
List<DeptDTO> deptList = deptFeignClient.getDepSonDetailByDeptId(param.getId()).getData();
List<String> deptIds = deptList.stream().map(DeptDTO::getCode).collect(Collectors.toList());
StatSubstationBizBaseParam baseParam= BeanUtil.copyProperties(param,StatSubstationBizBaseParam.class);
baseParam.setIds(deptIds);