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

1.算法bug修改，部分占比*100，计算展示

Browse Source 
2.pmsbug解决
3.增加根据字典类型code和字典数据code接口
This commit is contained in:
wr
2024-02-26 18:08:09 +08:00
parent 5577757d2e
commit c682b7f198
34 changed files with 244 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/RStatOrgServiceImpl.java
View File

@@ -309,7 +309,7 @@ public class RStatOrgServiceImpl implements RStatOrgService {
rStatOrgMPO.setHarmonicMeasurementAccrued(Integer.valueOf(count1+""));
/*6、日均稳态超标监测点数占比*/
String value2 = df.format(rStatOrgMPO.getHarmonicMeasurementAccrued() / rStatOrgMPO.getAllCount());
String value2 = df.format(rStatOrgMPO.getHarmonicMeasurementAccrued()*100.0 / rStatOrgMPO.getAllCount());
rStatOrgMPO.setHarmonicMeasurementRatioAverage(Double.parseDouble(value2));
/*7、累计超标天数*/
@@ -345,7 +345,7 @@ public class RStatOrgServiceImpl implements RStatOrgService {
rStatOrgMPO.setEventMeasurementAccrued(Integer.valueOf(count2+""));
/*13、日均暂态超标监测点数占比*/
String value4 = df.format(rStatOrgMPO.getEventMeasurementAverage() / rStatOrgMPO.getAllCount());
String value4 = df.format(rStatOrgMPO.getEventMeasurementAverage()*100 / rStatOrgMPO.getAllCount());
rStatOrgMPO.setEventMeasurementRatioAverage(Double.valueOf(value4));
/*15、暂态指标发生频次*/
@@ -421,7 +421,7 @@ public class RStatOrgServiceImpl implements RStatOrgService {
rStatOrgMPO.setHarmonicMeasurementAccrued(Integer.valueOf(count1+""));
/*6、日均稳态超标监测点数占比*/
String value2 = df.format(rStatOrgMPO.getHarmonicMeasurementAccrued() / rStatOrgMPO.getAllCount());
String value2 = df.format(rStatOrgMPO.getHarmonicMeasurementAccrued()*100.0 / rStatOrgMPO.getAllCount());
rStatOrgMPO.setHarmonicMeasurementRatioAverage(Double.parseDouble(value2));
/*7、累计超标天数*/
@@ -456,7 +456,7 @@ public class RStatOrgServiceImpl implements RStatOrgService {
rStatOrgMPO.setEventMeasurementAccrued(Integer.valueOf(count2+""));
/*13、日均暂态超标监测点数占比*/
String value4 = df.format(rStatOrgMPO.getEventMeasurementAverage() / rStatOrgMPO.getAllCount());
String value4 = df.format(rStatOrgMPO.getEventMeasurementAverage() *100/ rStatOrgMPO.getAllCount());
rStatOrgMPO.setEventMeasurementRatioAverage(Double.valueOf(value4));
/*15、暂态指标发生频次*/
@@ -568,7 +568,7 @@ public class RStatOrgServiceImpl implements RStatOrgService {
rStatOrgQPO.setHarmonicMeasurementAccrued(Integer.valueOf(count1+""));
/*6、日均稳态超标监测点数占比*/
String value2 = df.format(rStatOrgQPO.getHarmonicMeasurementAccrued() / rStatOrgQPO.getAllCount());
String value2 = df.format(rStatOrgQPO.getHarmonicMeasurementAccrued()*100.0 / rStatOrgQPO.getAllCount());
rStatOrgQPO.setHarmonicMeasurementRatioAverage(Double.parseDouble(value2));
/*7、累计超标天数*/
@@ -611,7 +611,7 @@ public class RStatOrgServiceImpl implements RStatOrgService {
rStatOrgQPO.setEventMeasurementAccrued(Integer.valueOf(count2+""));
/*13、日均暂态超标监测点数占比*/
String value4 = df.format(rStatOrgQPO.getEventMeasurementAverage() / rStatOrgQPO.getAllCount());
String value4 = df.format(rStatOrgQPO.getEventMeasurementAverage()*100.0 / rStatOrgQPO.getAllCount());
rStatOrgQPO.setEventMeasurementRatioAverage(Double.valueOf(value4));
/*15、暂态指标发生频次*/
@@ -689,7 +689,7 @@ public class RStatOrgServiceImpl implements RStatOrgService {
rStatOrgQPO.setHarmonicMeasurementAccrued(Integer.valueOf(count1+""));
/*6、日均稳态超标监测点数占比*/
String value2 = df.format(rStatOrgQPO.getHarmonicMeasurementAccrued() / rStatOrgQPO.getAllCount());
String value2 = df.format(rStatOrgQPO.getHarmonicMeasurementAccrued()*100.0 / rStatOrgQPO.getAllCount());
rStatOrgQPO.setHarmonicMeasurementRatioAverage(Double.parseDouble(value2));
/*7、累计超标天数*/
@@ -732,7 +732,7 @@ public class RStatOrgServiceImpl implements RStatOrgService {
rStatOrgQPO.setEventMeasurementAccrued(Integer.valueOf(count2+""));
/*13、日均暂态超标监测点数占比*/
String value4 = df.format(rStatOrgQPO.getEventMeasurementAverage() / rStatOrgQPO.getAllCount());
String value4 = df.format(rStatOrgQPO.getEventMeasurementAverage()*100.0 / rStatOrgQPO.getAllCount());
rStatOrgQPO.setEventMeasurementRatioAverage(Double.valueOf(value4));
/*15、暂态指标发生频次*/
@@ -848,7 +848,7 @@ public class RStatOrgServiceImpl implements RStatOrgService {
/*6、日均稳态超标监测点数占比*/
String value2 = df.format(rStatOrgYPO.getOverLimitMeasurementAccrued() / rStatOrgYPO.getAllCount());
String value2 = df.format(rStatOrgYPO.getOverLimitMeasurementAccrued()*100.0 / rStatOrgYPO.getAllCount());
rStatOrgYPO.setHarmonicMeasurementRatioAverage(Double.parseDouble(value2));
/*7、稳态指标平均超标天数*/
@@ -891,7 +891,7 @@ public class RStatOrgServiceImpl implements RStatOrgService {
rStatOrgYPO.setEventMeasurementAccrued(Integer.valueOf(count2+""));
/*13、日均暂态超标监测点数占比*/
String value4 = df.format(rStatOrgYPO.getEventMeasurementAverage() / rStatOrgYPO.getAllCount());
String value4 = df.format(rStatOrgYPO.getEventMeasurementAverage()*100.0 / rStatOrgYPO.getAllCount());
rStatOrgYPO.setEventMeasurementRatioAverage(Double.valueOf(value4));
/*15、暂态指标发生频次*/
@@ -968,7 +968,7 @@ public class RStatOrgServiceImpl implements RStatOrgService {
rStatOrgYPO.setOverLimitMeasurementAccrued(Integer.valueOf(count1+""));
/*6、日均稳态超标监测点数占比*/
String value2 = df.format(rStatOrgYPO.getOverLimitMeasurementAccrued() / rStatOrgYPO.getAllCount());
String value2 = df.format(rStatOrgYPO.getOverLimitMeasurementAccrued()*100.0 / rStatOrgYPO.getAllCount());
rStatOrgYPO.setHarmonicMeasurementRatioAverage(Double.parseDouble(value2));
/*7、稳态指标平均超标天数*/
@@ -1011,7 +1011,7 @@ public class RStatOrgServiceImpl implements RStatOrgService {
rStatOrgYPO.setEventMeasurementAccrued(Integer.valueOf(count2+""));
/*13、日均暂态超标监测点数占比*/
String value4 = df.format(rStatOrgYPO.getEventMeasurementAverage() / rStatOrgYPO.getAllCount());
String value4 = df.format(rStatOrgYPO.getEventMeasurementAverage()*100.0 / rStatOrgYPO.getAllCount());
rStatOrgYPO.setEventMeasurementRatioAverage(Double.valueOf(value4));
/*15、暂态指标发生频次*/
@@ -1126,7 +1126,7 @@ public class RStatOrgServiceImpl implements RStatOrgService {
/*6、日均稳态超标监测点数占比*/
String value2 = df.format(rStatOrgYPO.getOverLimitMeasurementAccrued() / rStatOrgYPO.getAllCount());
String value2 = df.format(rStatOrgYPO.getOverLimitMeasurementAccrued()*100.0 / rStatOrgYPO.getAllCount());
rStatOrgYPO.setHarmonicMeasurementRatioAverage(Double.parseDouble(value2));
/*7、稳态指标平均超标天数*/
@@ -1169,7 +1169,7 @@ public class RStatOrgServiceImpl implements RStatOrgService {
rStatOrgYPO.setEventMeasurementAccrued(Integer.valueOf(count2+""));
/*13、日均暂态超标监测点数占比*/
String value4 = df.format(rStatOrgYPO.getEventMeasurementAverage() / rStatOrgYPO.getAllCount());
String value4 = df.format(rStatOrgYPO.getEventMeasurementAverage()*100.0 / rStatOrgYPO.getAllCount());
rStatOrgYPO.setEventMeasurementRatioAverage(Double.valueOf(value4));
/*15、暂态指标发生频次*/
@@ -1246,7 +1246,7 @@ public class RStatOrgServiceImpl implements RStatOrgService {
rStatOrgYPO.setOverLimitMeasurementAccrued(Integer.valueOf(count1+""));
/*6、日均稳态超标监测点数占比*/
String value2 = df.format(rStatOrgYPO.getOverLimitMeasurementAccrued() / rStatOrgYPO.getAllCount());
String value2 = df.format(rStatOrgYPO.getOverLimitMeasurementAccrued()*100.0 / rStatOrgYPO.getAllCount());
rStatOrgYPO.setHarmonicMeasurementRatioAverage(Double.parseDouble(value2));
/*7、稳态指标平均超标天数*/
@@ -1289,7 +1289,7 @@ public class RStatOrgServiceImpl implements RStatOrgService {
rStatOrgYPO.setEventMeasurementAccrued(Integer.valueOf(count2+""));
/*13、日均暂态超标监测点数占比*/
String value4 = df.format(rStatOrgYPO.getEventMeasurementAverage() / rStatOrgYPO.getAllCount());
String value4 = df.format(rStatOrgYPO.getEventMeasurementAverage()*100.0 / rStatOrgYPO.getAllCount());
rStatOrgYPO.setEventMeasurementRatioAverage(Double.valueOf(value4));
/*15、暂态指标发生频次*/
@@ -1404,7 +1404,7 @@ public class RStatOrgServiceImpl implements RStatOrgService {
rStatOrgQPO.setHarmonicMeasurementAccrued(Integer.valueOf(count1+""));
/*6、日均稳态超标监测点数占比*/
String value2 = df.format(rStatOrgQPO.getHarmonicMeasurementAccrued() / rStatOrgQPO.getAllCount());
String value2 = df.format(rStatOrgQPO.getHarmonicMeasurementAccrued()*100.0 / rStatOrgQPO.getAllCount());
rStatOrgQPO.setHarmonicMeasurementRatioAverage(Double.parseDouble(value2));
/*7、累计超标天数*/
@@ -1447,7 +1447,7 @@ public class RStatOrgServiceImpl implements RStatOrgService {
rStatOrgQPO.setEventMeasurementAccrued(Integer.valueOf(count2+""));
/*13、日均暂态超标监测点数占比*/
String value4 = df.format(rStatOrgQPO.getEventMeasurementAverage() / rStatOrgQPO.getAllCount());
String value4 = df.format(rStatOrgQPO.getEventMeasurementAverage()*100.0 / rStatOrgQPO.getAllCount());
rStatOrgQPO.setEventMeasurementRatioAverage(Double.valueOf(value4));
/*15、暂态指标发生频次*/
@@ -1525,7 +1525,7 @@ public class RStatOrgServiceImpl implements RStatOrgService {
rStatOrgQPO.setHarmonicMeasurementAccrued(Integer.valueOf(count1+""));
/*6、日均稳态超标监测点数占比*/
String value2 = df.format(rStatOrgQPO.getHarmonicMeasurementAccrued() / rStatOrgQPO.getAllCount());
String value2 = df.format(rStatOrgQPO.getHarmonicMeasurementAccrued()*100.0 / rStatOrgQPO.getAllCount());
rStatOrgQPO.setHarmonicMeasurementRatioAverage(Double.parseDouble(value2));
/*7、累计超标天数*/
@@ -1568,7 +1568,7 @@ public class RStatOrgServiceImpl implements RStatOrgService {
rStatOrgQPO.setEventMeasurementAccrued(Integer.valueOf(count2+""));
/*13、日均暂态超标监测点数占比*/
String value4 = df.format(rStatOrgQPO.getEventMeasurementAverage() / rStatOrgQPO.getAllCount());
String value4 = df.format(rStatOrgQPO.getEventMeasurementAverage()*100.0 / rStatOrgQPO.getAllCount());
rStatOrgQPO.setEventMeasurementRatioAverage(Double.valueOf(value4));
/*15、暂态指标发生频次*/
@@ -1684,7 +1684,7 @@ public class RStatOrgServiceImpl implements RStatOrgService {
rStatOrgMPO.setHarmonicMeasurementAccrued(Integer.valueOf(count1+""));
/*6、日均稳态超标监测点数占比*/
String value2 = df.format(rStatOrgMPO.getHarmonicMeasurementAccrued() / rStatOrgMPO.getAllCount());
String value2 = df.format(rStatOrgMPO.getHarmonicMeasurementAccrued()*100.0 / rStatOrgMPO.getAllCount());
rStatOrgMPO.setHarmonicMeasurementRatioAverage(Double.parseDouble(value2));
/*7、累计超标天数*/
@@ -1797,7 +1797,7 @@ public class RStatOrgServiceImpl implements RStatOrgService {
rStatOrgMPO.setHarmonicMeasurementAccrued(Integer.valueOf(count1+""));
/*6、日均稳态超标监测点数占比*/
String value2 = df.format(rStatOrgMPO.getHarmonicMeasurementAccrued() / rStatOrgMPO.getAllCount());
String value2 = df.format(rStatOrgMPO.getHarmonicMeasurementAccrued()*100.0 / rStatOrgMPO.getAllCount());
rStatOrgMPO.setHarmonicMeasurementRatioAverage(Double.parseDouble(value2));
/*7、累计超标天数*/

62
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/newalgorithm/impl/RAlarmCountServiceImpl.java
View File

@@ -208,7 +208,7 @@ public class RAlarmCountServiceImpl implements RAlarmCountService {
RStatOrgMPO rStatOrgMPO = rStatOrgMMapper.selectOne(rStatOrgMPOQueryWrapper);
//所有告警次数集合
Map<String, Long> resultCount = new HashMap<>();
Map<String, Double> resultCount = new HashMap<>();
long vdevAlarmInfoCount = rMpMonitorAlarmCountMPOS.stream().filter(obj ->obj.getVdevAlarmInfo() == 1).map(RMpMonitorAlarmCountMPO::getMeasurementPointId).distinct().count();
long freqAlarmInfoCount = rMpMonitorAlarmCountMPOS.stream().filter(obj ->obj.getFreqAlarmInfo() == 1).map(RMpMonitorAlarmCountMPO::getMeasurementPointId).distinct().count();
long unbalanceAlarmInfoCount = rMpMonitorAlarmCountMPOS.stream().filter(obj ->obj.getUnbalanceAlarmInfo() == 1).map(RMpMonitorAlarmCountMPO::getMeasurementPointId).distinct().count();
@@ -217,25 +217,25 @@ public class RAlarmCountServiceImpl implements RAlarmCountService {
long sagAlarmInfoCount = rMpMonitorAlarmCountMPOS.stream().filter(obj ->obj.getSagAlarmInfo() == 1).map(RMpMonitorAlarmCountMPO::getMeasurementPointId).distinct().count();
long interruptAlarmInfoCount = rMpMonitorAlarmCountMPOS.stream().filter(obj ->obj.getInterruptAlarmInfo() == 1).map(RMpMonitorAlarmCountMPO::getMeasurementPointId).distinct().count();
if (vdevAlarmInfoCount != 0){
resultCount.put("vdevAlarmInfo",vdevAlarmInfoCount);
resultCount.put("vdevAlarmInfo",vdevAlarmInfoCount*100.0);
}
if (freqAlarmInfoCount!=0){
resultCount.put("freqAlarmInfo",freqAlarmInfoCount);
resultCount.put("freqAlarmInfo",freqAlarmInfoCount*100.0);
}
if (unbalanceAlarmInfoCount!=0){
resultCount.put("unbalanceAlarmInfo",unbalanceAlarmInfoCount);
resultCount.put("unbalanceAlarmInfo",unbalanceAlarmInfoCount*100.0);
}
if (vAlarmInfoCount!=0){
resultCount.put("vAlarmInfo",vAlarmInfoCount);
resultCount.put("vAlarmInfo",vAlarmInfoCount*100.0);
}
if (flickerAlarmInfoCount!=0){
resultCount.put("flickerAlarmInfo",flickerAlarmInfoCount);
resultCount.put("flickerAlarmInfo",flickerAlarmInfoCount*100.0);
}
if (sagAlarmInfoCount!=0){
resultCount.put("sagAlarmInfo",sagAlarmInfoCount);
resultCount.put("sagAlarmInfo",sagAlarmInfoCount*100.0);
}
if (interruptAlarmInfoCount!=0){
resultCount.put("interruptAlarmInfo",interruptAlarmInfoCount);
resultCount.put("interruptAlarmInfo",interruptAlarmInfoCount*100.0);
}
@@ -380,7 +380,7 @@ public class RAlarmCountServiceImpl implements RAlarmCountService {
RStatOrgMPO rStatOrgMPO = rStatOrgMMapper.selectOne(rStatOrgMPOQueryWrapper);
//所有告警次数集合
Map<String, Long> resultCount = new HashMap<>();
Map<String, Double> resultCount = new HashMap<>();
long vdevAlarmInfoCount = rMpMonitorAlarmCountMPOS.stream().filter(obj ->obj.getVdevAlarmInfo() == 1).map(RMpMonitorAlarmCountMPO::getMeasurementPointId).distinct().count();
long freqAlarmInfoCount = rMpMonitorAlarmCountMPOS.stream().filter(obj ->obj.getFreqAlarmInfo() == 1).map(RMpMonitorAlarmCountMPO::getMeasurementPointId).distinct().count();
long unbalanceAlarmInfoCount = rMpMonitorAlarmCountMPOS.stream().filter(obj ->obj.getUnbalanceAlarmInfo() == 1).map(RMpMonitorAlarmCountMPO::getMeasurementPointId).distinct().count();
@@ -389,25 +389,25 @@ public class RAlarmCountServiceImpl implements RAlarmCountService {
long sagAlarmInfoCount = rMpMonitorAlarmCountMPOS.stream().filter(obj ->obj.getSagAlarmInfo() == 1).map(RMpMonitorAlarmCountMPO::getMeasurementPointId).distinct().count();
long interruptAlarmInfoCount = rMpMonitorAlarmCountMPOS.stream().filter(obj ->obj.getInterruptAlarmInfo() == 1).map(RMpMonitorAlarmCountMPO::getMeasurementPointId).distinct().count();
if (vdevAlarmInfoCount != 0){
resultCount.put("vdevAlarmInfo",vdevAlarmInfoCount);
resultCount.put("vdevAlarmInfo",vdevAlarmInfoCount*100.0);
}
if (freqAlarmInfoCount!=0){
resultCount.put("freqAlarmInfo",freqAlarmInfoCount);
resultCount.put("freqAlarmInfo",freqAlarmInfoCount*100.0);
}
if (unbalanceAlarmInfoCount!=0){
resultCount.put("unbalanceAlarmInfo",unbalanceAlarmInfoCount);
resultCount.put("unbalanceAlarmInfo",unbalanceAlarmInfoCount*100.0);
}
if (vAlarmInfoCount!=0){
resultCount.put("vAlarmInfo",vAlarmInfoCount);
resultCount.put("vAlarmInfo",vAlarmInfoCount*100.0);
}
if (flickerAlarmInfoCount!=0){
resultCount.put("flickerAlarmInfo",flickerAlarmInfoCount);
resultCount.put("flickerAlarmInfo",flickerAlarmInfoCount*100.0);
}
if (sagAlarmInfoCount!=0){
resultCount.put("sagAlarmInfo",sagAlarmInfoCount);
resultCount.put("sagAlarmInfo",sagAlarmInfoCount*100.0);
}
if (interruptAlarmInfoCount!=0){
resultCount.put("interruptAlarmInfo",interruptAlarmInfoCount);
resultCount.put("interruptAlarmInfo",interruptAlarmInfoCount*100.0);
}
//获取电压暂降告警次数
@@ -467,53 +467,53 @@ public class RAlarmCountServiceImpl implements RAlarmCountService {
}
if (Objects.isNull(rStatOrgMPO)) {
rStatAreaAlarmCountMPO.setVdevAlarmRatio(1.00f);
rStatAreaAlarmCountMPO.setFreqAlarmRatio(1.00f);
rStatAreaAlarmCountMPO.setUnbalanceAlarmRatio(1.00f);
rStatAreaAlarmCountMPO.setVAlarmRatio(1.00f);
rStatAreaAlarmCountMPO.setFlickerAlarmRatio(1.00f);
rStatAreaAlarmCountMPO.setVdevAlarmRatio(0.00f);
rStatAreaAlarmCountMPO.setFreqAlarmRatio(0.00f);
rStatAreaAlarmCountMPO.setUnbalanceAlarmRatio(0.00f);
rStatAreaAlarmCountMPO.setVAlarmRatio(0.00f);
rStatAreaAlarmCountMPO.setFlickerAlarmRatio(0.00f);
} else {
if (rStatOrgMPO.getEffectiveMeasurementAccrued() == 0) {
rStatAreaAlarmCountMPO.setVdevAlarmRatio(1.00f);
rStatAreaAlarmCountMPO.setFreqAlarmRatio(1.00f);
rStatAreaAlarmCountMPO.setUnbalanceAlarmRatio(1.00f);
rStatAreaAlarmCountMPO.setVAlarmRatio(1.00f);
rStatAreaAlarmCountMPO.setFlickerAlarmRatio(1.00f);
rStatAreaAlarmCountMPO.setVdevAlarmRatio(0.00f);
rStatAreaAlarmCountMPO.setFreqAlarmRatio(0.00f);
rStatAreaAlarmCountMPO.setUnbalanceAlarmRatio(0.00f);
rStatAreaAlarmCountMPO.setVAlarmRatio(0.00f);
rStatAreaAlarmCountMPO.setFlickerAlarmRatio(0.00f);
} else {
//电压偏差告警占比
if (resultCount.containsKey("vdevAlarmInfo")) {
String value = df.format(resultCount.get("vdevAlarmInfo") / rStatOrgMPO.getEffectiveMeasurementAccrued());
rStatAreaAlarmCountMPO.setVdevAlarmRatio(Float.parseFloat(value));
} else {
rStatAreaAlarmCountMPO.setVdevAlarmRatio(1.00f);
rStatAreaAlarmCountMPO.setVdevAlarmRatio(0.00f);
}
//频率偏差告警占比
if (resultCount.containsKey("freqAlarmInfo")) {
String value = df.format(resultCount.get("freqAlarmInfo") / rStatOrgMPO.getEffectiveMeasurementAccrued());
rStatAreaAlarmCountMPO.setFreqAlarmRatio(Float.parseFloat(value));
} else {
rStatAreaAlarmCountMPO.setFreqAlarmRatio(1.00f);
rStatAreaAlarmCountMPO.setFreqAlarmRatio(0.00f);
}
//三项电压不平衡度告警占比
if (resultCount.containsKey("unbalanceAlarmInfo")) {
String value = df.format(resultCount.get("unbalanceAlarmInfo") / rStatOrgMPO.getEffectiveMeasurementAccrued());
rStatAreaAlarmCountMPO.setUnbalanceAlarmRatio(Float.parseFloat(value));
} else {
rStatAreaAlarmCountMPO.setUnbalanceAlarmRatio(1.00f);
rStatAreaAlarmCountMPO.setUnbalanceAlarmRatio(0.00f);
}
//谐波电压告警占比
if (resultCount.containsKey("vAlarmInfo")) {
String value = df.format(resultCount.get("vAlarmInfo") / rStatOrgMPO.getEffectiveMeasurementAccrued());
rStatAreaAlarmCountMPO.setVAlarmRatio(Float.parseFloat(value));
} else {
rStatAreaAlarmCountMPO.setVAlarmRatio(1.00f);
rStatAreaAlarmCountMPO.setVAlarmRatio(0.00f);
}
//闪変告警占比
if (resultCount.containsKey("flickerAlarmInfo")) {
String value = df.format(resultCount.get("flickerAlarmInfo") / rStatOrgMPO.getEffectiveMeasurementAccrued());
rStatAreaAlarmCountMPO.setFlickerAlarmRatio(Float.parseFloat(value));
} else {
rStatAreaAlarmCountMPO.setFlickerAlarmRatio(1.00f);
rStatAreaAlarmCountMPO.setFlickerAlarmRatio(0.00f);
}
}
}

27
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/newalgorithm/impl/RStatEventServiceImpl.java
View File

@@ -302,6 +302,9 @@ public class RStatEventServiceImpl implements RStatEventService {
}
//累计发生暂态监测点数
Integer statisData = getStatisData(dictData, rMpEventDetailMPOS);
if(statisData>0){
System.out.println("1");
}
RStatEventMPO rStatEventMPO = new RStatEventMPO();
rStatEventMPO.setOrgNo(deptGetChildrenMoreDTO.getUnitId());
@@ -311,7 +314,7 @@ public class RStatEventServiceImpl implements RStatEventService {
rStatEventMPO.setEventMeasurementAverage(Float.parseFloat(df.format(avgEM.get(dictData.getId()))));
rStatEventMPO.setEventMeasurementAccrued(statisData);
rStatEventMPO.setEventCount(sumEC.get(dictData.getId()));
rStatEventMPO.setEventMeasurementRatioAverage(Float.parseFloat(df.format(avgEMR.get(dictData.getId()))));
rStatEventMPO.setEventMeasurementRatioAverage(Float.parseFloat(df.format(avgEMR.get(dictData.getId())*100)));
rStatEventMPO.setDataType(dataTypeMap.get(DicDataEnum.MAINNET_POINT.getCode()).getId());
if (sumEM.get(dictData.getId()) == 0) {
@@ -401,7 +404,7 @@ public class RStatEventServiceImpl implements RStatEventService {
rStatEventMPO.setEventMeasurementAverage(Float.parseFloat(df.format(avgEM.get(dictData.getId()))));
rStatEventMPO.setEventMeasurementAccrued(statisData);
rStatEventMPO.setEventCount(sumEC.get(dictData.getId()));
rStatEventMPO.setEventMeasurementRatioAverage(Float.parseFloat(df.format(avgEMR.get(dictData.getId()))));
rStatEventMPO.setEventMeasurementRatioAverage(Float.parseFloat(df.format(avgEMR.get(dictData.getId())*100)));
rStatEventMPO.setDataType(dataTypeMap.get(DicDataEnum.DISTRIBUTION_POINT.getCode()).getId());
if (sumEM.get(dictData.getId()) == 0) {
@@ -544,7 +547,7 @@ public class RStatEventServiceImpl implements RStatEventService {
// todo
rStatEventQPO.setEventMeasurementAccrued(statisData);
rStatEventQPO.setEventCount(sumECM.get(dictData.getId()));
rStatEventQPO.setEventMeasurementRatioAverage(Float.parseFloat(df.format(avgEMRM.get(dictData.getId()))));
rStatEventQPO.setEventMeasurementRatioAverage(Float.parseFloat(df.format(avgEMRM.get(dictData.getId())*100)));
rStatEventQPO.setDataType(dataTypeMap.get(DicDataEnum.MAINNET_POINT.getCode()).getId());
if (sumEM.get(dictData.getId()) == 0) {
@@ -648,7 +651,7 @@ public class RStatEventServiceImpl implements RStatEventService {
// todo
rStatEventQPO.setEventMeasurementAccrued(statisData);
rStatEventQPO.setEventCount(sumECM.get(dictData.getId()));
rStatEventQPO.setEventMeasurementRatioAverage(Float.parseFloat(df.format(avgEMRM.get(dictData.getId()))));
rStatEventQPO.setEventMeasurementRatioAverage(Float.parseFloat(df.format(avgEMRM.get(dictData.getId())*100)));
rStatEventQPO.setDataType(dataTypeMap.get(DicDataEnum.DISTRIBUTION_POINT.getCode()).getId());
if (sumEM.get(dictData.getId()) == 0) {
@@ -791,7 +794,7 @@ public class RStatEventServiceImpl implements RStatEventService {
// todo
rStatEventYPO.setEventMeasurementAccrued(statisData);
rStatEventYPO.setEventCount(sumECM.get(dictData.getId()));
rStatEventYPO.setEventMeasurementRatioAverage(Float.parseFloat(df.format(avgEMRM.get(dictData.getId()))));
rStatEventYPO.setEventMeasurementRatioAverage(Float.parseFloat(df.format(avgEMRM.get(dictData.getId())*100)));
rStatEventYPO.setDataType(dataTypeMap.get(DicDataEnum.MAINNET_POINT.getCode()).getId());
if (sumEM.get(dictData.getId()) == 0) {
@@ -896,7 +899,7 @@ public class RStatEventServiceImpl implements RStatEventService {
// todo
rStatEventYPO.setEventMeasurementAccrued(statisData);
rStatEventYPO.setEventCount(sumECM.get(dictData.getId()));
rStatEventYPO.setEventMeasurementRatioAverage(Float.parseFloat(df.format(avgEMRM.get(dictData.getId()))));
rStatEventYPO.setEventMeasurementRatioAverage(Float.parseFloat(df.format(avgEMRM.get(dictData.getId())*100)));
rStatEventYPO.setDataType(dataTypeMap.get(DicDataEnum.DISTRIBUTION_POINT.getCode()).getId());
if (sumEM.get(dictData.getId()) == 0) {
@@ -1192,7 +1195,7 @@ public class RStatEventServiceImpl implements RStatEventService {
if (rStatOrgMPO.getEffectiveMeasurementAccrued() == 0) {
rStatEventMPO.setEventMeasurementRatioAccrued(1.00f);
} else {
String value = df.format(statisData / rStatOrgMPO.getEffectiveMeasurementAccrued().floatValue());
String value = df.format(statisData*100 / rStatOrgMPO.getEffectiveMeasurementAccrued().floatValue());
rStatEventMPO.setEventMeasurementRatioAccrued(Float.parseFloat(value));
}
}
@@ -1282,7 +1285,7 @@ public class RStatEventServiceImpl implements RStatEventService {
if (rStatOrgMPO.getEffectiveMeasurementAccrued() == 0) {
rStatEventMPO.setEventMeasurementRatioAccrued(1.00f);
} else {
String value = df.format(statisData / rStatOrgMPO.getEffectiveMeasurementAccrued().floatValue());
String value = df.format(statisData*100 / rStatOrgMPO.getEffectiveMeasurementAccrued().floatValue());
rStatEventMPO.setEventMeasurementRatioAccrued(Float.parseFloat(value));
}
}
@@ -1432,7 +1435,7 @@ public class RStatEventServiceImpl implements RStatEventService {
if (rStatOrgQPO.getEffectiveMeasurementAccrued() == 0) {
rStatEventQPO.setEventMeasurementRatioAccrued(1.00f);
} else {
String value = df.format(statisData / rStatOrgQPO.getEffectiveMeasurementAccrued().floatValue());
String value = df.format(statisData*100 / rStatOrgQPO.getEffectiveMeasurementAccrued().floatValue());
rStatEventQPO.setEventMeasurementRatioAccrued(Float.parseFloat(value));
}
}
@@ -1536,7 +1539,7 @@ public class RStatEventServiceImpl implements RStatEventService {
if (rStatOrgQPO.getEffectiveMeasurementAccrued() == 0) {
rStatEventQPO.setEventMeasurementRatioAccrued(1.00f);
} else {
String value = df.format(statisData / rStatOrgQPO.getEffectiveMeasurementAccrued().floatValue());
String value = df.format(statisData*100 / rStatOrgQPO.getEffectiveMeasurementAccrued().floatValue());
rStatEventQPO.setEventMeasurementRatioAccrued(Float.parseFloat(value));
}
}
@@ -1679,7 +1682,7 @@ public class RStatEventServiceImpl implements RStatEventService {
if (rStatOrgYPO.getEffectiveMeasurementAccrued() == 0) {
rStatEventYPO.setEventMeasurementRatioAccrued(1.00f);
} else {
String value = df.format(statisData / rStatOrgYPO.getEffectiveMeasurementAccrued().floatValue());
String value = df.format(statisData*100 / rStatOrgYPO.getEffectiveMeasurementAccrued().floatValue());
rStatEventYPO.setEventMeasurementRatioAccrued(Float.parseFloat(value));
}
}
@@ -1784,7 +1787,7 @@ public class RStatEventServiceImpl implements RStatEventService {
if (rStatOrgYPO.getEffectiveMeasurementAccrued() == 0) {
rStatEventYPO.setEventMeasurementRatioAccrued(1.00f);
} else {
String value = df.format(statisData / rStatOrgYPO.getEffectiveMeasurementAccrued().floatValue());
String value = df.format(statisData*100 / rStatOrgYPO.getEffectiveMeasurementAccrued().floatValue());
rStatEventYPO.setEventMeasurementRatioAccrued(Float.parseFloat(value));
}
}

41
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/newalgorithm/impl/RStatLoadTypeServiceImpl.java
View File

@@ -206,14 +206,23 @@ public class RStatLoadTypeServiceImpl implements RStatLoadTypeService {
rStatLoadTypeMPO.setUnbalanceCount(0);
rStatLoadTypeMPO.setFlickerCount(0);
}else {
Optional<RStatHarmonicMPO> vfirst = rStatHarmonicMPOS.stream().filter(temp -> Objects.equals(temp.getHarmonicType(), steadyStatisMap.get(DicDataEnum.HARMONIC_VOLTAGE.getCode()).getId())).findFirst();
Optional<RStatHarmonicMPO> vfirst = rStatHarmonicMPOS.stream().filter(temp -> Objects.equals(temp.getHarmonicType(), steadyStatisMap.get(DicDataEnum.HARMONIC_VOLTAGE.getCode()).getId())
&&Objects.equals(temp.getMeasurementTypeClass(), m)
).findFirst();
rStatLoadTypeMPO.setVCount(vfirst.isPresent() ? vfirst.get().getOverLimitMeasurementAccrued(): 0);
Optional<RStatHarmonicMPO> ifirst = rStatHarmonicMPOS.stream().filter(temp -> Objects.equals(temp.getHarmonicType(), steadyStatisMap.get(DicDataEnum.HARMONIC_CURRENT.getCode()).getId())).findFirst();
Optional<RStatHarmonicMPO> ifirst = rStatHarmonicMPOS.stream().filter(temp -> Objects.equals(temp.getHarmonicType(), steadyStatisMap.get(DicDataEnum.HARMONIC_CURRENT.getCode()).getId())
&&Objects.equals(temp.getMeasurementTypeClass(), m)
).findFirst();
rStatLoadTypeMPO.setICount(ifirst.isPresent() ? ifirst.get().getOverLimitMeasurementAccrued(): 0);
Optional<RStatHarmonicMPO> pfirst = rStatHarmonicMPOS.stream().filter(temp -> Objects.equals(temp.getHarmonicType(), steadyStatisMap.get(DicDataEnum.PHASE_VOLTAGE.getCode()).getId())).findFirst();
Optional<RStatHarmonicMPO> nfirst = rStatHarmonicMPOS.stream().filter(temp -> Objects.equals(temp.getHarmonicType(), steadyStatisMap.get(DicDataEnum.NEG_CURRENT.getCode()).getId())).findFirst();
Optional<RStatHarmonicMPO> ffirst = rStatHarmonicMPOS.stream().filter(temp -> Objects.equals(temp.getHarmonicType(), steadyStatisMap.get(DicDataEnum.FLICKER.getCode()).getId())).findFirst();
Optional<RStatHarmonicMPO> pfirst = rStatHarmonicMPOS.stream().filter(temp -> Objects.equals(temp.getHarmonicType(), steadyStatisMap.get(DicDataEnum.PHASE_VOLTAGE.getCode()).getId())
&&Objects.equals(temp.getMeasurementTypeClass(), m)
).findFirst();
Optional<RStatHarmonicMPO> nfirst = rStatHarmonicMPOS.stream().filter(temp -> Objects.equals(temp.getHarmonicType(), steadyStatisMap.get(DicDataEnum.NEG_CURRENT.getCode()).getId())
&&Objects.equals(temp.getMeasurementTypeClass(), m)
).findFirst();
Optional<RStatHarmonicMPO> ffirst = rStatHarmonicMPOS.stream().filter(temp -> Objects.equals(temp.getHarmonicType(), steadyStatisMap.get(DicDataEnum.FLICKER.getCode()).getId())
&&Objects.equals(temp.getMeasurementTypeClass(), m)
).findFirst();
rStatLoadTypeMPO.setINegCount(nfirst.isPresent() ? nfirst.get().getOverLimitMeasurementAccrued(): 0);
rStatLoadTypeMPO.setUnbalanceCount(pfirst.isPresent() ? pfirst.get().getOverLimitMeasurementAccrued(): 0);
rStatLoadTypeMPO.setFlickerCount(ffirst.isPresent() ? ffirst.get().getOverLimitMeasurementAccrued(): 0);
@@ -308,13 +317,23 @@ public class RStatLoadTypeServiceImpl implements RStatLoadTypeService {
rStatLoadTypeQPO.setUnbalanceCount(0);
rStatLoadTypeQPO.setFlickerCount(0);
}else {
Optional<RStatHarmonicQPO> vfirst = rStatHarmonicQPOS.stream().filter(temp -> Objects.equals(temp.getHarmonicType(), steadyStatisMap.get(DicDataEnum.HARMONIC_VOLTAGE.getCode()).getId())).findFirst();
Optional<RStatHarmonicQPO> vfirst = rStatHarmonicQPOS.stream().filter(temp -> Objects.equals(temp.getHarmonicType(), steadyStatisMap.get(DicDataEnum.HARMONIC_VOLTAGE.getCode()).getId())
&&Objects.equals(temp.getMeasurementTypeClass(), m)
).findFirst();
rStatLoadTypeQPO.setVCount(vfirst.isPresent() ? vfirst.get().getOverLimitMeasurementAccrued(): 0);
Optional<RStatHarmonicQPO> ifirst = rStatHarmonicQPOS.stream().filter(temp -> Objects.equals(temp.getHarmonicType(), steadyStatisMap.get(DicDataEnum.HARMONIC_CURRENT.getCode()).getId())).findFirst();
Optional<RStatHarmonicQPO> ifirst = rStatHarmonicQPOS.stream().filter(temp -> Objects.equals(temp.getHarmonicType(), steadyStatisMap.get(DicDataEnum.HARMONIC_CURRENT.getCode()).getId())
&&Objects.equals(temp.getMeasurementTypeClass(), m)
).findFirst();
rStatLoadTypeQPO.setICount(ifirst.isPresent() ? ifirst.get().getOverLimitMeasurementAccrued(): 0);
Optional<RStatHarmonicQPO> pfirst = rStatHarmonicQPOS.stream().filter(temp -> Objects.equals(temp.getHarmonicType(), steadyStatisMap.get(DicDataEnum.PHASE_VOLTAGE.getCode()).getId())).findFirst();
Optional<RStatHarmonicQPO> nfirst = rStatHarmonicQPOS.stream().filter(temp -> Objects.equals(temp.getHarmonicType(), steadyStatisMap.get(DicDataEnum.NEG_CURRENT.getCode()).getId())).findFirst();
Optional<RStatHarmonicQPO> ffirst = rStatHarmonicQPOS.stream().filter(temp -> Objects.equals(temp.getHarmonicType(), steadyStatisMap.get(DicDataEnum.FLICKER.getCode()).getId())).findFirst();
Optional<RStatHarmonicQPO> pfirst = rStatHarmonicQPOS.stream().filter(temp -> Objects.equals(temp.getHarmonicType(), steadyStatisMap.get(DicDataEnum.PHASE_VOLTAGE.getCode()).getId())
&&Objects.equals(temp.getMeasurementTypeClass(), m)
).findFirst();
Optional<RStatHarmonicQPO> nfirst = rStatHarmonicQPOS.stream().filter(temp -> Objects.equals(temp.getHarmonicType(), steadyStatisMap.get(DicDataEnum.NEG_CURRENT.getCode()).getId())
&&Objects.equals(temp.getMeasurementTypeClass(), m)
).findFirst();
Optional<RStatHarmonicQPO> ffirst = rStatHarmonicQPOS.stream().filter(temp -> Objects.equals(temp.getHarmonicType(), steadyStatisMap.get(DicDataEnum.FLICKER.getCode()).getId())
&&Objects.equals(temp.getMeasurementTypeClass(), m)
).findFirst();
rStatLoadTypeQPO.setINegCount(nfirst.isPresent() ? nfirst.get().getOverLimitMeasurementAccrued(): 0);
rStatLoadTypeQPO.setUnbalanceCount(pfirst.isPresent() ? pfirst.get().getOverLimitMeasurementAccrued(): 0);