From 96c72acf723e4129a23c2ec09eec6e00f15ce86c Mon Sep 17 00:00:00 2001 From: chendaofei <857448963@qq.com> Date: Wed, 15 Jan 2025 19:39:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../detection/handler/SocketDevResponseService.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java b/detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java index ffa90ee3..e18cb6da 100644 --- a/detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java +++ b/detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java @@ -459,7 +459,7 @@ public class SocketDevResponseService { private BigDecimal rangeNum(double num1, double num2) { double diff = Math.abs(num1 - num2); double larger = Math.max(num1, num2); - return BigDecimal.valueOf(diff / larger).setScale(4, RoundingMode.HALF_UP); + return BigDecimal.valueOf(diff / larger).multiply(BigDecimal.valueOf(100)).setScale(4, RoundingMode.HALF_UP); } @@ -524,9 +524,9 @@ public class SocketDevResponseService { coefficientVO.setAV(rangeNum(optionalA, devParameter.getDevVolt()).toString()); coefficientVO.setBV(rangeNum(optionalB, devParameter.getDevVolt()).toString()); coefficientVO.setCV(rangeNum(optionalC, devParameter.getDevVolt()).toString()); - coefficientVO.setAI(rangeNum(optionalIA, devParameter.getDevVolt()).toString()); - coefficientVO.setBI(rangeNum(optionalIB, devParameter.getDevVolt()).toString()); - coefficientVO.setCI(rangeNum(optionalIC, devParameter.getDevVolt()).toString()); + coefficientVO.setAI(rangeNum(optionalIA, devParameter.getDevCurr()).toString()); + coefficientVO.setBI(rangeNum(optionalIB, devParameter.getDevCurr()).toString()); + coefficientVO.setCI(rangeNum(optionalIC, devParameter.getDevCurr()).toString()); if ("不合格".equals(coefficientVO.getAVuXi()) || "不合格".equals(coefficientVO.getBVuXi()) || "不合格".equals(coefficientVO.getCVuXi()) || "不合格".equals(coefficientVO.getAIeXi()) || "不合格".equals(coefficientVO.getBIeXi()) || "不合格".equals(coefficientVO.getCIeXi())) { coefficientVO.setResultFlag(0);