专项分析调整,综合评估调整
This commit is contained in:
@@ -175,6 +175,7 @@ public class DataComAssServiceImpl implements IDataComAssService {
|
|||||||
//************************************频率偏差********************************************
|
//************************************频率偏差********************************************
|
||||||
lineParam.setColumnName("freq_dev");
|
lineParam.setColumnName("freq_dev");
|
||||||
lineParam.setGe("0.3");
|
lineParam.setGe("0.3");
|
||||||
|
lineParam.setGe(null);
|
||||||
Integer freqDev1 = dataVFeignClient.getColumnNameCountRawData(lineParam).getData();
|
Integer freqDev1 = dataVFeignClient.getColumnNameCountRawData(lineParam).getData();
|
||||||
|
|
||||||
lineParam.setGe("0.2");
|
lineParam.setGe("0.2");
|
||||||
@@ -210,6 +211,7 @@ public class DataComAssServiceImpl implements IDataComAssService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
lineParam.setGe("6");
|
lineParam.setGe("6");
|
||||||
|
lineParam.setLt(null);
|
||||||
Integer vThd1 = dataVFeignClient.getColumnNameCountRawData(lineParam).getData();
|
Integer vThd1 = dataVFeignClient.getColumnNameCountRawData(lineParam).getData();
|
||||||
|
|
||||||
lineParam.setGe("4");
|
lineParam.setGe("4");
|
||||||
@@ -243,6 +245,7 @@ public class DataComAssServiceImpl implements IDataComAssService {
|
|||||||
}
|
}
|
||||||
lineParam.setPhasicType(Collections.singletonList("T"));
|
lineParam.setPhasicType(Collections.singletonList("T"));
|
||||||
lineParam.setGe("4");
|
lineParam.setGe("4");
|
||||||
|
lineParam.setLt(null);
|
||||||
Integer vUnbalance1 = dataVFeignClient.getColumnNameCountRawData(lineParam).getData();
|
Integer vUnbalance1 = dataVFeignClient.getColumnNameCountRawData(lineParam).getData();
|
||||||
|
|
||||||
lineParam.setGe("2");
|
lineParam.setGe("2");
|
||||||
@@ -273,6 +276,7 @@ public class DataComAssServiceImpl implements IDataComAssService {
|
|||||||
lineParam.setValueType(null);
|
lineParam.setValueType(null);
|
||||||
lineParam.setPhasicType(Arrays.asList("A", "B", "C"));
|
lineParam.setPhasicType(Arrays.asList("A", "B", "C"));
|
||||||
lineParam.setGe("0.8");
|
lineParam.setGe("0.8");
|
||||||
|
lineParam.setLt("1");
|
||||||
Integer plt1 = dataFlickerFeignClient.getColumnNameCountRawData(lineParam).getData();
|
Integer plt1 = dataFlickerFeignClient.getColumnNameCountRawData(lineParam).getData();
|
||||||
|
|
||||||
lineParam.setGe("0.6");
|
lineParam.setGe("0.6");
|
||||||
@@ -292,11 +296,11 @@ public class DataComAssServiceImpl implements IDataComAssService {
|
|||||||
Integer plt5 = dataFlickerFeignClient.getColumnNameCountRawData(lineParam).getData();
|
Integer plt5 = dataFlickerFeignClient.getColumnNameCountRawData(lineParam).getData();
|
||||||
BigDecimal pltAll = BigDecimal.valueOf(plt1 + plt2 + plt3 + plt4 + plt5);
|
BigDecimal pltAll = BigDecimal.valueOf(plt1 + plt2 + plt3 + plt4 + plt5);
|
||||||
if (pltAll.compareTo(BigDecimal.ZERO) != 0) {
|
if (pltAll.compareTo(BigDecimal.ZERO) != 0) {
|
||||||
outMap.put("data_plt1", BigDecimal.valueOf(plt1).multiply(hundred).divide(pltAll, 3, RoundingMode.HALF_UP));
|
outMap.put("data_pst1", BigDecimal.valueOf(plt1).multiply(hundred).divide(pltAll, 3, RoundingMode.HALF_UP));
|
||||||
outMap.put("data_plt2", BigDecimal.valueOf(plt2).multiply(hundred).divide(pltAll, 3, RoundingMode.HALF_UP));
|
outMap.put("data_pst2", BigDecimal.valueOf(plt2).multiply(hundred).divide(pltAll, 3, RoundingMode.HALF_UP));
|
||||||
outMap.put("data_plt3", BigDecimal.valueOf(plt3).multiply(hundred).divide(pltAll, 3, RoundingMode.HALF_UP));
|
outMap.put("data_pst3", BigDecimal.valueOf(plt3).multiply(hundred).divide(pltAll, 3, RoundingMode.HALF_UP));
|
||||||
outMap.put("data_plt4", BigDecimal.valueOf(plt4).multiply(hundred).divide(pltAll, 3, RoundingMode.HALF_UP));
|
outMap.put("data_pst4", BigDecimal.valueOf(plt4).multiply(hundred).divide(pltAll, 3, RoundingMode.HALF_UP));
|
||||||
outMap.put("data_plt5", BigDecimal.valueOf(plt5).multiply(hundred).divide(pltAll, 3, RoundingMode.HALF_UP));
|
outMap.put("data_pst5", BigDecimal.valueOf(plt5).multiply(hundred).divide(pltAll, 3, RoundingMode.HALF_UP));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!CollUtil.isEmpty(outMap)) {
|
if (!CollUtil.isEmpty(outMap)) {
|
||||||
|
|||||||
Reference in New Issue
Block a user