From 76a571921a9ef6b43a5bcfa8b50c87c84a8580d7 Mon Sep 17 00:00:00 2001 From: chendaofei <857448963@qq.com> Date: Mon, 23 Jun 2025 20:00:40 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=A3=80=E6=B5=8B=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../handler/SocketDevResponseService.java | 41 +++++++++++-------- .../handler/SocketSourceResponseService.java | 4 +- 2 files changed, 26 insertions(+), 19 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 1f80e438..94352381 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 @@ -283,19 +283,26 @@ public class SocketDevResponseService { if (ObjectUtil.isNotNull(dictDataEnumByCode)) { switch (dictDataEnumByCode) { case SUCCESS: - FormalTestManager.realDataXiList.add(devData); - successComm.add(devData.getId()); - System.out.println(successComm.size() + " ==" + FormalTestManager.monitorIdListComm.size() + "FormalTestManager.realDataXiList:" + FormalTestManager.realDataXiList.size() + "当前步骤" + XiNumberManager.stepNumber); - if (successComm.size() == FormalTestManager.monitorIdListComm.size()) { - processData(param, xiSocket); + if (devData.getResult()) { + FormalTestManager.realDataXiList.add(devData); + successComm.add(devData.getId()); + System.out.println(successComm.size() + " ==" + FormalTestManager.monitorIdListComm.size() + "FormalTestManager.realDataXiList:" + FormalTestManager.realDataXiList.size() + "当前步骤" + XiNumberManager.stepNumber); + if (successComm.size() == FormalTestManager.monitorIdListComm.size()) { + processData(param, xiSocket); + } + }else { + System.out.println("系数校准抛除数据"+devData); } - break; case UNPROCESSED_BUSINESS: WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(socketDataMsg)); break; case NORMAL_RESPONSE: - FormalTestManager.realDataXiList.add(devData); + if (devData.getResult()) { + FormalTestManager.realDataXiList.add(devData); + }else { + System.out.println("系数校准抛除数据"+devData); + } break; default: xiSocket.setRequestId(socketDataMsg.getRequestId()); @@ -603,19 +610,19 @@ public class SocketDevResponseService { } private void assemblyEntity(List deList, DevXiNumData.F F, DevXiNumData.GF startF, CoefficientVO coefficientVO, CoefficientVO.DevParameter devParameter) { - //表示接收完成,必须保证10个数 - if (deList.size() >= 10) { - List aList = deList.stream().map(it -> it.getSqlData().get(0).getList().getA()).sorted().collect(Collectors.toList()); - List bList = deList.stream().map(it -> it.getSqlData().get(0).getList().getB()).sorted().collect(Collectors.toList()); - List cList = deList.stream().map(it -> it.getSqlData().get(0).getList().getC()).sorted().collect(Collectors.toList()); + //表示接收完成,必须保证3个数 + if (deList.size() >= 3) { + 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()); Double optionalA = reduceList(aList); Double optionalB = reduceList(bList); Double optionalC = reduceList(cList); - List aIList = deList.stream().map(it -> it.getSqlData().get(1).getList().getA()).sorted().collect(Collectors.toList()); - List bIList = deList.stream().map(it -> it.getSqlData().get(1).getList().getB()).sorted().collect(Collectors.toList()); - List cIList = deList.stream().map(it -> it.getSqlData().get(1).getList().getC()).sorted().collect(Collectors.toList()); + List aIList = deList.stream().map(it -> it.getSqlData().get(1).getList().getA()).collect(Collectors.toList()); + List bIList = deList.stream().map(it -> it.getSqlData().get(1).getList().getB()).collect(Collectors.toList()); + List cIList = deList.stream().map(it -> it.getSqlData().get(1).getList().getC()).collect(Collectors.toList()); Double optionalIA = reduceList(aIList); Double optionalIB = reduceList(bIList); @@ -678,8 +685,8 @@ public class SocketDevResponseService { * 删除集合中前五个数以及最后两个数 */ private Double reduceList(List valList) { - valList.subList(0, 5).clear(); - valList.subList(valList.size() - 3, valList.size() - 1).clear(); + // valList.subList(0, 5).clear(); + // valList.subList(valList.size() - 3, valList.size() - 1).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 a4093c8c..6ab5f773 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 @@ -196,8 +196,8 @@ public class SocketSourceResponseService { DevPhaseSequenceParam phaseSequenceParam = new DevPhaseSequenceParam(); phaseSequenceParam.setMoniterIdList(monitorIdList); phaseSequenceParam.setDataType(Arrays.asList("real$VRMS", "real$IRMS")); - phaseSequenceParam.setReadCount(10); - phaseSequenceParam.setIgnoreCount(0); + phaseSequenceParam.setReadCount(3); + phaseSequenceParam.setIgnoreCount(5); socketMsg.setData(JSON.toJSONString(phaseSequenceParam)); SocketManager.sendMsg(s, JSON.toJSONString(socketMsg));