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:55:01 +08:00
parent ae5370abdf
commit 3959b96040
4 changed files with 43 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
detection/src/main/java/com/njcn/gather/detection/handler/SocketFreqConverterDevService.java
View File

@@ -321,7 +321,7 @@ public class SocketFreqConverterDevService {
originalTolerant originalTolerant
)); ));
pqFreqConverterTestResService.saveOrUpdateTestRes(suffix, Collections.singletonList(testRes)); pqFreqConverterTestResService.saveTestRes(suffix, Collections.singletonList(testRes));
} }
} }

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

@@ -303,7 +303,8 @@ public class SocketFreqConverterService {
Integer suffix = FormalTestManager.freqConverterTableSuffix; Integer suffix = FormalTestManager.freqConverterTableSuffix;
List<String> finishedTestResIdList = new ArrayList<>(); List<String> finishedTestResIdList = new ArrayList<>();
List<PqFreqConverterTestRes> testResList = new ArrayList<>(); List<PqFreqConverterTestRes> saveTestResList = new ArrayList<>();
List<PqFreqConverterTestRes> updateTestResList = new ArrayList<>();
FormalTestManager.pendingDipTaskMap.forEach((key, task) -> { FormalTestManager.pendingDipTaskMap.forEach((key, task) -> {
if (freqConverterStatus.getTimestamp().isAfter(task.getTargetEndTime())) { if (freqConverterStatus.getTimestamp().isAfter(task.getTargetEndTime())) {
@@ -355,17 +356,22 @@ public class SocketFreqConverterService {
featureTestRes.setDurationMs(featurePointVO.getDurationMs()); featureTestRes.setDurationMs(featurePointVO.getDurationMs());
featureTestRes.setResidualVoltage(featurePointVO.getResidualVoltage()); featureTestRes.setResidualVoltage(featurePointVO.getResidualVoltage());
featureTestRes.setTolerant(2); featureTestRes.setTolerant(2);
testResList.add(featureTestRes); saveTestResList.add(featureTestRes);
} }
} }
} }
this.lastTolerancePoint = newTolerantPointVO; this.lastTolerancePoint = newTolerantPointVO;
testResList.add(testRes); updateTestResList.add(testRes);
} }
}); });
pqFreqConverterTestResService.saveOrUpdateTestRes(suffix, testResList); if (!saveTestResList.isEmpty()) {
pqFreqConverterTestResService.saveTestRes(suffix, saveTestResList);
}
if (!updateTestResList.isEmpty()) {
pqFreqConverterTestResService.updateTestRes(suffix, updateTestResList);
}
for (String dipId : finishedTestResIdList) { for (String dipId : finishedTestResIdList) {
FormalTestManager.pendingDipTaskMap.remove(dipId); FormalTestManager.pendingDipTaskMap.remove(dipId);

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

@@ -27,6 +27,24 @@ public interface IPqFreqConverterTestResService extends IService<PqFreqConverter
*/ */
boolean saveOrUpdateTestRes(Integer suffix, List<PqFreqConverterTestRes> testResList); boolean saveOrUpdateTestRes(Integer suffix, List<PqFreqConverterTestRes> testResList);
/**
* 新增结果记录
*
* @param suffix 表后缀
* @param testResList 结果数据
* @return 是否成功
*/
boolean saveTestRes(Integer suffix, List<PqFreqConverterTestRes> testResList);
/**
* 更新结果记录
*
* @param suffix 表后缀
* @param testResList 结果数据
* @return 是否成功
*/
boolean updateTestRes(Integer suffix, List<PqFreqConverterTestRes> testResList);
/** /**
* 查询结果记录 * 查询结果记录
* *

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

@@ -1,6 +1,5 @@
package com.njcn.gather.freqConverter.service.impl; package com.njcn.gather.freqConverter.service.impl;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njcn.db.mybatisplus.handler.DynamicTableNameHandler; import com.njcn.db.mybatisplus.handler.DynamicTableNameHandler;
import com.njcn.gather.freqConverter.mapper.PqFreqConverterTestResMapper; import com.njcn.gather.freqConverter.mapper.PqFreqConverterTestResMapper;
@@ -8,7 +7,6 @@ import com.njcn.gather.freqConverter.pojo.po.PqFreqConverterTestRes;
import com.njcn.gather.freqConverter.service.IPqFreqConverterTestResService; import com.njcn.gather.freqConverter.service.IPqFreqConverterTestResService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List; import java.util.List;
/** /**
@@ -26,24 +24,21 @@ 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); return this.updateTestRes(suffix, testResList);
}
List<PqFreqConverterTestRes> existTestResList = new ArrayList<>(); @Override
List<PqFreqConverterTestRes> newTestResList = new ArrayList<>(); public boolean saveTestRes(Integer suffix, List<PqFreqConverterTestRes> testResList) {
for (PqFreqConverterTestRes testRes : testResList) { DynamicTableNameHandler.setTableName(PqFreqConverterConfigServiceImpl.PQ_FREQ_CONVERTER_TEST_RES_TB_PREFIX + suffix);
PqFreqConverterTestRes existTestRes = this.getById(testRes.getId()); this.saveBatch(testResList);
if (ObjectUtil.isNotNull(existTestRes)) { DynamicTableNameHandler.remove();
existTestResList.add(existTestRes); return true;
}else{ }
newTestResList.add(testRes);
} @Override
} public boolean updateTestRes(Integer suffix, List<PqFreqConverterTestRes> testResList) {
if(existTestResList.size() > 0){ DynamicTableNameHandler.setTableName(PqFreqConverterConfigServiceImpl.PQ_FREQ_CONVERTER_TEST_RES_TB_PREFIX + suffix);
this.updateBatchById(existTestResList); this.updateBatchById(testResList);
}
if(newTestResList.size() > 0){
this.saveBatch(newTestResList);
}
DynamicTableNameHandler.remove(); DynamicTableNameHandler.remove();
return true; return true;
} }