From 61f149b5622de572c1b0e3b68fadf68f49966abc Mon Sep 17 00:00:00 2001 From: caozehui <2427765068@qq.com> Date: Wed, 5 Nov 2025 13:51:47 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E6=95=B0=E6=A0=A1=E5=87=86=E6=8E=A5?= =?UTF-8?q?=E6=94=B6=E6=95=B0=E6=8D=AE=E4=B8=AA=E6=95=B0=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gather/detection/handler/SocketDevResponseService.java | 4 ++-- .../gather/detection/handler/SocketSourceResponseService.java | 4 ++-- 2 files 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 8443ae97..a2da2567 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 @@ -612,7 +612,7 @@ public class SocketDevResponseService { private void assemblyEntity(List deList, DevXiNumData.F F, DevXiNumData.GF startF, CoefficientVO coefficientVO, CoefficientVO.DevParameter devParameter) { //表示接收完成,必须保证3个数 - if (deList.size() >= 3) { + if (deList.size() >= 7) { List aList = deList.stream().map(it -> it.getSqlData().get(0).getList().getA()).collect(Collectors.toList()); List bList = deList.stream().map(it -> it.getSqlData().get(0).getList().getB()).collect(Collectors.toList()); List cList = deList.stream().map(it -> it.getSqlData().get(0).getList().getC()).collect(Collectors.toList()); @@ -687,7 +687,7 @@ public class SocketDevResponseService { */ private Double reduceList(List valList) { // valList.subList(0, 5).clear(); - // valList.subList(valList.size() - 3, valList.size() - 1).clear(); + valList.subList(valList.size() - 2, valList.size()).clear(); return valList.stream().mapToDouble(Double::doubleValue).average().getAsDouble(); } diff --git a/detection/src/main/java/com/njcn/gather/detection/handler/SocketSourceResponseService.java b/detection/src/main/java/com/njcn/gather/detection/handler/SocketSourceResponseService.java index 3d6e4a63..c46e3b49 100644 --- a/detection/src/main/java/com/njcn/gather/detection/handler/SocketSourceResponseService.java +++ b/detection/src/main/java/com/njcn/gather/detection/handler/SocketSourceResponseService.java @@ -334,9 +334,9 @@ public class SocketSourceResponseService { // 系数校验固定检测项：实时电压有效值和实时电流有效值 phaseSequenceParam.setDataType(Arrays.asList("real$VRMS", "real$IRMS")); // 读取3次数据用于系数计算 - phaseSequenceParam.setReadCount(3); + phaseSequenceParam.setReadCount(7); //3 // 忽略前4次数据，等待测量稳定 - phaseSequenceParam.setIgnoreCount(4); + phaseSequenceParam.setIgnoreCount(3); //4 socketMsg.setData(JSON.toJSONString(phaseSequenceParam)); SocketManager.sendMsg(s, JSON.toJSONString(socketMsg));