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 10:49:01 +08:00
parent 1894cb07a2
commit ae5370abdf
2 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -306,13 +306,13 @@ public class SocketFreqConverterService {
List<PqFreqConverterTestRes> testResList = new ArrayList<>(); List<PqFreqConverterTestRes> testResList = new ArrayList<>();
FormalTestManager.pendingDipTaskMap.forEach((key, task) -> { FormalTestManager.pendingDipTaskMap.forEach((key, task) -> {
PqFreqConverterTestRes testRes = new PqFreqConverterTestRes();
testRes.setId(key);
testRes.setDurationMs(task.getPqDipData().getDurationMs());
testRes.setResidualVoltage(task.getPqDipData().getResidualVoltage());
testRes.setTolerant(task.getOriginalTolerant() & (freqConverterStatus.getStatusWord1() == freqConverterConfig.getTolerant() ? 1 : 0));
if (freqConverterStatus.getTimestamp().isAfter(task.getTargetEndTime())) { if (freqConverterStatus.getTimestamp().isAfter(task.getTargetEndTime())) {
PqFreqConverterTestRes testRes = new PqFreqConverterTestRes();
testRes.setId(key);
testRes.setDurationMs(task.getPqDipData().getDurationMs());
testRes.setResidualVoltage(task.getPqDipData().getResidualVoltage());
testRes.setTolerant(task.getOriginalTolerant() & (freqConverterStatus.getStatusWord1() == freqConverterConfig.getTolerant() ? 1 : 0));
finishedTestResIdList.add(key); finishedTestResIdList.add(key);
SocketDataMsg socketDataMsg = new SocketDataMsg(); SocketDataMsg socketDataMsg = new SocketDataMsg();
@@ -360,8 +360,9 @@ public class SocketFreqConverterService {
} }
} }
this.lastTolerancePoint = newTolerantPointVO; this.lastTolerancePoint = newTolerantPointVO;
testResList.add(testRes);
} }
testResList.add(testRes);
}); });
pqFreqConverterTestResService.saveOrUpdateTestRes(suffix, testResList); pqFreqConverterTestResService.saveOrUpdateTestRes(suffix, testResList);
@@ -381,7 +382,7 @@ public class SocketFreqConverterService {
private boolean isNewGroup(TolerantPointVO lastTolerancePoint, TolerantPointVO newTolerantPointVO) { private boolean isNewGroup(TolerantPointVO lastTolerancePoint, TolerantPointVO newTolerantPointVO) {
// 横向分组 // 横向分组
if (freqConverterConfig.getDirection() == 0) { if (freqConverterConfig.getDirection() == 0) {
return lastTolerancePoint.getDurationMs() - newTolerantPointVO.getDurationMs() <= -10; return lastTolerancePoint.getDurationMs() - newTolerantPointVO.getDurationMs() >= 10;
} }
// 纵向分租 // 纵向分租
if (freqConverterConfig.getDirection() == 1) { if (freqConverterConfig.getDirection() == 1) {

18
detection/src/main/java/com/njcn/gather/freqConverter/service/impl/PqFreqConverterTestResServiceImpl.java
View File

@@ -27,7 +27,23 @@ public class PqFreqConverterTestResServiceImpl extends ServiceImpl<PqFreqConvert
@Override @Override
public boolean saveOrUpdateTestRes(Integer suffix, List<PqFreqConverterTestRes> testResList) { public boolean saveOrUpdateTestRes(Integer suffix, List<PqFreqConverterTestRes> testResList) {
DynamicTableNameHandler.setTableName(PqFreqConverterConfigServiceImpl.PQ_FREQ_CONVERTER_TEST_RES_TB_PREFIX + suffix); DynamicTableNameHandler.setTableName(PqFreqConverterConfigServiceImpl.PQ_FREQ_CONVERTER_TEST_RES_TB_PREFIX + suffix);
this.saveOrUpdateBatch(testResList);
List<PqFreqConverterTestRes> existTestResList = new ArrayList<>();
List<PqFreqConverterTestRes> newTestResList = new ArrayList<>();
for (PqFreqConverterTestRes testRes : testResList) {
PqFreqConverterTestRes existTestRes = this.getById(testRes.getId());
if (ObjectUtil.isNotNull(existTestRes)) {
existTestResList.add(existTestRes);
}else{
newTestResList.add(testRes);
}
}
if(existTestResList.size() > 0){
this.updateBatchById(existTestResList);
}
if(newTestResList.size() > 0){
this.saveBatch(newTestResList);
}
DynamicTableNameHandler.remove(); DynamicTableNameHandler.remove();
return true; return true;
} }