有功功率趋势BUG迭代
This commit is contained in:
@@ -29,6 +29,7 @@ import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.stereotype.Service;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import java.io.IOException;
|
||||
import java.lang.reflect.Field;
|
||||
import java.text.DecimalFormat;
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
@@ -71,6 +72,7 @@ public class PowerStatisticsServiceImpl implements PowerStatisticsService {
|
||||
//执行完就可以获取到区间数据了
|
||||
RActivePowerRangePO rActivePowerRangePO = rActivePowerRangeFeignClient.getDataByLineId(powerStatisticsParam.getLineId(),
|
||||
powerStatisticsParam.getSearchBeginTime(),powerStatisticsParam.getSearchEndTime()).getData();
|
||||
//如果的确没有统计到数据则默认
|
||||
if(rActivePowerRangePO == null){
|
||||
rActivePowerRangePO = new RActivePowerRangePO();
|
||||
}
|
||||
@@ -98,253 +100,40 @@ public class PowerStatisticsServiceImpl implements PowerStatisticsService {
|
||||
|
||||
@Override
|
||||
public List<PowerStatisticsTargetVO> getTargetLimitById(PowerStatisticsParam powerStatisticsParam) {
|
||||
List<PowerStatisticsTargetVO> data = new ArrayList<>();
|
||||
List<PowerStatisticsTargetVO> record = new ArrayList<>();
|
||||
RActivePowerRangeParam rActivePowerRangeParam = new RActivePowerRangeParam();
|
||||
BeanUtil.copyProperties(powerStatisticsParam, rActivePowerRangeParam);
|
||||
rActivePowerRangeParam.setSearch(true);
|
||||
//重点说明:powerStatisticsTargetVO结构(维度)为:time可能多组相同,取决于功率表data_harmpower_p中的相别及统计方式,标识每个指标是否越限,总之一句话:每条数据当前时间中八个指标是否越限及他们的相别和统计方式是什么
|
||||
//基于record结构需要做维度的转换
|
||||
List<PowerStatisticsTargetVO> record = rActivePowerRangeFeignClient.record(rActivePowerRangeParam).getData();
|
||||
//根据时间分组:
|
||||
Map<String,List<PowerStatisticsTargetVO>> map = record.stream().collect(Collectors.groupingBy(PowerStatisticsTargetVO::getTime));
|
||||
map.forEach((key, value) ->{
|
||||
PowerStatisticsTargetVO powerStatisticsTargetVO = new PowerStatisticsTargetVO();
|
||||
powerStatisticsTargetVO.setTime(key);
|
||||
powerStatisticsTargetVO.setField(powerStatisticsParam.getField());
|
||||
//各指标越限的相别及统计方式集合
|
||||
List<Map<String,String>> pvs = new ArrayList<>();
|
||||
//遍历当前时间下的区间指标(注意:可能多组只是说统计方式和相别不同)
|
||||
for(PowerStatisticsTargetVO vo : value){
|
||||
//以下这些判断只要有一个指标越限了(不管是什么统计方式和相别)直接标识该指标越限(这些字段用于前端展示)
|
||||
if(vo.getVoltageOffset().intValue() == 1) powerStatisticsTargetVO.setVoltageOffset(1);
|
||||
if(vo.getVTimes().intValue() == 1) powerStatisticsTargetVO.setVTimes(1);
|
||||
if(vo.getITimes().intValue() == 1) powerStatisticsTargetVO.setITimes(1);
|
||||
if(vo.getUbalance().intValue() == 1) powerStatisticsTargetVO.setUbalance(1);
|
||||
if(vo.getVoltageFluctuation().intValue() == 1) powerStatisticsTargetVO.setVoltageFluctuation(1);
|
||||
if(vo.getFlicker().intValue() == 1) powerStatisticsTargetVO.setFlicker(1);
|
||||
if(vo.getInterHarmonic().intValue() == 1) powerStatisticsTargetVO.setInterHarmonic(1);
|
||||
if(vo.getSequenceCurrentUnbalance().intValue() == 1) powerStatisticsTargetVO.setSequenceCurrentUnbalance(1);
|
||||
//以下逻辑用于前端点击指标时能看到指标具体的越限情况(比方说A相AVG越限了)
|
||||
Map<String,String> pv = new HashMap<>();
|
||||
pv.put(vo.getPhasicType(),vo.getValueType());
|
||||
//除了带有谐波次数的指标需要特殊处理其他正常添加到pvs中
|
||||
if(vo.getVoltageOffsetData()!=null) pv.put(Param.voltageOffset,df.format(vo.getVoltageOffsetData()));
|
||||
if(vo.getUbalanceData()!=null) pv.put(Param.ubalance,df.format(vo.getUbalanceData()));
|
||||
if(vo.getVoltageFluctuationData()!=null) pv.put(Param.voltageFluctuation,df.format(vo.getVoltageFluctuationData()));
|
||||
if(vo.getFlickerData()!=null) pv.put(Param.flicker,df.format(vo.getFlickerData()));
|
||||
if(vo.getSequenceCurrentUnbalanceData()!=null) pv.put(Param.sequenceCurrentUnbalance,df.format(vo.getSequenceCurrentUnbalanceData()));
|
||||
pvs.add(pv);
|
||||
}
|
||||
powerStatisticsTargetVO.setVoltageOffsetList(initPV(pvs,Param.voltageOffset,value.get(0).getVoltageOffsetLimit()));
|
||||
//谐波电压带有谐波次数需要特殊处理
|
||||
powerStatisticsTargetVO.setVTimesList(initFrequencyPV(value,Param.vTimes,value.get(0).getVTimesLimit()));
|
||||
//谐波电流带有谐波次数需要特殊处理
|
||||
powerStatisticsTargetVO.setITimestList(initFrequencyPV(value,Param.iTimes,value.get(0).getITimesLimit()));
|
||||
powerStatisticsTargetVO.setUbalanceList(initPV(pvs,Param.ubalance,value.get(0).getUbalanceLimit()));
|
||||
powerStatisticsTargetVO.setVoltageFluctuationList(initPV(pvs,Param.voltageFluctuation,value.get(0).getVoltageFluctuationLimit()));
|
||||
powerStatisticsTargetVO.setFlickerList(initPV(pvs,Param.flicker,value.get(0).getFlickerLimit()));
|
||||
//间谐波电压含有率带有谐波次数需要特殊处理
|
||||
powerStatisticsTargetVO.setInterHarmonicList(initFrequencyPV(value,Param.interHarmonic,value.get(0).getInterHarmonicLimit()));
|
||||
powerStatisticsTargetVO.setSequenceCurrentUnbalanceList(initPV(pvs,Param.sequenceCurrentUnbalance,value.get(0).getSequenceCurrentUnbalanceLimit()));
|
||||
powerStatisticsTargetVO.setVTimesList(formatFrequency(powerStatisticsTargetVO.getVTimesList()));
|
||||
powerStatisticsTargetVO.setITimestList(formatFrequency(powerStatisticsTargetVO.getITimestList()));
|
||||
powerStatisticsTargetVO.setInterHarmonicList(formatFrequency(powerStatisticsTargetVO.getInterHarmonicList()));
|
||||
data.add(powerStatisticsTargetVO);
|
||||
});
|
||||
|
||||
return data.stream().sorted(Comparator.comparing(PowerStatisticsTargetVO::getTime)).collect(Collectors.toList());
|
||||
}
|
||||
|
||||
private List<ThdDataVO> formatFrequency(List<ThdDataVO> thdDataVOS){
|
||||
List<ThdDataVO> data = new ArrayList<>();
|
||||
for(ThdDataVO thdDataVO : thdDataVOS){
|
||||
boolean isOk = false;
|
||||
if(thdDataVO.getMINPhaseA()!= null && Float.parseFloat(thdDataVO.getMINPhaseA())>thdDataVO.getLimit()) isOk = true;
|
||||
if(thdDataVO.getMINPhaseB()!= null && Float.parseFloat(thdDataVO.getMINPhaseB())>thdDataVO.getLimit()) isOk = true;
|
||||
if(thdDataVO.getMINPhaseC()!= null && Float.parseFloat(thdDataVO.getMINPhaseC())>thdDataVO.getLimit()) isOk = true;
|
||||
if(thdDataVO.getMAXPhaseA()!= null && Float.parseFloat(thdDataVO.getMAXPhaseA())>thdDataVO.getLimit()) isOk = true;
|
||||
if(thdDataVO.getMAXPhaseB()!= null && Float.parseFloat(thdDataVO.getMAXPhaseB())>thdDataVO.getLimit()) isOk = true;
|
||||
if(thdDataVO.getMAXPhaseC()!= null && Float.parseFloat(thdDataVO.getMAXPhaseC())>thdDataVO.getLimit()) isOk = true;
|
||||
if(thdDataVO.getAVGPhaseA()!= null && Float.parseFloat(thdDataVO.getAVGPhaseA())>thdDataVO.getLimit()) isOk = true;
|
||||
if(thdDataVO.getAVGPhaseB()!= null && Float.parseFloat(thdDataVO.getAVGPhaseB())>thdDataVO.getLimit()) isOk = true;
|
||||
if(thdDataVO.getAVGPhaseC()!= null && Float.parseFloat(thdDataVO.getAVGPhaseC())>thdDataVO.getLimit()) isOk = true;
|
||||
if(thdDataVO.getCP95PhaseA()!= null && Float.parseFloat(thdDataVO.getCP95PhaseA())>thdDataVO.getLimit()) isOk = true;
|
||||
if(thdDataVO.getCP95PhaseB()!= null && Float.parseFloat(thdDataVO.getCP95PhaseB())>thdDataVO.getLimit()) isOk = true;
|
||||
if(thdDataVO.getCP95PhaseC()!= null && Float.parseFloat(thdDataVO.getCP95PhaseC())>thdDataVO.getLimit()) isOk = true;
|
||||
if(isOk){
|
||||
data.add(thdDataVO);
|
||||
RActivePowerRangePO rActivePowerRangePO = rActivePowerRangeFeignClient.getDataByLineId(powerStatisticsParam.getLineId(),
|
||||
powerStatisticsParam.getSearchBeginTime(),powerStatisticsParam.getSearchEndTime()).getData();
|
||||
if(rActivePowerRangePO != null){
|
||||
String times = reflexObjValue(rActivePowerRangePO,"minsTime"+powerStatisticsParam.getField()).toString().replace("null","");
|
||||
rActivePowerRangeParam.setSearchTimeFort(false);
|
||||
for(String se : times.split("&")){
|
||||
String startTime = se.split(",")[0];
|
||||
String endTime = se.split(",")[1];
|
||||
rActivePowerRangeParam.setSearchBeginTime(startTime);
|
||||
rActivePowerRangeParam.setSearchEndTime(endTime);
|
||||
record.addAll(rActivePowerRangeFeignClient.record(rActivePowerRangeParam).getData());
|
||||
}
|
||||
}
|
||||
return data;
|
||||
return record.stream().sorted(Comparator.comparing(PowerStatisticsTargetVO::getTime)).collect(Collectors.toList());
|
||||
|
||||
}
|
||||
|
||||
private List<ThdDataVO> initPV(List<Map<String,String>> pv, String name, Float limit){
|
||||
List<ThdDataVO> thdDataVOS = new ArrayList<>();
|
||||
ThdDataVO tdv = new ThdDataVO();
|
||||
tdv.setAnotherName(name);
|
||||
tdv.setLimit(limit);
|
||||
//便利统计方式和相别集合渲染对应字段
|
||||
for(Map<String,String> arr :pv){
|
||||
arr.forEach((phasicType, valueType) ->{
|
||||
switch (valueType){
|
||||
case InfluxDBTableConstant.AVG:
|
||||
switch (phasicType){
|
||||
case InfluxDBTableConstant.PHASE_TYPE_A:
|
||||
tdv.setAVGPhaseA(arr.get(name));
|
||||
break;
|
||||
case InfluxDBTableConstant.PHASE_TYPE_B:
|
||||
tdv.setAVGPhaseB(arr.get(name));
|
||||
break;
|
||||
case InfluxDBTableConstant.PHASE_TYPE_C:
|
||||
tdv.setAVGPhaseC(arr.get(name));
|
||||
break;
|
||||
}
|
||||
break;
|
||||
case InfluxDBTableConstant.CP95:
|
||||
switch (phasicType){
|
||||
case InfluxDBTableConstant.PHASE_TYPE_A:
|
||||
tdv.setCP95PhaseA(arr.get(name));
|
||||
break;
|
||||
case InfluxDBTableConstant.PHASE_TYPE_B:
|
||||
tdv.setCP95PhaseB(arr.get(name));
|
||||
break;
|
||||
case InfluxDBTableConstant.PHASE_TYPE_C:
|
||||
tdv.setCP95PhaseC(arr.get(name));
|
||||
break;
|
||||
}
|
||||
break;
|
||||
case InfluxDBTableConstant.MIN:
|
||||
switch (phasicType){
|
||||
case InfluxDBTableConstant.PHASE_TYPE_A:
|
||||
tdv.setMINPhaseA(arr.get(name));
|
||||
break;
|
||||
case InfluxDBTableConstant.PHASE_TYPE_B:
|
||||
tdv.setMINPhaseB(arr.get(name));
|
||||
break;
|
||||
case InfluxDBTableConstant.PHASE_TYPE_C:
|
||||
tdv.setMINPhaseC(arr.get(name));
|
||||
break;
|
||||
}
|
||||
break;
|
||||
case InfluxDBTableConstant.MAX:
|
||||
switch (phasicType){
|
||||
case InfluxDBTableConstant.PHASE_TYPE_A:
|
||||
tdv.setMAXPhaseA(arr.get(name));
|
||||
break;
|
||||
case InfluxDBTableConstant.PHASE_TYPE_B:
|
||||
tdv.setMAXPhaseB(arr.get(name));
|
||||
break;
|
||||
case InfluxDBTableConstant.PHASE_TYPE_C:
|
||||
tdv.setMAXPhaseC(arr.get(name));
|
||||
break;
|
||||
}
|
||||
break;
|
||||
}
|
||||
});
|
||||
}
|
||||
//如果所有的相别和统计方式都没有值则可直接忽略该条数据
|
||||
if(tdv.getAVGPhaseA() != null || tdv.getAVGPhaseB() != null
|
||||
|| tdv.getAVGPhaseC() != null || tdv.getCP95PhaseA() != null
|
||||
|| tdv.getCP95PhaseB() != null || tdv.getCP95PhaseC() != null
|
||||
|| tdv.getMINPhaseA() != null || tdv.getMINPhaseB() != null
|
||||
|| tdv.getMINPhaseC() != null || tdv.getMAXPhaseA() != null
|
||||
|| tdv.getMAXPhaseB() != null || tdv.getMAXPhaseC() != null){
|
||||
thdDataVOS.add(tdv);
|
||||
}
|
||||
return thdDataVOS;
|
||||
}
|
||||
|
||||
private List<Double> getFrequencyData(List<PowerStatisticsTargetVO> pv,String valueType,String phasicType,String name){
|
||||
//根据不同的相别及统计方式分别获取该时间组下区间指标集合的具体值
|
||||
List<PowerStatisticsTargetVO> data = pv.stream().filter(param->phasicType.equals(param.getPhasicType()) && valueType.equals(param.getValueType())).collect(Collectors.toList());
|
||||
if(!data.isEmpty()){
|
||||
switch (name){
|
||||
case Param.vTimes:
|
||||
return data.get(0).getVTimesData();
|
||||
case Param.iTimes:
|
||||
return data.get(0).getITimesData();
|
||||
case Param.interHarmonic:
|
||||
return data.get(0).getInterHarmonicData();
|
||||
}
|
||||
//反射获取值
|
||||
private Object reflexObjValue(Object obj, String fieldName) {
|
||||
try {
|
||||
Class clazz = obj.getClass();
|
||||
Field field = clazz.getDeclaredField(fieldName);
|
||||
field.setAccessible(true);
|
||||
return field.get(obj);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
private String frequencyPVList(List<Double> data,int index){
|
||||
try {
|
||||
return df.format(data.get(index));
|
||||
} catch (Exception e) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
private List<ThdDataVO> initFrequencyPV(List<PowerStatisticsTargetVO> pv, String name, List<Float> limit){
|
||||
List<ThdDataVO> thdDataVOS = new ArrayList<>();
|
||||
if(!limit.isEmpty()){
|
||||
//根据不同的相别及统计方式分别获取该时间组下区间指标集合的具体值
|
||||
List<Double> avgA = getFrequencyData(pv,InfluxDBTableConstant.AVG,InfluxDBTableConstant.PHASE_TYPE_A,name);
|
||||
List<Double> avgB = getFrequencyData(pv,InfluxDBTableConstant.AVG,InfluxDBTableConstant.PHASE_TYPE_B,name);
|
||||
List<Double> avgC = getFrequencyData(pv,InfluxDBTableConstant.AVG,InfluxDBTableConstant.PHASE_TYPE_C,name);
|
||||
List<Double> cp94A = getFrequencyData(pv,InfluxDBTableConstant.CP95,InfluxDBTableConstant.PHASE_TYPE_A,name);
|
||||
List<Double> cp94B = getFrequencyData(pv,InfluxDBTableConstant.CP95,InfluxDBTableConstant.PHASE_TYPE_B,name);
|
||||
List<Double> cp94C = getFrequencyData(pv,InfluxDBTableConstant.CP95,InfluxDBTableConstant.PHASE_TYPE_C,name);
|
||||
List<Double> minA = getFrequencyData(pv,InfluxDBTableConstant.MIN,InfluxDBTableConstant.PHASE_TYPE_A,name);
|
||||
List<Double> minB = getFrequencyData(pv,InfluxDBTableConstant.MIN,InfluxDBTableConstant.PHASE_TYPE_B,name);
|
||||
List<Double> minC = getFrequencyData(pv,InfluxDBTableConstant.MIN,InfluxDBTableConstant.PHASE_TYPE_C,name);
|
||||
List<Double> maxA = getFrequencyData(pv,InfluxDBTableConstant.MAX,InfluxDBTableConstant.PHASE_TYPE_A,name);
|
||||
List<Double> maxB = getFrequencyData(pv,InfluxDBTableConstant.MAX,InfluxDBTableConstant.PHASE_TYPE_B,name);
|
||||
List<Double> maxC = getFrequencyData(pv,InfluxDBTableConstant.MAX,InfluxDBTableConstant.PHASE_TYPE_C,name);
|
||||
int k = 0,j = 0;
|
||||
double c = 0;
|
||||
switch (name){
|
||||
//谐波电压和电流默认谐波次数2-25
|
||||
case Param.vTimes:
|
||||
case Param.iTimes:
|
||||
k = 2;
|
||||
j = 25;
|
||||
break;
|
||||
//间谐波电压含有率默认谐波次数1-16
|
||||
case Param.interHarmonic:
|
||||
k = 1;
|
||||
j = 16;
|
||||
c = 0.5;
|
||||
break;
|
||||
}
|
||||
for (int i = k; i <= j; i++) {
|
||||
ThdDataVO tdv = new ThdDataVO();
|
||||
tdv.setAnotherName(name +(((i-c)+"").replace(".0",""))+"次");
|
||||
try {
|
||||
tdv.setLimit(limit.get(i-k));
|
||||
//frequencyPVList次方法提提高容灾,如果真的出现数组越界只有一种情况:有些有功功率查不到对应的某些指标数据
|
||||
tdv.setAVGPhaseA(frequencyPVList(avgA,i-k));
|
||||
tdv.setAVGPhaseB(frequencyPVList(avgB,i-k));
|
||||
tdv.setAVGPhaseC(frequencyPVList(avgC,i-k));
|
||||
tdv.setCP95PhaseA(frequencyPVList(cp94A,i-k));
|
||||
tdv.setCP95PhaseB(frequencyPVList(cp94B,i-k));
|
||||
tdv.setCP95PhaseC(frequencyPVList(cp94C,i-k));
|
||||
tdv.setMINPhaseA(frequencyPVList(minA,i-k));
|
||||
tdv.setMINPhaseB(frequencyPVList(minB,i-k));
|
||||
tdv.setMINPhaseC(frequencyPVList(minC,i-k));
|
||||
tdv.setMAXPhaseA(frequencyPVList(maxA,i-k));
|
||||
tdv.setMAXPhaseB(frequencyPVList(maxB,i-k));
|
||||
tdv.setMAXPhaseC(frequencyPVList(maxC,i-k));
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
//如果所有的相别和统计方式都没有值则可直接忽略该条数据
|
||||
if(tdv.getAVGPhaseA() != null || tdv.getAVGPhaseB() != null
|
||||
|| tdv.getAVGPhaseC() != null || tdv.getCP95PhaseA() != null
|
||||
|| tdv.getCP95PhaseB() != null || tdv.getCP95PhaseC() != null
|
||||
|| tdv.getMINPhaseA() != null || tdv.getMINPhaseB() != null
|
||||
|| tdv.getMINPhaseC() != null || tdv.getMAXPhaseA() != null
|
||||
|| tdv.getMAXPhaseB() != null || tdv.getMAXPhaseC() != null){
|
||||
thdDataVOS.add(tdv);
|
||||
}
|
||||
}
|
||||
}
|
||||
return thdDataVOS;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<ThdDataVO> getTargetByTime(PowerStatisticsParam powerStatisticsParam) {
|
||||
List<ThdDataVO> result = new ArrayList();
|
||||
|
||||
Reference in New Issue
Block a user