ClientApps/CN_Gather
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

微调

Browse Source
This commit is contained in:
caozehui
2026-05-07 09:03:34 +08:00
parent 08dff063c9
commit 1894cb07a2
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
detection/src/main/java/com/njcn/gather/detection/handler/SocketFreqConverterService.java
View File

@@ -328,14 +328,17 @@ public class SocketFreqConverterService {
if (ObjectUtil.isNotNull(this.lastTolerancePoint)) { if (ObjectUtil.isNotNull(this.lastTolerancePoint)) {
boolean isNewGroup = this.isNewGroup(this.lastTolerancePoint, newTolerantPointVO); boolean isNewGroup = this.isNewGroup(this.lastTolerancePoint, newTolerantPointVO);
if (isNewGroup) { if (isNewGroup) {
if (this.lastTolerancePoint.getTolerant() == 1 && newTolerantPointVO.getTolerant() == 1) { // 纵向分组
TolerantPointVO featurePointVO = new TolerantPointVO(); if (freqConverterConfig.getDirection() == 1) {
featurePointVO.setResidualVoltage(this.lastTolerancePoint.getResidualVoltage()); if (this.lastTolerancePoint.getTolerant() == 1 && testRes.getTolerant() == 1) {
featurePointVO.setDurationMs(this.lastTolerancePoint.getDurationMs()); TolerantPointVO featurePointVO = new TolerantPointVO();
featurePointVO.setTolerant(2); featurePointVO.setResidualVoltage(this.lastTolerancePoint.getResidualVoltage());
socketDataMsg.setData(JSON.toJSONString(featurePointVO)); featurePointVO.setDurationMs(this.lastTolerancePoint.getDurationMs());
WebServiceManager.sendMsg(this.userId, JSON.toJSONString(socketDataMsg)); featurePointVO.setTolerant(2);
testRes.setTolerant(2); socketDataMsg.setData(JSON.toJSONString(featurePointVO));
WebServiceManager.sendMsg(this.userId, JSON.toJSONString(socketDataMsg));
testRes.setTolerant(2);
}
} }
} else { } else {
if (this.lastTolerancePoint.getTolerant() == 1 && testRes.getTolerant() == 0) { if (this.lastTolerancePoint.getTolerant() == 1 && testRes.getTolerant() == 0) {