From 1894cb07a23c671d21353c7cbeb55a912d40b31d Mon Sep 17 00:00:00 2001 From: caozehui <2427765068@qq.com> Date: Thu, 7 May 2026 09:03:34 +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 --- .../handler/SocketFreqConverterService.java | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/detection/src/main/java/com/njcn/gather/detection/handler/SocketFreqConverterService.java b/detection/src/main/java/com/njcn/gather/detection/handler/SocketFreqConverterService.java index e7f04dcd..0c96ee1f 100644 --- a/detection/src/main/java/com/njcn/gather/detection/handler/SocketFreqConverterService.java +++ b/detection/src/main/java/com/njcn/gather/detection/handler/SocketFreqConverterService.java @@ -328,14 +328,17 @@ public class SocketFreqConverterService { if (ObjectUtil.isNotNull(this.lastTolerancePoint)) { boolean isNewGroup = this.isNewGroup(this.lastTolerancePoint, newTolerantPointVO); if (isNewGroup) { - if (this.lastTolerancePoint.getTolerant() == 1 && newTolerantPointVO.getTolerant() == 1) { - TolerantPointVO featurePointVO = new TolerantPointVO(); - featurePointVO.setResidualVoltage(this.lastTolerancePoint.getResidualVoltage()); - featurePointVO.setDurationMs(this.lastTolerancePoint.getDurationMs()); - featurePointVO.setTolerant(2); - socketDataMsg.setData(JSON.toJSONString(featurePointVO)); - WebServiceManager.sendMsg(this.userId, JSON.toJSONString(socketDataMsg)); - testRes.setTolerant(2); + // 纵向分组 + if (freqConverterConfig.getDirection() == 1) { + if (this.lastTolerancePoint.getTolerant() == 1 && testRes.getTolerant() == 1) { + TolerantPointVO featurePointVO = new TolerantPointVO(); + featurePointVO.setResidualVoltage(this.lastTolerancePoint.getResidualVoltage()); + featurePointVO.setDurationMs(this.lastTolerancePoint.getDurationMs()); + featurePointVO.setTolerant(2); + socketDataMsg.setData(JSON.toJSONString(featurePointVO)); + WebServiceManager.sendMsg(this.userId, JSON.toJSONString(socketDataMsg)); + testRes.setTolerant(2); + } } } else { if (this.lastTolerancePoint.getTolerant() == 1 && testRes.getTolerant() == 0) {