单位暂态算法调整
This commit is contained in:
@@ -140,10 +140,10 @@ public class RStatEventServiceImpl implements RStatEventService {
|
||||
rStatEventDPO.setEventCount(transientStatisData.get(1));
|
||||
rStatEventDPO.setDataType(dataTypeMap.get(DicDataEnum.MAINNET_POINT.getCode()).getId());
|
||||
if (Objects.isNull(rStatOrgDPO)) {
|
||||
rStatEventDPO.setEventMeasurementRatio(1.00f);
|
||||
rStatEventDPO.setEventMeasurementRatio(0.00f);
|
||||
} else {
|
||||
if (rStatOrgDPO.getEffectiveMeasurement() == 0) {
|
||||
rStatEventDPO.setEventMeasurementRatio(1.00f);
|
||||
rStatEventDPO.setEventMeasurementRatio(0.00f);
|
||||
} else {
|
||||
String value = df.format(rStatEventDPO.getEventMeasurement() / rStatOrgDPO.getEffectiveMeasurement().floatValue());
|
||||
rStatEventDPO.setEventMeasurementRatio(Float.parseFloat(value));
|
||||
@@ -194,10 +194,10 @@ public class RStatEventServiceImpl implements RStatEventService {
|
||||
rStatEventDPO.setEventCount(transientStatisData.get(1));
|
||||
rStatEventDPO.setDataType(dataTypeMap.get(DicDataEnum.DISTRIBUTION_POINT.getCode()).getId());
|
||||
if (Objects.isNull(rStatOrgDPO)) {
|
||||
rStatEventDPO.setEventMeasurementRatio(1.00f);
|
||||
rStatEventDPO.setEventMeasurementRatio(0.00f);
|
||||
} else {
|
||||
if (rStatOrgDPO.getEffectiveMeasurement() == 0) {
|
||||
rStatEventDPO.setEventMeasurementRatio(1.00f);
|
||||
rStatEventDPO.setEventMeasurementRatio(0.00f);
|
||||
} else {
|
||||
String value = df.format(rStatEventDPO.getEventMeasurement() / rStatOrgDPO.getEffectiveMeasurement().floatValue());
|
||||
rStatEventDPO.setEventMeasurementRatio(Float.parseFloat(value));
|
||||
@@ -274,10 +274,9 @@ public class RStatEventServiceImpl implements RStatEventService {
|
||||
eq("data_type", dataTypeMap.get(DicDataEnum.MAINNET_POINT.getCode()).getId());
|
||||
List<RStatEventDPO> rStatEventDPO = rStatEventDPOMapper.selectList(rStatEventDPOQueryWrapper);
|
||||
|
||||
|
||||
//求各个类型的平均值
|
||||
Map<String, Double> avgEM = rStatEventDPO.stream()
|
||||
.collect(Collectors.groupingBy(RStatEventDPO::getEventType, Collectors.averagingInt(RStatEventDPO::getEventMeasurement)));
|
||||
.collect(Collectors.groupingBy(RStatEventDPO::getEventType, Collectors.averagingDouble(RStatEventDPO::getEventMeasurement)));
|
||||
|
||||
//event_measurement的和
|
||||
Map<String, Integer> sumEM = rStatEventDPO.stream()
|
||||
@@ -314,16 +313,16 @@ public class RStatEventServiceImpl implements RStatEventService {
|
||||
rStatEventMPO.setDataType(dataTypeMap.get(DicDataEnum.MAINNET_POINT.getCode()).getId());
|
||||
|
||||
if (sumEM.get(dictData.getId()) == 0) {
|
||||
rStatEventMPO.setEventFreq(1.00f);
|
||||
rStatEventMPO.setEventFreq(0.00f);
|
||||
} else {
|
||||
String value = df.format(sumEC.get(dictData.getId()) / sumEM.get(dictData.getId()).floatValue());
|
||||
rStatEventMPO.setEventFreq(Float.parseFloat(value));
|
||||
}
|
||||
if (Objects.isNull(rStatOrgMPO)) {
|
||||
rStatEventMPO.setEventMeasurementRatioAccrued(1.00f);
|
||||
rStatEventMPO.setEventMeasurementRatioAccrued(0.00f);
|
||||
} else {
|
||||
if (rStatOrgMPO.getEffectiveMeasurementAccrued() == 0) {
|
||||
rStatEventMPO.setEventMeasurementRatioAccrued(1.00f);
|
||||
rStatEventMPO.setEventMeasurementRatioAccrued(0.00f);
|
||||
} else {
|
||||
String value = df.format(statisData / rStatOrgMPO.getEffectiveMeasurementAccrued().floatValue());
|
||||
rStatEventMPO.setEventMeasurementRatioAccrued(Float.parseFloat(value));
|
||||
@@ -367,7 +366,7 @@ public class RStatEventServiceImpl implements RStatEventService {
|
||||
|
||||
//求各个类型的平均值
|
||||
Map<String, Double> avgEM = rStatEventDPO.stream()
|
||||
.collect(Collectors.groupingBy(RStatEventDPO::getEventType, Collectors.averagingInt(RStatEventDPO::getEventMeasurement)));
|
||||
.collect(Collectors.groupingBy(RStatEventDPO::getEventType, Collectors.averagingDouble(RStatEventDPO::getEventMeasurement)));
|
||||
|
||||
//event_measurement的和
|
||||
Map<String, Integer> sumEM = rStatEventDPO.stream()
|
||||
@@ -404,16 +403,16 @@ public class RStatEventServiceImpl implements RStatEventService {
|
||||
rStatEventMPO.setDataType(dataTypeMap.get(DicDataEnum.DISTRIBUTION_POINT.getCode()).getId());
|
||||
|
||||
if (sumEM.get(dictData.getId()) == 0) {
|
||||
rStatEventMPO.setEventFreq(1.00f);
|
||||
rStatEventMPO.setEventFreq(0.00f);
|
||||
} else {
|
||||
String value = df.format(sumEC.get(dictData.getId()) / sumEM.get(dictData.getId()).floatValue());
|
||||
rStatEventMPO.setEventFreq(Float.parseFloat(value));
|
||||
}
|
||||
if (Objects.isNull(rStatOrgMPO)) {
|
||||
rStatEventMPO.setEventMeasurementRatioAccrued(1.00f);
|
||||
rStatEventMPO.setEventMeasurementRatioAccrued(0.00f);
|
||||
} else {
|
||||
if (rStatOrgMPO.getEffectiveMeasurementAccrued() == 0) {
|
||||
rStatEventMPO.setEventMeasurementRatioAccrued(1.00f);
|
||||
rStatEventMPO.setEventMeasurementRatioAccrued(0.00f);
|
||||
} else {
|
||||
String value = df.format(statisData / rStatOrgMPO.getEffectiveMeasurementAccrued().floatValue());
|
||||
rStatEventMPO.setEventMeasurementRatioAccrued(Float.parseFloat(value));
|
||||
@@ -547,16 +546,16 @@ public class RStatEventServiceImpl implements RStatEventService {
|
||||
rStatEventQPO.setDataType(dataTypeMap.get(DicDataEnum.MAINNET_POINT.getCode()).getId());
|
||||
|
||||
if (sumEM.get(dictData.getId()) == 0) {
|
||||
rStatEventQPO.setEventFreq(1.00f);
|
||||
rStatEventQPO.setEventFreq(0.00f);
|
||||
} else {
|
||||
String value = df.format(sumEC.get(dictData.getId()) / sumEM.get(dictData.getId()).floatValue());
|
||||
rStatEventQPO.setEventFreq(Float.parseFloat(value));
|
||||
}
|
||||
if (Objects.isNull(rStatOrgQPO)) {
|
||||
rStatEventQPO.setEventMeasurementRatioAccrued(1.00f);
|
||||
rStatEventQPO.setEventMeasurementRatioAccrued(0.00f);
|
||||
} else {
|
||||
if (rStatOrgQPO.getEffectiveMeasurementAccrued() == 0) {
|
||||
rStatEventQPO.setEventMeasurementRatioAccrued(1.00f);
|
||||
rStatEventQPO.setEventMeasurementRatioAccrued(0.00f);
|
||||
} else {
|
||||
String value = df.format(statisData / rStatOrgQPO.getEffectiveMeasurementAccrued().floatValue());
|
||||
rStatEventQPO.setEventMeasurementRatioAccrued(Float.parseFloat(value));
|
||||
@@ -651,16 +650,16 @@ public class RStatEventServiceImpl implements RStatEventService {
|
||||
rStatEventQPO.setDataType(dataTypeMap.get(DicDataEnum.DISTRIBUTION_POINT.getCode()).getId());
|
||||
|
||||
if (sumEM.get(dictData.getId()) == 0) {
|
||||
rStatEventQPO.setEventFreq(1.00f);
|
||||
rStatEventQPO.setEventFreq(0.00f);
|
||||
} else {
|
||||
String value = df.format(sumEC.get(dictData.getId()) / sumEM.get(dictData.getId()).floatValue());
|
||||
rStatEventQPO.setEventFreq(Float.parseFloat(value));
|
||||
}
|
||||
if (Objects.isNull(rStatOrgQPO)) {
|
||||
rStatEventQPO.setEventMeasurementRatioAccrued(1.00f);
|
||||
rStatEventQPO.setEventMeasurementRatioAccrued(0.00f);
|
||||
} else {
|
||||
if (rStatOrgQPO.getEffectiveMeasurementAccrued() == 0) {
|
||||
rStatEventQPO.setEventMeasurementRatioAccrued(1.00f);
|
||||
rStatEventQPO.setEventMeasurementRatioAccrued(0.00f);
|
||||
} else {
|
||||
String value = df.format(statisData / rStatOrgQPO.getEffectiveMeasurementAccrued().floatValue());
|
||||
rStatEventQPO.setEventMeasurementRatioAccrued(Float.parseFloat(value));
|
||||
@@ -794,16 +793,16 @@ public class RStatEventServiceImpl implements RStatEventService {
|
||||
rStatEventYPO.setDataType(dataTypeMap.get(DicDataEnum.MAINNET_POINT.getCode()).getId());
|
||||
|
||||
if (sumEM.get(dictData.getId()) == 0) {
|
||||
rStatEventYPO.setEventFreq(1.00f);
|
||||
rStatEventYPO.setEventFreq(0.00f);
|
||||
} else {
|
||||
String value = df.format(sumEC.get(dictData.getId()) / sumEM.get(dictData.getId()).floatValue());
|
||||
rStatEventYPO.setEventFreq(Float.parseFloat(value));
|
||||
}
|
||||
if (Objects.isNull(rStatOrgYPO)) {
|
||||
rStatEventYPO.setEventMeasurementRatioAccrued(1.00f);
|
||||
rStatEventYPO.setEventMeasurementRatioAccrued(0.00f);
|
||||
} else {
|
||||
if (rStatOrgYPO.getEffectiveMeasurementAccrued() == 0) {
|
||||
rStatEventYPO.setEventMeasurementRatioAccrued(1.00f);
|
||||
rStatEventYPO.setEventMeasurementRatioAccrued(0.00f);
|
||||
} else {
|
||||
String value = df.format(statisData / rStatOrgYPO.getEffectiveMeasurementAccrued().floatValue());
|
||||
rStatEventYPO.setEventMeasurementRatioAccrued(Float.parseFloat(value));
|
||||
@@ -899,16 +898,16 @@ public class RStatEventServiceImpl implements RStatEventService {
|
||||
rStatEventYPO.setDataType(dataTypeMap.get(DicDataEnum.DISTRIBUTION_POINT.getCode()).getId());
|
||||
|
||||
if (sumEM.get(dictData.getId()) == 0) {
|
||||
rStatEventYPO.setEventFreq(1.00f);
|
||||
rStatEventYPO.setEventFreq(0.00f);
|
||||
} else {
|
||||
String value = df.format(sumEC.get(dictData.getId()) / sumEM.get(dictData.getId()).floatValue());
|
||||
rStatEventYPO.setEventFreq(Float.parseFloat(value));
|
||||
}
|
||||
if (Objects.isNull(rStatOrgYPO)) {
|
||||
rStatEventYPO.setEventMeasurementRatioAccrued(1.00f);
|
||||
rStatEventYPO.setEventMeasurementRatioAccrued(0.00f);
|
||||
} else {
|
||||
if (rStatOrgYPO.getEffectiveMeasurementAccrued() == 0) {
|
||||
rStatEventYPO.setEventMeasurementRatioAccrued(1.00f);
|
||||
rStatEventYPO.setEventMeasurementRatioAccrued(0.00f);
|
||||
} else {
|
||||
String value = df.format(statisData / rStatOrgYPO.getEffectiveMeasurementAccrued().floatValue());
|
||||
rStatEventYPO.setEventMeasurementRatioAccrued(Float.parseFloat(value));
|
||||
|
||||
Reference in New Issue
Block a user