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

1.冀北电网一张图,变电站，终端，监测点接口，添加监测点id信息

Browse Source
This commit is contained in:
wr
2024-05-13 16:34:02 +08:00
parent 2638679df3
commit 0037a6a5b6
8 changed files with 130 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/DeviceInfoParam.java
View File

@@ -178,4 +178,18 @@ public class DeviceInfoParam implements Serializable {
}
@Data
@EqualsAndHashCode(callSuper = true)
public static class GridDiagram extends BusinessParam{
@ApiModelProperty("查询总数监测点")
private List<String> coutList;
@ApiModelProperty("查询告警监测点")
private List<String> alarmList;
@ApiModelProperty("是否是冀北电网一张图树 0:否 1:是")
private Integer type;
}
}

3
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/AreaLineInfoVO.java
View File

@@ -112,4 +112,7 @@ public class AreaLineInfoVO implements Serializable {
@ApiModelProperty(name = "tail",value = "总数")
private Integer tail;
@ApiModelProperty(name = "type",value = "冀北电网一张图类型信息")
private Integer type;
}

13
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/GridDiagramVO.java
View File

@@ -46,9 +46,15 @@ public class GridDiagramVO {
@ApiModelProperty(name = "num", value = "监测点个数")
private Integer num;
@ApiModelProperty(name = "num", value = "在线监测点数")
@ApiModelProperty(name = "numList", value = "监测点集合")
private List<String> numList;
@ApiModelProperty(name = "onLineNum", value = "在线监测点数")
private Integer onLineNum;
@ApiModelProperty(name = "onLineNumList", value = "在线监测点集合")
private List<String> onLineNumList;
@ApiModelProperty(name = "onLineRate", value = "数据在线率")
private Float onLineRate;
@@ -62,9 +68,14 @@ public class GridDiagramVO {
@ApiModelProperty(name = "numOne", value = "数据")
private Long numOne;
@ApiModelProperty(name = "numOneList", value = "数据集合")
private List<String> numOneList;
@ApiModelProperty(name = "numTwo", value = "数据")
private Long numTwo;
@ApiModelProperty(name = "numTwoList", value = "数据集合")
private List<String> numTwoList;
}
@Data
public static class DeviceData {

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

@@ -159,11 +159,7 @@ public class GridDiagramServiceImpl implements GridDiagramService {
//终端id集合
List<String> devIds = lineBaseList.stream().filter(x -> value.equals(x.getVoltageLevel())).map(LineDevGetDTO::getDevId).distinct().collect(Collectors.toList());
GridDiagramVO.LineStatisticsData lineStatisticsData = new GridDiagramVO.LineStatisticsData();
lineStatisticsData.setNum(lineIds.size());
lineStatisticsData.setOnLineNum(onLineNumIds.size());
onLineAndIntegrity(lineIds, onIntegrityByIds, devIds, onlineRateByDevIds, lineStatisticsData);
statisticsData.add(lineStatisticsData);
gridDiagramAdd(statisticsData, onlineRateByDevIds, onIntegrityByIds, devIds, lineIds, onLineNumIds);
}
@@ -174,9 +170,15 @@ public class GridDiagramServiceImpl implements GridDiagramService {
List<String> lineIdsAll = lineBaseList.stream().map(LineDevGetDTO::getPointId).distinct().collect(Collectors.toList());
List<String> onLineNumAll = lineBaseList.stream().filter(x -> 1 == x.getComFlag()).map(LineDevGetDTO::getPointId).distinct().collect(Collectors.toList());
gridDiagramAdd(statisticsData, onlineRateByDevIds, onIntegrityByIds, devIdsAll, lineIdsAll, onLineNumAll);
}
private void gridDiagramAdd(List<GridDiagramVO.LineStatisticsData> statisticsData, List<RStatOnlinerateD> onlineRateByDevIds, List<RStatIntegrityD> onIntegrityByIds, List<String> devIdsAll, List<String> lineIdsAll, List<String> onLineNumAll) {
GridDiagramVO.LineStatisticsData lineStatisticsData = new GridDiagramVO.LineStatisticsData();
lineStatisticsData.setNum(lineIdsAll.size());
lineStatisticsData.setNumList(lineIdsAll);
lineStatisticsData.setOnLineNum(onLineNumAll.size());
lineStatisticsData.setOnLineNumList(onLineNumAll);
onLineAndIntegrity(lineIdsAll, onIntegrityByIds, devIdsAll, onlineRateByDevIds, lineStatisticsData);
statisticsData.add(lineStatisticsData);
}
@@ -191,11 +193,7 @@ public class GridDiagramServiceImpl implements GridDiagramService {
//终端id集合
List<String> devIds = lineBaseList.stream().filter(x -> value.equals(x.getVoltageLevel())).filter(x -> 1 == x.getIsUpToGrid()).map(LineDevGetDTO::getDevId).distinct().collect(Collectors.toList());
GridDiagramVO.LineStatisticsData lineStatisticsData = new GridDiagramVO.LineStatisticsData();
lineStatisticsData.setNum(lineIds.size());
lineStatisticsData.setOnLineNum(onLineNumIds.size());
onLineAndIntegrity(lineIds, onIntegrityByIds, devIds, onlineRateByDevIds, lineStatisticsData);
statisticsData.add(lineStatisticsData);
gridDiagramAdd(statisticsData, onlineRateByDevIds, onIntegrityByIds, devIds, lineIds, onLineNumIds);
}
private void gwStatisticsDataOtherList(List<GridDiagramVO.LineStatisticsData> statisticsData, List<LineDevGetDTO> lineBaseList, List<RStatOnlinerateD> onlineRateByDevIds, List<RStatIntegrityD> onIntegrityByIds) {
@@ -204,11 +202,8 @@ public class GridDiagramServiceImpl implements GridDiagramService {
//监测点集合
List<String> lineIdsAll = lineBaseList.stream().filter(x -> 1 == x.getIsUpToGrid()).map(LineDevGetDTO::getPointId).distinct().collect(Collectors.toList());
List<String> onLineNumAll = lineBaseList.stream().filter(x -> 1 == x.getComFlag() && 1 == x.getIsUpToGrid()).map(LineDevGetDTO::getPointId).distinct().collect(Collectors.toList());
GridDiagramVO.LineStatisticsData lineStatisticsData = new GridDiagramVO.LineStatisticsData();
lineStatisticsData.setNum(lineIdsAll.size());
lineStatisticsData.setOnLineNum(onLineNumAll.size());
onLineAndIntegrity(lineIdsAll, onIntegrityByIds, devIdsAll, onlineRateByDevIds, lineStatisticsData);
statisticsData.add(lineStatisticsData);
gridDiagramAdd(statisticsData, onlineRateByDevIds, onIntegrityByIds, devIdsAll, lineIdsAll, onLineNumAll);
}
private void onLineAndIntegrity(List<String> lineIds, List<RStatIntegrityD> onIntegrityByIds, List<String> devIds, List<RStatOnlinerateD> onlineRateByDevIds, GridDiagramVO.LineStatisticsData lineStatisticsData) {
@@ -460,8 +455,10 @@ public class GridDiagramServiceImpl implements GridDiagramService {
//todo 1国网信息
long count = lineBaseList.stream().filter(x -> getIsUpToGrid(finalI, x, voltageId)).map(LineDevGetDTO::getDevId).distinct().count();
data.setNumOne(count);
data.setNumOneList(lineBaseList.stream().filter(x -> getIsUpToGrid(finalI, x, voltageId)).map(LineDevGetDTO::getPointId).distinct().collect(Collectors.toList()));
long count1 = lineBaseList.stream().filter(x -> getIsUpToGrid(finalI, x, voltageId)).filter(x -> 1 == x.getComFlag()).map(LineDevGetDTO::getDevId).distinct().count();
data.setNumTwo(count1);
data.setNumTwoList(lineBaseList.stream().filter(x -> getIsUpToGrid(finalI, x, voltageId)).filter(x -> 1 == x.getComFlag()).map(LineDevGetDTO::getPointId).distinct().collect(Collectors.toList()));
if (i == 0) {
statisticsData.add(data);
} else {
@@ -469,16 +466,24 @@ public class GridDiagramServiceImpl implements GridDiagramService {
}
}
}
//numOne 在线 numTwo 在线
data = new GridDiagramVO.StatisticsData();
data.setNumOne(lineBaseList.stream().map(LineDevGetDTO::getDevId).distinct().count());
data.setNumOneList(lineBaseList.stream().map(LineDevGetDTO::getPointId).distinct().collect(Collectors.toList()));
data.setNumTwo(lineBaseList.stream()
.filter(x -> 1 == x.getComFlag()).map(LineDevGetDTO::getDevId).distinct().count());
data.setNumTwoList(lineBaseList.stream()
.filter(x -> 1 == x.getComFlag()).map(LineDevGetDTO::getPointId).distinct().collect(Collectors.toList()));
statisticsData.add(data);
data = new GridDiagramVO.StatisticsData();
data.setNumOne(lineBaseList.stream()
.filter(x -> 1==x.getIsUpToGrid()).map(LineDevGetDTO::getDevId).distinct().count());
data.setNumOneList(lineBaseList.stream()
.filter(x -> 1==x.getIsUpToGrid()).map(LineDevGetDTO::getPointId).distinct().collect(Collectors.toList()));
data.setNumTwo(lineBaseList.stream()
.filter(x -> 1 == x.getComFlag()&&1==x.getIsUpToGrid()).map(LineDevGetDTO::getDevId).distinct().count());
data.setNumTwoList(lineBaseList.stream()
.filter(x -> 1 == x.getComFlag()&&1==x.getIsUpToGrid()).map(LineDevGetDTO::getPointId).distinct().collect(Collectors.toList()));
gwStatisticsData.add(data);
}