From ac40e92c79fec6d80ce9c6a48a19174128e288b1 Mon Sep 17 00:00:00 2001 From: chendaofei <857448963@qq.com> Date: Tue, 30 Jun 2026 18:21:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=93=E9=A1=B9=E5=88=86=E6=9E=90=E8=B0=83?= =?UTF-8?q?=E6=95=B4=EF=BC=8C=E7=BB=BC=E5=90=88=E8=AF=84=E4=BC=B0=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/line/DataComAssServiceImpl.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/DataComAssServiceImpl.java b/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/DataComAssServiceImpl.java index 5d18181..476e707 100644 --- a/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/DataComAssServiceImpl.java +++ b/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/DataComAssServiceImpl.java @@ -175,6 +175,7 @@ public class DataComAssServiceImpl implements IDataComAssService { //************************************频率偏差******************************************** lineParam.setColumnName("freq_dev"); lineParam.setGe("0.3"); + lineParam.setGe(null); Integer freqDev1 = dataVFeignClient.getColumnNameCountRawData(lineParam).getData(); lineParam.setGe("0.2"); @@ -210,6 +211,7 @@ public class DataComAssServiceImpl implements IDataComAssService { } lineParam.setGe("6"); + lineParam.setLt(null); Integer vThd1 = dataVFeignClient.getColumnNameCountRawData(lineParam).getData(); lineParam.setGe("4"); @@ -243,6 +245,7 @@ public class DataComAssServiceImpl implements IDataComAssService { } lineParam.setPhasicType(Collections.singletonList("T")); lineParam.setGe("4"); + lineParam.setLt(null); Integer vUnbalance1 = dataVFeignClient.getColumnNameCountRawData(lineParam).getData(); lineParam.setGe("2"); @@ -273,6 +276,7 @@ public class DataComAssServiceImpl implements IDataComAssService { lineParam.setValueType(null); lineParam.setPhasicType(Arrays.asList("A", "B", "C")); lineParam.setGe("0.8"); + lineParam.setLt("1"); Integer plt1 = dataFlickerFeignClient.getColumnNameCountRawData(lineParam).getData(); lineParam.setGe("0.6"); @@ -292,11 +296,11 @@ public class DataComAssServiceImpl implements IDataComAssService { Integer plt5 = dataFlickerFeignClient.getColumnNameCountRawData(lineParam).getData(); BigDecimal pltAll = BigDecimal.valueOf(plt1 + plt2 + plt3 + plt4 + plt5); if (pltAll.compareTo(BigDecimal.ZERO) != 0) { - outMap.put("data_plt1", 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_plt3", 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_plt5", BigDecimal.valueOf(plt5).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_pst2", BigDecimal.valueOf(plt2).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_pst4", BigDecimal.valueOf(plt4).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)) {