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

1.算法调整

Browse Source 
2.bug修改
This commit is contained in:
wr
2024-03-15 10:54:26 +08:00
parent aad1a544c6
commit 7f9012820c
1 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/send/impl/PqTypicalSourceCreatePOServiceImpl.java
View File

@@ -409,6 +409,11 @@ public class PqTypicalSourceCreatePOServiceImpl extends ServiceImpl<PqTypicalSou
pqTypicalSourceCreatePO.setStatisticalType("03"); pqTypicalSourceCreatePO.setStatisticalType("03");
PqTypicalSourceCreatePO po= this.baseMapper.selectAvgMonth(pqTypicalSourceCreatePO, begin, end); PqTypicalSourceCreatePO po= this.baseMapper.selectAvgMonth(pqTypicalSourceCreatePO, begin, end);
if(ObjectUtil.isNotNull(po)){ if(ObjectUtil.isNotNull(po)){
int ovNum = po.getInseqOvNum() + po.getFlickerOvNum() + po.getUnbanOvNum() + po.getVOvNum() + po.getIOvNum();
if(po.getOvNum()>ovNum||po.getOvCount()>ovNum){
pqTypicalSourceCreatePO.setOvNum(ovNum);
pqTypicalSourceCreatePO.setOvCount(ovNum);
}
po.setStatisticalType("02"); po.setStatisticalType("02");
po.setIndexType(temp); po.setIndexType(temp);
po.setStatisticalDate(date); po.setStatisticalDate(date);
@@ -565,6 +570,11 @@ public class PqTypicalSourceCreatePOServiceImpl extends ServiceImpl<PqTypicalSou
pqTypicalSourceCreatePO.setStatisticalType("02"); pqTypicalSourceCreatePO.setStatisticalType("02");
PqTypicalSourceCreatePO po= this.baseMapper.selectAvgYear(pqTypicalSourceCreatePO, begin, end); PqTypicalSourceCreatePO po= this.baseMapper.selectAvgYear(pqTypicalSourceCreatePO, begin, end);
if(ObjectUtil.isNotNull(po)){ if(ObjectUtil.isNotNull(po)){
int ovNum = po.getInseqOvNum() + po.getFlickerOvNum() + po.getUnbanOvNum() + po.getVOvNum() + po.getIOvNum();
if(po.getOvNum()>ovNum||po.getOvCount()>ovNum){
pqTypicalSourceCreatePO.setOvNum(ovNum);
pqTypicalSourceCreatePO.setOvCount(ovNum);
}
po.setStatisticalType("01"); po.setStatisticalType("01");
po.setIndexType(temp); po.setIndexType(temp);
po.setStatisticalDate(date); po.setStatisticalDate(date);
@@ -602,45 +612,36 @@ public class PqTypicalSourceCreatePOServiceImpl extends ServiceImpl<PqTypicalSou
BigDecimal initialvalue = new BigDecimal(0.00); BigDecimal initialvalue = new BigDecimal(0.00);
pqTypicalSourceCreatePO.setInterferenceSourceNum(count); pqTypicalSourceCreatePO.setInterferenceSourceNum(count);
pqTypicalSourceCreatePO.setFlickerOvNum(0);
pqTypicalSourceCreatePO.setFlickerOvRate(initialvalue);
pqTypicalSourceCreatePO.setFlickerAvgOvRate(initialvalue);
pqTypicalSourceCreatePO.setIOvNum(0);
pqTypicalSourceCreatePO.setIOvRate(initialvalue);
pqTypicalSourceCreatePO.setIAvgOvRate(initialvalue);
//负序电流 //负序电流
int inseqOvNum = Integer.valueOf(rMpPartHarmonicDetailDS.stream().filter(temp ->temp.getIsINeg()==1).count()+""); int inseqOvNum = Integer.valueOf(rMpPartHarmonicDetailDS.stream().filter(temp ->temp.getIsINeg()==1).count()+"");
pqTypicalSourceCreatePO.setInseqOvNum(inseqOvNum); pqTypicalSourceCreatePO.setInseqOvNum(inseqOvNum);
pqTypicalSourceCreatePO.setInseqOvRate(divideAndRound(inseqOvNum,count)); pqTypicalSourceCreatePO.setInseqOvRate(divideAndRound(inseqOvNum,count));
pqTypicalSourceCreatePO.setInseqAvgOvRate(divideAndRound(inseqOvNum,count)); pqTypicalSourceCreatePO.setInseqAvgOvRate(divideAndRound(inseqOvNum,count));
pqTypicalSourceCreatePO.setUnbanOvNum(0);
pqTypicalSourceCreatePO.setUnbanOvRate(initialvalue);
pqTypicalSourceCreatePO.setUnbanAvgOvRate(initialvalue);
pqTypicalSourceCreatePO.setVOvNum(0);
pqTypicalSourceCreatePO.setVOvRate(initialvalue);
pqTypicalSourceCreatePO.setVAvgOvRate(initialvalue);
//闪变
int flickervalue = Integer.valueOf(rMpSurplusHarmonicDetailDS.stream().filter(temp ->temp.getIsFlicker()==1).count()+""); int flickervalue = Integer.valueOf(rMpSurplusHarmonicDetailDS.stream().filter(temp ->temp.getIsFlicker()==1).count()+"");
pqTypicalSourceCreatePO.setFlickerOvNum(flickervalue); pqTypicalSourceCreatePO.setFlickerOvNum(flickervalue);
pqTypicalSourceCreatePO.setFlickerOvRate(divideAndRound(flickervalue,count)); pqTypicalSourceCreatePO.setFlickerOvRate(divideAndRound(flickervalue,count));
pqTypicalSourceCreatePO.setFlickerAvgOvRate(divideAndRound(flickervalue,count)); pqTypicalSourceCreatePO.setFlickerAvgOvRate(divideAndRound(flickervalue,count));
//三相电压不平衡度
int phase_voltagevalue = Integer.valueOf(rMpPartHarmonicDetailDS.stream().filter(temp ->temp.getIsUnbalance()==1).count()+""); int phase_voltagevalue = Integer.valueOf(rMpPartHarmonicDetailDS.stream().filter(temp ->temp.getIsUnbalance()==1).count()+"");
pqTypicalSourceCreatePO.setUnbanOvNum(phase_voltagevalue); pqTypicalSourceCreatePO.setUnbanOvNum(phase_voltagevalue);
pqTypicalSourceCreatePO.setUnbanOvRate(divideAndRound(phase_voltagevalue,count)); pqTypicalSourceCreatePO.setUnbanOvRate(divideAndRound(phase_voltagevalue,count));
pqTypicalSourceCreatePO.setUnbanAvgOvRate(divideAndRound(phase_voltagevalue,count)); pqTypicalSourceCreatePO.setUnbanAvgOvRate(divideAndRound(phase_voltagevalue,count));
//谐波电压
int harmonic_voltagevalue = Integer.valueOf(rMpPartHarmonicDetailDS.stream().filter(temp ->temp.getIsV()==1).count()+""); int harmonic_voltagevalue = Integer.valueOf(rMpPartHarmonicDetailDS.stream().filter(temp ->temp.getIsV()==1).count()+"");
pqTypicalSourceCreatePO.setVOvNum(harmonic_voltagevalue); pqTypicalSourceCreatePO.setVOvNum(harmonic_voltagevalue);
pqTypicalSourceCreatePO.setVOvRate(divideAndRound(harmonic_voltagevalue,count)); pqTypicalSourceCreatePO.setVOvRate(divideAndRound(harmonic_voltagevalue,count));
pqTypicalSourceCreatePO.setVAvgOvRate(divideAndRound(harmonic_voltagevalue,count)); pqTypicalSourceCreatePO.setVAvgOvRate(divideAndRound(harmonic_voltagevalue,count));
//谐波电流
int harmonic_Ivalue = Integer.valueOf(rMpPartHarmonicDetailDS.stream().filter(temp ->temp.getIsI()==1).count()+""); int harmonic_Ivalue = Integer.valueOf(rMpPartHarmonicDetailDS.stream().filter(temp ->temp.getIsI()==1).count()+"");
pqTypicalSourceCreatePO.setIOvNum(harmonic_Ivalue);
pqTypicalSourceCreatePO.setIOvRate(divideAndRound(harmonic_Ivalue,count));
pqTypicalSourceCreatePO.setIAvgOvRate(divideAndRound(harmonic_Ivalue,count));
pqTypicalSourceCreatePO.setFlickerOvCount(flickervalue); pqTypicalSourceCreatePO.setFlickerOvCount(flickervalue);