ClientApps/CN_Gather
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

微调

Browse Source
This commit is contained in:
chendaofei
2025-01-15 19:39:25 +08:00
parent a25e1c7e15
commit 96c72acf72
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java
View File

@@ -459,7 +459,7 @@ public class SocketDevResponseService {
private BigDecimal rangeNum(double num1, double num2) { private BigDecimal rangeNum(double num1, double num2) {
double diff = Math.abs(num1 - num2); double diff = Math.abs(num1 - num2);
double larger = Math.max(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.setAV(rangeNum(optionalA, devParameter.getDevVolt()).toString());
coefficientVO.setBV(rangeNum(optionalB, devParameter.getDevVolt()).toString()); coefficientVO.setBV(rangeNum(optionalB, devParameter.getDevVolt()).toString());
coefficientVO.setCV(rangeNum(optionalC, devParameter.getDevVolt()).toString()); coefficientVO.setCV(rangeNum(optionalC, devParameter.getDevVolt()).toString());
coefficientVO.setAI(rangeNum(optionalIA, devParameter.getDevVolt()).toString()); coefficientVO.setAI(rangeNum(optionalIA, devParameter.getDevCurr()).toString());
coefficientVO.setBI(rangeNum(optionalIB, devParameter.getDevVolt()).toString()); coefficientVO.setBI(rangeNum(optionalIB, devParameter.getDevCurr()).toString());
coefficientVO.setCI(rangeNum(optionalIC, devParameter.getDevVolt()).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())) { if ("不合格".equals(coefficientVO.getAVuXi()) || "不合格".equals(coefficientVO.getBVuXi()) || "不合格".equals(coefficientVO.getCVuXi()) || "不合格".equals(coefficientVO.getAIeXi()) || "不合格".equals(coefficientVO.getBIeXi()) || "不合格".equals(coefficientVO.getCIeXi())) {
coefficientVO.setResultFlag(0); coefficientVO.setResultFlag(0);