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-08 13:55:48 +08:00
parent 4f3f0833d5
commit 391646d416
1 changed files with 43 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -327,24 +327,8 @@ public class SocketFreqConverterService {
socketDataMsg.setData(JSON.toJSONString(newTolerantPointVO)); socketDataMsg.setData(JSON.toJSONString(newTolerantPointVO));
WebServiceManager.sendMsg(this.userId, JSON.toJSONString(socketDataMsg)); WebServiceManager.sendMsg(this.userId, JSON.toJSONString(socketDataMsg));
if (ObjectUtil.isNotNull(this.lastTolerancePoint)) {
// boolean isNewGroup = this.isNewGroup(this.lastTolerancePoint, newTolerantPointVO);
// if (isNewGroup) {
// // 纵向分组
// 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 (testRes.getTolerant() == 0) { if (testRes.getTolerant() == 0) {
if (this.lastTolerancePoint.getTolerant() == 1) { if (ObjectUtil.isNotNull(this.lastTolerancePoint) && this.lastTolerancePoint.getTolerant() == 1) {
TolerantPointVO featurePointVO = new TolerantPointVO(); TolerantPointVO featurePointVO = new TolerantPointVO();
featurePointVO.setResidualVoltage(Math.round((task.getPqDipData().getResidualVoltage() + this.lastTolerancePoint.getResidualVoltage()) / 2D * 100) / 100D); featurePointVO.setResidualVoltage(Math.round((task.getPqDipData().getResidualVoltage() + this.lastTolerancePoint.getResidualVoltage()) / 2D * 100) / 100D);
@@ -405,12 +389,9 @@ public class SocketFreqConverterService {
} }
} }
} }
}
// }
this.lastTolerancePoint = newTolerantPointVO; this.lastTolerancePoint = newTolerantPointVO;
updateTestResList.add(testRes); updateTestResList.add(testRes);
} }
}); });
if (!saveTestResList.isEmpty()) { if (!saveTestResList.isEmpty()) {