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

8、16、19国网接口-数据查询、上送接口

Browse Source
This commit is contained in:
xuyang
2023-12-14 16:24:10 +08:00
parent 5bb7adc5b6
commit c5e31075a5
29 changed files with 1355 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RUploadEvaluationDataDServiceImpl.java
View File

@@ -96,6 +96,7 @@ public class RUploadEvaluationDataDServiceImpl extends MppServiceImpl<RUploadEva
rUploadEvaluationDataD.setDataSources(UploadEnum.DATA_SOURCES_01.getCode());
rUploadEvaluationDataD.setStatisticalDate(calculatedParam.getDataDate());
rUploadEvaluationDataD.setStatisticalType(UploadEnum.STATISTICAL_TYPE_03.getCode());
rUploadEvaluationDataD.setUploadStatus(Integer.parseInt(UploadEnum.UPLOAD_STATUS_0.getCode()));
judgeLevel(item.getDeptLevel(),rUploadEvaluationDataD,item.getUnitId(),item.getUnitName(),deptList,deptMap);
//电压
RUploadEvaluationDataD dto1 = channelData(rUploadEvaluationDataD,item2.getV(),UploadEnum.INDEX_TYPE_01.getCode(),0,item2.getVoltageType(),dto);
@@ -183,7 +184,7 @@ public class RUploadEvaluationDataDServiceImpl extends MppServiceImpl<RUploadEva
Map<String, List<GeneratrixWire>> map2 = list3.stream().collect(Collectors.groupingBy(GeneratrixWire::getScale));
map2.forEach((k1,v1)->{
BusBarDto.VoltageChild voltageChild = new BusBarDto.VoltageChild();
voltageChild.setVoltageLevel(getVoltage(k1));
voltageChild.setVoltageLevel(k1);
voltageChild.setMonitorBusNum(v1.size());
List<GeneratrixWire> list4 = v1.stream().filter(o->online.contains(o.getId())).collect(Collectors.toList());
voltageChild.setOnlineBusNum(list4.size());
@@ -246,7 +247,7 @@ public class RUploadEvaluationDataDServiceImpl extends MppServiceImpl<RUploadEva
List<BusBarDto.VoltageChild> list = dto2.getVoltageChild();
if (CollectionUtil.isNotEmpty(list)){
list.forEach(item->{
if (Objects.equals(item.getVoltageLevel(),this.getVoltage(voltage))){
if (Objects.equals(item.getVoltageLevel(),voltage)){
dto.setMonitorBusNum(item.getMonitorBusNum());
dto.setOnlineBusNum(item.getOnlineBusNum());
dto.setMonitorBusRate(item.getMonitorRate());
@@ -294,7 +295,7 @@ public class RUploadEvaluationDataDServiceImpl extends MppServiceImpl<RUploadEva
dto.setIndexType(indexType);
dto.setHarmonicNum(harmonicNum);
dto.setStandardDeviation(value==3.1415926?3.1415926:0d);
dto.setVoltageLevel(this.getVoltage(voltage));
dto.setVoltageLevel(voltage);
dto.setMonitorBusNum(rUploadEvaluationDataD2.getMonitorBusNum());
dto.setOnlineBusNum(rUploadEvaluationDataD2.getOnlineBusNum());
dto.setMonitorBusRate(rUploadEvaluationDataD2.getMonitorBusRate());
@@ -312,7 +313,7 @@ public class RUploadEvaluationDataDServiceImpl extends MppServiceImpl<RUploadEva
dto.setIndexType(indexType);
dto.setHarmonicNum(i+2);
dto.setStandardDeviation(valueList.get(i)==3.1415926?3.1415926:0d);
dto.setVoltageLevel(this.getVoltage(voltage));
dto.setVoltageLevel(voltage);
dto.setMonitorBusNum(rUploadEvaluationDataD2.getMonitorBusNum());
dto.setOnlineBusNum(rUploadEvaluationDataD2.getOnlineBusNum());
dto.setMonitorBusRate(rUploadEvaluationDataD2.getMonitorBusRate());

1
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RUploadPointStatisticalDataDServiceImpl.java
View File

@@ -72,6 +72,7 @@ public class RUploadPointStatisticalDataDServiceImpl extends MppServiceImpl<RUpl
rUploadPointStatisticalDataD.setProvinceName(dept.getName());
rUploadPointStatisticalDataD.setStatisticalDate(calculatedParam.getDataDate());
rUploadPointStatisticalDataD.setStatisticalType(UploadEnum.STATISTICAL_TYPE_03.getCode());
rUploadPointStatisticalDataD.setUploadStatus(Integer.parseInt(UploadEnum.UPLOAD_STATUS_0.getCode()));
//fixme 主配网标识文档中没有,先随便定义一个,后期调整
rUploadPointStatisticalDataD.setDistributionFlag(UploadEnum.DISTRIBUTION_FLAG_01.getCode());
//fixme over

1
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RUploadSubstationStatisticalDataDServiceImpl.java
View File

@@ -66,6 +66,7 @@ public class RUploadSubstationStatisticalDataDServiceImpl extends MppServiceImpl
rUploadSubstationStatisticalDataD.setStatisticalType(UploadEnum.STATISTICAL_TYPE_03.getCode());
rUploadSubstationStatisticalDataD.setProvinceId(dept.getCode());
rUploadSubstationStatisticalDataD.setProvinceName(dept.getName());
rUploadSubstationStatisticalDataD.setUploadStatus(Integer.parseInt(UploadEnum.UPLOAD_STATUS_0.getCode()));
//处理层级关系 && 处理基础数据
getDeptLevel(list,rUploadSubstationStatisticalDataD,deptList,deptMap,k,subMap);
result.add(rUploadSubstationStatisticalDataD);