From 7fd904ab7960928c358570db0aef509ea37e47a0 Mon Sep 17 00:00:00 2001 From: caozehui <2427765068@qq.com> Date: Wed, 5 Nov 2025 16:02:53 +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 ++-- .../detection/handler/SocketSourceResponseService.java | 6 ++++-- .../gather/report/service/impl/PqReportServiceImpl.java | 4 ++-- 3 files changed, 8 insertions(+), 6 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 2f9ebd86..ac3f037e 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 @@ -628,7 +628,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()); @@ -703,7 +703,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 8ede6657..973fa775 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 @@ -198,8 +198,10 @@ public class SocketSourceResponseService { DevPhaseSequenceParam phaseSequenceParam = new DevPhaseSequenceParam(); phaseSequenceParam.setMoniterIdList(monitorIdList); phaseSequenceParam.setDataType(Arrays.asList("real$VRMS", "real$IRMS")); - phaseSequenceParam.setReadCount(3); - phaseSequenceParam.setIgnoreCount(8); + // 读取3次数据用于系数计算 + phaseSequenceParam.setReadCount(7); //3 + // 忽略前4次数据，等待测量稳定 + phaseSequenceParam.setIgnoreCount(3); //4 socketMsg.setData(JSON.toJSONString(phaseSequenceParam)); SocketManager.sendMsg(s, JSON.toJSONString(socketMsg)); diff --git a/detection/src/main/java/com/njcn/gather/report/service/impl/PqReportServiceImpl.java b/detection/src/main/java/com/njcn/gather/report/service/impl/PqReportServiceImpl.java index 28bf0985..68463f72 100644 --- a/detection/src/main/java/com/njcn/gather/report/service/impl/PqReportServiceImpl.java +++ b/detection/src/main/java/com/njcn/gather/report/service/impl/PqReportServiceImpl.java @@ -602,8 +602,8 @@ public class PqReportServiceImpl extends ServiceImpl i dealDataModel(baseModelDocument, devReportParam, pqDevVO); // 处理需要输出的目录地址 基础路径+设备类型+装置编号.docx // 最终文件输出的路径 - String dirPath = reportPath.concat(File.separator).concat(devType.getName()); -// String dirPath = reportPath; +// String dirPath = reportPath.concat(File.separator).concat(devType.getName()); + String dirPath = reportPath; // 确保目录存在 ensureDirectoryExists(dirPath); String reportFullPath = dirPath.concat(File.separator).concat(pqDevVO.getCreateId()).concat(".docx");