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

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

@@ -327,28 +327,33 @@ 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)) { if (testRes.getTolerant() == 0) {
// boolean isNewGroup = this.isNewGroup(this.lastTolerancePoint, newTolerantPointVO); if (ObjectUtil.isNotNull(this.lastTolerancePoint) && this.lastTolerancePoint.getTolerant() == 1) {
// if (isNewGroup) { TolerantPointVO featurePointVO = new TolerantPointVO();
// // 纵向分组
// if (freqConverterConfig.getDirection() == 1) { featurePointVO.setResidualVoltage(Math.round((task.getPqDipData().getResidualVoltage() + this.lastTolerancePoint.getResidualVoltage()) / 2D * 100) / 100D);
// if (this.lastTolerancePoint.getTolerant() == 1 && testRes.getTolerant() == 1) { featurePointVO.setDurationMs(Integer.valueOf((task.getPqDipData().getDurationMs().intValue() + this.lastTolerancePoint.getDurationMs().intValue()) / 2));
// 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);
// socketDataMsg.setData(JSON.toJSONString(featurePointVO)); PqFreqConverterTestRes featureTestRes = new PqFreqConverterTestRes();
// WebServiceManager.sendMsg(this.userId, JSON.toJSONString(socketDataMsg)); featureTestRes.setId(IdUtil.fastSimpleUUID());
// testRes.setTolerant(2); featureTestRes.setDurationMs(featurePointVO.getDurationMs());
// } featureTestRes.setResidualVoltage(featurePointVO.getResidualVoltage());
// } featureTestRes.setTolerant(2);
// } else { featureTestRes.setTime(LocalDateTime.now());
if (testRes.getTolerant() == 0) { saveTestResList.add(featureTestRes);
if (this.lastTolerancePoint.getTolerant() == 1) { }
// 从数据库按照列查询距离该暂降点最近的一个暂降点
if (freqConverterConfig.getDirection() == 0) {
PqFreqConverterTestRes lastByDuration = pqFreqConverterTestResService.getLastByDuration(suffix, key, task.getPqDipData().getDurationMs());
if (ObjectUtil.isNotNull(lastByDuration) && lastByDuration.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() + lastByDuration.getResidualVoltage()) / 2D * 100) / 100D);
featurePointVO.setDurationMs(Integer.valueOf((task.getPqDipData().getDurationMs().intValue() + this.lastTolerancePoint.getDurationMs().intValue()) / 2)); featurePointVO.setDurationMs(Integer.valueOf((task.getPqDipData().getDurationMs().intValue() + lastByDuration.getDurationMs().intValue()) / 2));
featurePointVO.setTolerant(2); featurePointVO.setTolerant(2);
socketDataMsg.setData(JSON.toJSONString(featurePointVO)); socketDataMsg.setData(JSON.toJSONString(featurePointVO));
WebServiceManager.sendMsg(this.userId, JSON.toJSONString(socketDataMsg)); WebServiceManager.sendMsg(this.userId, JSON.toJSONString(socketDataMsg));
@@ -361,56 +366,32 @@ public class SocketFreqConverterService {
featureTestRes.setTime(LocalDateTime.now()); featureTestRes.setTime(LocalDateTime.now());
saveTestResList.add(featureTestRes); saveTestResList.add(featureTestRes);
} }
}
// 从数据库按照行查询距离该暂降点最近的一个暂降点
if (freqConverterConfig.getDirection() == 1) {
PqFreqConverterTestRes lastByResidualVoltage = pqFreqConverterTestResService.getLastByResidualVoltage(suffix, key, task.getPqDipData().getResidualVoltage());
if (ObjectUtil.isNotNull(lastByResidualVoltage) && lastByResidualVoltage.getTolerant() == 1) {
TolerantPointVO featurePointVO = new TolerantPointVO();
// 从数据库按照列查询距离该暂降点最近的一个暂降点 featurePointVO.setResidualVoltage(Math.round((task.getPqDipData().getResidualVoltage() + lastByResidualVoltage.getResidualVoltage()) / 2D * 100) / 100D);
if (freqConverterConfig.getDirection() == 0) { featurePointVO.setDurationMs(Integer.valueOf((task.getPqDipData().getDurationMs().intValue() + lastByResidualVoltage.getDurationMs().intValue()) / 2));
PqFreqConverterTestRes lastByDuration = pqFreqConverterTestResService.getLastByDuration(suffix, key, task.getPqDipData().getDurationMs()); featurePointVO.setTolerant(2);
if (ObjectUtil.isNotNull(lastByDuration) && lastByDuration.getTolerant() == 1) { socketDataMsg.setData(JSON.toJSONString(featurePointVO));
TolerantPointVO featurePointVO = new TolerantPointVO(); WebServiceManager.sendMsg(this.userId, JSON.toJSONString(socketDataMsg));
featurePointVO.setResidualVoltage(Math.round((task.getPqDipData().getResidualVoltage() + lastByDuration.getResidualVoltage()) / 2D * 100) / 100D); PqFreqConverterTestRes featureTestRes = new PqFreqConverterTestRes();
featurePointVO.setDurationMs(Integer.valueOf((task.getPqDipData().getDurationMs().intValue() + lastByDuration.getDurationMs().intValue()) / 2)); featureTestRes.setId(IdUtil.fastSimpleUUID());
featurePointVO.setTolerant(2); featureTestRes.setDurationMs(featurePointVO.getDurationMs());
socketDataMsg.setData(JSON.toJSONString(featurePointVO)); featureTestRes.setResidualVoltage(featurePointVO.getResidualVoltage());
WebServiceManager.sendMsg(this.userId, JSON.toJSONString(socketDataMsg)); featureTestRes.setTolerant(2);
featureTestRes.setTime(LocalDateTime.now());
PqFreqConverterTestRes featureTestRes = new PqFreqConverterTestRes(); saveTestResList.add(featureTestRes);
featureTestRes.setId(IdUtil.fastSimpleUUID());
featureTestRes.setDurationMs(featurePointVO.getDurationMs());
featureTestRes.setResidualVoltage(featurePointVO.getResidualVoltage());
featureTestRes.setTolerant(2);
featureTestRes.setTime(LocalDateTime.now());
saveTestResList.add(featureTestRes);
}
}
// 从数据库按照行查询距离该暂降点最近的一个暂降点
if (freqConverterConfig.getDirection() == 1) {
PqFreqConverterTestRes lastByResidualVoltage = pqFreqConverterTestResService.getLastByResidualVoltage(suffix, key, task.getPqDipData().getResidualVoltage());
if (ObjectUtil.isNotNull(lastByResidualVoltage) && lastByResidualVoltage.getTolerant() == 1) {
TolerantPointVO featurePointVO = new TolerantPointVO();
featurePointVO.setResidualVoltage(Math.round((task.getPqDipData().getResidualVoltage() + lastByResidualVoltage.getResidualVoltage()) / 2D * 100) / 100D);
featurePointVO.setDurationMs(Integer.valueOf((task.getPqDipData().getDurationMs().intValue() + lastByResidualVoltage.getDurationMs().intValue()) / 2));
featurePointVO.setTolerant(2);
socketDataMsg.setData(JSON.toJSONString(featurePointVO));
WebServiceManager.sendMsg(this.userId, JSON.toJSONString(socketDataMsg));
PqFreqConverterTestRes featureTestRes = new PqFreqConverterTestRes();
featureTestRes.setId(IdUtil.fastSimpleUUID());
featureTestRes.setDurationMs(featurePointVO.getDurationMs());
featureTestRes.setResidualVoltage(featurePointVO.getResidualVoltage());
featureTestRes.setTolerant(2);
featureTestRes.setTime(LocalDateTime.now());
saveTestResList.add(featureTestRes);
}
} }
} }
} }
// }
this.lastTolerancePoint = newTolerantPointVO; this.lastTolerancePoint = newTolerantPointVO;
updateTestResList.add(testRes); updateTestResList.add(testRes);
} }
}); });
if (!saveTestResList.isEmpty()) { if (!saveTestResList.isEmpty()) {