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

1.冀北电网一张图bug修改

Browse Source 
2.公共接口增加在线离线信息条件筛选
This commit is contained in:
wr
2024-05-22 17:21:40 +08:00
parent b7e291398b
commit 7a7ece5acd
7 changed files with 56 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatLimitTargetVO.java
View File

@@ -1,6 +1,7 @@
package com.njcn.harmonic.pojo.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -9,51 +10,61 @@ public class RStatLimitTargetVO {
/**
* 监测点ID合格率的变电站/装置/母线/线路序号
*/
@ApiModelProperty("监测点id")
private String lineId;
/**
* 频率偏差越限次数
* 频率偏差越限天数
*/
private Integer flickerAllTime=0;
@ApiModelProperty("频率偏差越限天数")
private Integer flickerAllTime = 0;
/**
* 电压偏差越限次数
* 电压偏差越限天数
*/
private Integer freqDevOvertime=0;
@ApiModelProperty("电压偏差越限天数")
private Integer freqDevOvertime = 0;
/**
* 电压不平衡度越限次数
* 电压不平衡度越限天数
*/
private Integer voltageDevOvertime=0;
@ApiModelProperty("电压不平衡度越限天数")
private Integer voltageDevOvertime = 0;
/**
* 闪变越限次数
* 闪变越限天数
*/
private Integer ubalanceOvertime=0;
@ApiModelProperty("闪变越限天数")
private Integer ubalanceOvertime = 0;
/**
* 电压谐波畸变率越限次数
* 电压谐波畸变率越限天数
*/
private Integer uaberranceOvertime=0;
@ApiModelProperty("电压谐波畸变率越限天数")
private Integer uaberranceOvertime = 0;
/**
* 负序电流限值次数
* 负序电流限值天数
*/
private Integer iNegOvertime=0;
@ApiModelProperty("负序电流限值天数")
private Integer iNegOvertime = 0;
/**
* 电压谐波含有率越限次数
* 电压谐波含有率越限天数
*/
private Integer uharmOvertime=0;
@ApiModelProperty("电压谐波含有率越限天数")
private Integer uharmOvertime = 0;
/**
* 电流谐波幅值越限次数
* 电流谐波幅值越限天数
*/
private Integer iharmOvertime=0;
@ApiModelProperty("电流谐波幅值越限天数")
private Integer iharmOvertime = 0;
/**
* 间谐波电压限值次数
* 间谐波电压限值天数
*/
private Integer inuharmOvertime=0;
@ApiModelProperty("间谐波电压限值天数")
private Integer inuharmOvertime = 0;
}

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

@@ -150,9 +150,12 @@ public class RStatLimitServiceImpl implements RStatLimitService {
List<GridDiagramVO.AreaData> info = new ArrayList<>();
GridDiagramVO.AreaData areaData ;
//监测点总数
List<GeneralDeviceDTO> data = generalDeviceInfoClient.getPracticalAllDeviceInfoAsDept(param).getData();
List<GeneralDeviceDTO> data = generalDeviceInfoClient.getPracticalRunDeviceInfo(param).getData();
//在线
param.setComFlag(1);
List<GeneralDeviceDTO> onData = generalDeviceInfoClient.getPracticalRunDeviceInfo(param).getData();
List<String> line = data.stream().flatMap(x -> x.getLineIndexes().stream()).distinct().collect(Collectors.toList());
Map<String, GeneralDeviceDTO> onMap = onData.stream().collect(Collectors.toMap(GeneralDeviceDTO::getIndex, Function.identity()));
DeptGetLineParam deptGetLineParam = new DeptGetLineParam();
@@ -162,7 +165,6 @@ public class RStatLimitServiceImpl implements RStatLimitService {
List<DeptGetSubStationDTO.Info> deptGetChildrenMoreDTOS = commTerminalGeneralClient.deptGetSubStationInfo(deptGetLineParam).getData();
Map<String, DeptGetSubStationDTO.Info> deptLineMap = deptGetChildrenMoreDTOS.stream().collect(Collectors.toMap(DeptGetSubStationDTO.Info::getUnitId, Function.identity()));
List<String> line = data.stream().flatMap(x -> x.getLineIndexes().stream()).distinct().collect(Collectors.toList());
StatSubstationBizBaseParam baseParam=new StatSubstationBizBaseParam();
baseParam.setIds(line);
baseParam.setStartTime(DateUtil.beginOfDay(DateUtil.parse(param.getSearchBeginTime())).toString());