修改暂降严重度和暂降热力图接口

This commit is contained in:
Lee
2023-04-10 16:35:47 +08:00
parent 766d824f54
commit 9fc0e6bb41
9 changed files with 161 additions and 111 deletions

View File

@@ -1,6 +1,7 @@
package com.njcn.harmonic.utils;
import cn.hutool.core.collection.CollectionUtil;
import com.njcn.harmonic.pojo.dto.ComAssessDTO;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -65,7 +66,7 @@ public class HarmonicComAssesUtil {
// 综合评估程序,返回值为评估分
public float GetComAsses(float in_data[][]) {
float fResult = 0.0f;//返回最终评分
try{
try {
//实例化所有参数
Assess = new float[ST_QT_NUM][GRADE_NUM];
Weight = new float[ST_QT_NUM][METHOD_NUM];
@@ -88,7 +89,12 @@ public class HarmonicComAssesUtil {
if (getBysxf()) {
//G和F得出综合权重A
if (getZhqzf()) {
A[0] = 0.28f;A[1] = 0.23f;A[2] = 0.13f;A[3] = 0.16f;A[4] = 0.08f;A[5] = 0.12f;
A[0] = 0.28f;
A[1] = 0.23f;
A[2] = 0.13f;
A[3] = 0.16f;
A[4] = 0.08f;
A[5] = 0.12f;
for (i = 0; i < GRADE_NUM; i++) {
B[i] = 0;
for (j = 0; j < ST_QT_NUM; j++) {
@@ -105,34 +111,38 @@ public class HarmonicComAssesUtil {
}
}
}
fResult = FloatUtils.get2Float(fResult);
}catch (Exception e){
//Todo
fResult = FloatUtils.get2Float(fResult);
} catch (Exception e) {
//Todo
}
return fResult;
}
/**
* 大批量的监测点的综合得分获取平均值
*
* @param comAssessDTOS 批量数据
*/
public float getAllComAss(List<ComAssessDTO> comAssessDTOS) {
float allData=0f;
for(int i=0;i<comAssessDTOS.size();i++){
ComAssessDTO tempPqs = comAssessDTOS.get(i);
//组合二维数组
float f1[][]={{tempPqs.getFreqDev1(),tempPqs.getFreqDev2(),tempPqs.getFreqDev3(),tempPqs.getFreqDev4(),tempPqs.getFreqDev5()}
,{tempPqs.getVTHD1(),tempPqs.getVTHD2(),tempPqs.getVTHD3(),tempPqs.getVTHD4(),tempPqs.getVTHD5(),}
,{tempPqs.getDataPlT1(),tempPqs.getDataPlT2(),tempPqs.getDataPlT3(),tempPqs.getDataPlT4(),tempPqs.getDataPlT5()}
,{tempPqs.getVuDev1(),tempPqs.getVuDev2(),tempPqs.getVuDev3(),tempPqs.getVuDev4(),tempPqs.getVuDev5(),}
,{tempPqs.getVUnbalance1(),tempPqs.getVUnbalance2(),tempPqs.getVUnbalance3(),tempPqs.getVUnbalance4(),tempPqs.getVUnbalance5(),}
,{tempPqs.getEvent1(),tempPqs.getEvent2(),tempPqs.getEvent3(),tempPqs.getEvent4(),tempPqs.getEvent5(),}};
//获取该值返回的数据
float temp=GetComAsses(f1);
allData+=temp;
float allData = 0f;
if (CollectionUtil.isNotEmpty(comAssessDTOS)) {
for (int i = 0; i < comAssessDTOS.size(); i++) {
ComAssessDTO tempPqs = comAssessDTOS.get(i);
//组合二维数组
float f1[][] = {{tempPqs.getFreqDev1(), tempPqs.getFreqDev2(), tempPqs.getFreqDev3(), tempPqs.getFreqDev4(), tempPqs.getFreqDev5()}
, {tempPqs.getVTHD1(), tempPqs.getVTHD2(), tempPqs.getVTHD3(), tempPqs.getVTHD4(), tempPqs.getVTHD5(),}
, {tempPqs.getDataPlT1(), tempPqs.getDataPlT2(), tempPqs.getDataPlT3(), tempPqs.getDataPlT4(), tempPqs.getDataPlT5()}
, {tempPqs.getVuDev1(), tempPqs.getVuDev2(), tempPqs.getVuDev3(), tempPqs.getVuDev4(), tempPqs.getVuDev5(),}
, {tempPqs.getVUnbalance1(), tempPqs.getVUnbalance2(), tempPqs.getVUnbalance3(), tempPqs.getVUnbalance4(), tempPqs.getVUnbalance5(),}
, {tempPqs.getEvent1(), tempPqs.getEvent2(), tempPqs.getEvent3(), tempPqs.getEvent4(), tempPqs.getEvent5(),}};
//获取该值返回的数据
float temp = GetComAsses(f1);
allData += temp;
}
float aveData = allData / comAssessDTOS.size();
return FloatUtils.get2Float(aveData);
}
float aveData=allData/comAssessDTOS.size();
return FloatUtils.get2Float(aveData);
return allData;
}