This commit is contained in:
caozehui
2026-05-07 09:03:34 +08:00
parent 08dff063c9
commit 1894cb07a2

View File

@@ -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) {